 @@ -1,49 +1,49 @@
-# $NetBSD: Makefile,v 1.53 2009/06/07 18:07:00 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2009/06/08 16:02:52 joerg Exp $
-DISTNAME=	pbulk-0.39
+DISTNAME=	pbulk-0.40
 COMMENT=	Modular bulk build framework
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../pkgtools/pbulk/Makefile.common"
-USE_TOOLS+=	awk:run bzip2:run digest:run gzip:run ident:run make:run \
+USE_TOOLS+=	awk:run bzip2:run digest:run gzip:run make:run \
 		mail:run sed:run tar:run
 DEPENDS+=	rsync-[0-9]*:../../net/rsync
 DEPENDS+=	pbulk-base>=0.38:../../pkgtools/pbulk-base
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD" && ${MAKE} == "/usr/bin/make"
 TARGET_MAKE=	${MAKE}
 .else
 TARGET_MAKE=	$${prefix}/bin/bmake
 .endif
 NEATO=		${PREFIX}/bin/neato
 SUBST_CLASSES+=		tools
 SUBST_STAGE.tools=	post-patch
 SUBST_MESSAGE.tools=	Fixing references to tools
 SUBST_FILES.tools=	pbulk.conf scripts/build scripts/build-client-start \
 	scripts/bulkbuild scripts/bulkbuild-rebuild scripts/bulkbuild-restart \
 	scripts/client-clean \
 	scripts/pkg-build scripts/pkg-up-to-date scripts/pre-build \
 	scripts/report scripts/scan scripts/scan-client-start scripts/upload \
 	scripts/compute-packages.awk scripts/create-broken-graph.awk \
 	scripts/create-report-html.awk scripts/create-report-txt.awk \
 	scripts/create-report.awk
-SUBST_VARS.tools=	AWK BZIP2 CHOWN DIGEST GZIP_CMD IDENT MAIL_CMD NEATO \
+SUBST_VARS.tools=	AWK BZIP2 CHOWN DIGEST GZIP_CMD MAIL_CMD NEATO \
 			PBULK_CONFIG PBULK_CONFIG_VERSION PKG_ADD_CMD \
 			PKG_DELETE_CMD PKG_INFO_CMD PREFIX SED SH TAR \
 			TARGET_MAKE
 CONF_FILES+=	share/examples/pbulk/pbulk.conf ${PKG_SYSCONFDIR}/pbulk.conf
 PBULK_CONFIG=		${PKG_SYSCONFDIR}/pbulk.conf
 PBULK_CONFIG_VERSION=	0.34
 INSTALLATION_DIRS=	bin libexec/pbulk share/examples/pbulk
 USE_BSD_MAKEFILE=	yes
 BUILD_DIRS=	scripts

 @@ -1,14 +1,14 @@
-# $NetBSD: pbulk.conf,v 1.15 2008/09/16 18:21:30 joerg Exp $
+# $NetBSD: pbulk.conf,v 1.16 2009/06/08 16:02:52 joerg Exp $
 # Version of the configuration file. This is bumped whenver the default
 # config changes to notify the administrator about updates.
+#
 config_version=@PBULK_CONFIG_VERSION@
 # The URL where the build report will be made available. This is only
 # used in the .txt version of the report.
+#
 base_url=http://www.pkgsrc-box.org/reports/current/DragonFly-1.8
 # The pbulk framework can use multiple machines to build the packages.
 # On a single-processor, non-distributed build, you may want to say "no"
 @@ -69,27 +69,26 @@ pkgdb=/var/db/pkg
 varbase=/var
 # The following programs must NOT be inside ${prefix}
 pkg_info=@PKG_INFO_CMD@
 pkg_add=@PKG_ADD_CMD@
 pkg_delete=@PKG_DELETE_CMD@
 # The tools that are used for building the packages. If you do not want
 # to publish anything at all, set rsync=: and mail=:.
+#
 bzip2=@BZIP2@
 digest=@DIGEST@
 gzip="@GZIP_CMD@"
 ident=@IDENT@
 # On non-NetBSD, this should usually point at the bmake in ${prefix}, not the
 # make used to build pbulk itself.
 make=@TARGET_MAKE@
 mail=@MAIL_CMD@
 neato=@NEATO@
 rsync=@PREFIX@/bin/rsync
 sed=@SED@
 tar=@TAR@
 loc=${bulklog}/meta
 pbuild=@PREFIX@/bin/pbulk-build
 presolve=@PREFIX@/bin/pbulk-resolve

 @@ -1,15 +1,15 @@
 #!@SH@
-# $NetBSD: pkg-up-to-date,v 1.6 2009/03/06 15:53:21 tnn Exp $
+# $NetBSD: pkg-up-to-date,v 1.7 2009/06/08 16:02:53 joerg Exp $
+#
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
+#
 # This code was developed as part of Google's Summer of Code 2007 program.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
+#
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -36,27 +36,27 @@ set -e
 if [ "${config_version}" != "@PBULK_CONFIG_VERSION@" ]; then
 	echo "Your configuration has version ${config_version}."
 	echo "This version of pbulk expects version @PBULK_CONFIG_VERSION@."
 	exit 1
 fi
 pkg="${packages}/All/$1.tgz"
 [ -f ${pkg} ]
 ${pkg_info} -qb ${pkg} | sed 's/:/ /' | while read file file_id; do
 	[ -z "$file" ] && continue
-	id=`${ident} ${pkgsrc}/${file} 2> /dev/null | head -n 2 | sed -e 1d -e 's/^     //'`
+	id=`@SED@ -e '/[$]NetBSD/!d' -e 's/^.*\([$]NetBSD[^$]*[$]\).*$/\1/;q' ${pkgsrc}/${file}`
 	[ "$id" = "$file_id" ]
 done
 # TODO: compare build options
 # Remove current package, so that only dependencies are in $* now.
 shift
 ${pkg_info} -qN ${pkg} | while read dep; do
 	# pkg_info prints a trailing newline, ignore that
 	[ -z "${dep}" ] && continue
 	found=0
 	for dep2 in $*; do