 @@ -1,55 +1,55 @@
-# $NetBSD: Makefile,v 1.79 2016/12/18 22:38:16 joerg Exp $
+# $NetBSD: Makefile,v 1.80 2016/12/18 22:41:12 joerg Exp $
-PKGNAME=	pbulk-0.63
+PKGNAME=	pbulk-0.64
 COMMENT=	Modular bulk build framework
 .include "../../pkgtools/pbulk/Makefile.common"
 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/client-prepare \
 	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 ID 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.63
 INSTALLATION_DIRS=	bin libexec/pbulk share/examples/pbulk
 USE_BSD_MAKEFILE=	yes
 BUILD_DIRS=	scripts
 do-extract:
 	${CP} -r ${FILESDIR}/pbulk ${WRKDIR}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pbulk.conf ${DESTDIR}${PREFIX}/share/examples/pbulk/pbulk.conf
 .include "../../mk/bsd.pkg.mk"

 @@ -1,24 +1,25 @@
 #!@SH@
-# $NetBSD: build-client-start,v 1.3 2015/06/07 22:49:04 joerg Exp $
+# $NetBSD: build-client-start,v 1.4 2016/12/18 22:41:12 joerg Exp $
 . @PBULK_CONFIG@
 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
 for client in ${build_clients}; do
 	case ${client} in
 	*:*)
 		port="-p ${client##*:}"
 		client=${client%%:*}
 		;;
 	*)
 		port=
 		;;
 	esac
 	ssh $port $client "${pbuild} -c ${master_port_build} -b ${pbuild_script}" &
 done

 @@ -1,41 +1,42 @@
 #!@SH@
-# $NetBSD: client-prepare,v 1.1 2016/12/18 22:38:16 joerg Exp $
+# $NetBSD: client-prepare,v 1.2 2016/12/18 22:41:12 joerg Exp $
 . @PBULK_CONFIG@
 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
 unique_clients=
 for client in ${scan_clients} ${build_clients}; do
 	case ${unique_clients} in
 	"${client}" | "${client} "* | *" ${client} "* | *" ${client}" )
 		: # exists already
 		;;
 	*)
 		if [ -n "$unique_clients" ]; then
 			unique_clients="$unique_clients "
 		fi
 		unique_clients="$unique_clients ${client}"
 		;;
 	esac
 done
 for client in ${unique_clients}; do
 	case ${client} in
 	*:*)
 		port="-p ${client##*:}"
 		client=${client%%:*}
 		;;
 	*)
 		port=
 		;;
 	esac
 	ssh $port $client "${client_prepare_action}" &
 done
 wait

 @@ -1,32 +1,33 @@
 #!@SH@
-# $NetBSD: scan-client-start,v 1.5 2016/12/18 22:38:16 joerg Exp $
+# $NetBSD: scan-client-start,v 1.6 2016/12/18 22:41:12 joerg Exp $
 . @PBULK_CONFIG@
 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
 if [ -f "${bulklog}.old/meta/pscan" ]; then
 	extra_pscan_args="-L ${bulklog}.old/meta/pscan"
 else
 	extra_pscan_args=""
 fi
 ${client_prepare}
 for client in ${scan_clients}; do
 	case ${client} in
 	*:*)
 		port="-p ${client##*:}"
 		client=${client%%:*}
 		;;
 	*)
 		port=
 		;;
 	esac
 	ssh $port $client "${pscan} -c ${master_port_scan} -M ${make} ${extra_pscan_args} ${pkgsrc}" &
 done