pbulk 0.18:

- If not running on NetBSD or not using /usr/bin/make, set the default
  of pbulk's make to ${prefix}/bin/bmake.
- Make path to neato an option and don't install it on demand.
- Fix a bug in the master mode that should fix the strange faults seen
  with native libevent on NetBSD.
- Add option to skip checksum computation. Don't upload a checksum file
  if that option is active.

6 files changed, 38 insertions, 25 deletions

diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index 29f2b3f4a5a..e520cf2928a 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2007/12/15 11:06:12 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2008/01/15 21:43:31 joerg Exp $
 
-DISTNAME=	pbulk-0.17
+DISTNAME=	pbulk-0.18
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -20,6 +20,16 @@ USE_TOOLS+=	awk:run bzip2:run digest:run gzip:run ident:run make:run \
 		mail:run tar:run
 DEPENDS+=	rsync-[0-9]*:../../net/rsync
 
+.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
@@ -30,8 +40,8 @@ SUBST_FILES.tools=	pbulk.conf scripts/build scripts/build-client-start \
 	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 DIGEST GZIP_CMD IDENT MAKE MAIL_CMD \
-			PBULK_CONFIG PKG_INFO PREFIX SH TAR
+SUBST_VARS.tools=	AWK BZIP2 DIGEST GZIP_CMD IDENT MAIL_CMD NEATO \
+			PBULK_CONFIG PKG_INFO PREFIX SH TAR TARGET_MAKE
 
 CONF_FILES+=	share/examples/pbulk/pbulk.conf ${PKG_SYSCONFDIR}/pbulk.conf
 
@@ -50,10 +60,6 @@ do-extract:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pbulk.conf ${DESTDIR}${PREFIX}/share/examples/pbulk/pbulk.conf
 
-.if ${OPSYS} == "NetBSD"
-USE_BUILTIN.libevent = no
-.endif
-
 .if ${OPSYS} == "SunOS"
 LDADD+=		-lsocket -lresolv
 MAKE_ENV+=	LDADD=${LDADD:Q}
diff --git a/pkgtools/pbulk/files/pbulk/pbuild/master.c b/pkgtools/pbulk/files/pbulk/pbuild/master.c
index 7ea2a924c7d..df8f3bdf6c9 100644
--- a/pkgtools/pbulk/files/pbulk/pbuild/master.c
+++ b/pkgtools/pbulk/files/pbulk/pbuild/master.c
@@ -1,4 +1,4 @@
-/* $NetBSD: master.c,v 1.4 2007/07/21 15:36:36 tnn Exp $ */
+/* $NetBSD: master.c,v 1.5 2008/01/15 21:43:32 joerg Exp $ */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -244,6 +244,7 @@ listen_handler(int sock, short event, void *arg)
 	peer = xmalloc(sizeof(*peer));
 	peer->fd = fd;
 	peer->buf = NULL;
+	peer->job = NULL;
 	recv_command(peer);
 }
 
diff --git a/pkgtools/pbulk/files/pbulk/pbulk.conf b/pkgtools/pbulk/files/pbulk/pbulk.conf
index dd923151c60..9ebe76ecc76 100644
--- a/pkgtools/pbulk/files/pbulk/pbulk.conf
+++ b/pkgtools/pbulk/files/pbulk/pbulk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: pbulk.conf,v 1.9 2007/10/17 20:42:30 joerg Exp $
+# $NetBSD: pbulk.conf,v 1.10 2008/01/15 21:43:32 joerg Exp $
 
 # The URL where the build report will be made available. This is only
 # used in the .txt version of the report.
@@ -67,8 +67,9 @@ 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=@MAKE@
+make=@TARGET_MAKE@
 mail=@MAIL_CMD@
+neato=@NEATO@
 rsync=@PREFIX@/bin/rsync
 tar=@TAR@
 
diff --git a/pkgtools/pbulk/files/pbulk/scripts/build b/pkgtools/pbulk/files/pbulk/scripts/build
index fc368a14107..6b6cb222107 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/build
+++ b/pkgtools/pbulk/files/pbulk/scripts/build
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: build,v 1.2 2007/07/20 19:39:34 joerg Exp $
+# $NetBSD: build,v 1.3 2008/01/15 21:43:32 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -55,10 +55,13 @@ cd ${packages}/All
 sed 's/$/.tgz/' < ${loc}/success | sort | xargs ${external_pkg_info} -X | ${gzip} -c > pkg_summary.gz
 ${gzip} -dc < pkg_summary.gz | ${bzip2} -c > pkg_summary.bz2
 
-echo "Building SHA512..."
-cd ${packages}
-{
-	echo "All/pkg_summary.bz2"
-	echo "All/pkg_summary.gz"
-	sed 's|^\(.*\)$|All/\1.tgz|' < ${loc}/success
-} | sort | xargs ${digest} SHA512 | ${bzip2} -c > SHA512.bz2
+if [ "${checksum_packages}" != "no" ] && \
+   [ "${checksum_packages}" != "NO" ]; then
+	echo "Building SHA512..."
+	cd ${packages}
+	{
+		echo "All/pkg_summary.bz2"
+		echo "All/pkg_summary.gz"
+		sed 's|^\(.*\)$|All/\1.tgz|' < ${loc}/success
+	} | sort | xargs ${digest} SHA512 | ${bzip2} -c > SHA512.bz2
+fi
diff --git a/pkgtools/pbulk/files/pbulk/scripts/report b/pkgtools/pbulk/files/pbulk/scripts/report
index 002f04dbd89..0247551ae43 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/report
+++ b/pkgtools/pbulk/files/pbulk/scripts/report
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: report,v 1.6 2007/10/17 20:42:30 joerg Exp $
+# $NetBSD: report,v 1.7 2008/01/15 21:43:32 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -41,9 +41,9 @@ ${report_html_script} ${loc} ${bulklog}
 ${report_txt_script} ${loc}
 
 ${report_graph_script} ${loc}
-if [ "`grep -- '->' < ${loc}/report.dot | wc -l`" -lt ${report_graph_script_limit} ]; then
-	${pkg_add} ${packages}/All/graphviz
-	${prefix}/bin/neato -Tsvg -Goverlap=ortho -Gsplines=true \
+if [ -x "${neato}" ] && \
+   [ "`grep -- '->' < ${loc}/report.dot | wc -l`" -lt ${report_graph_script_limit} ]; then
+	${neato} -Tsvg -Goverlap=ortho -Gsplines=true \
 	    -o ${loc}/report.svg ${loc}/report.dot
 else
 	rm -f ${loc}/report.svg
diff --git a/pkgtools/pbulk/files/pbulk/scripts/upload b/pkgtools/pbulk/files/pbulk/scripts/upload
index cf6ff1136a8..8e76e5e74aa 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/upload
+++ b/pkgtools/pbulk/files/pbulk/scripts/upload
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: upload,v 1.1.1.1 2007/06/19 19:49:59 joerg Exp $
+# $NetBSD: upload,v 1.2 2008/01/15 21:43:32 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -37,7 +37,9 @@ set -e
 echo "Uploading packages..."
 cd ${packages}
 {
-	echo "+ SHA512.bz2"
+	[ "${checksum_packages}" != "no" ] && \
+	    [ "${checksum_packages}" != "NO" ] && \
+	    echo "+ SHA512.bz2"
 	echo "+ All/pkg_summary.bz2"
 	echo "+ All/pkg_summary.gz"
 	${packages_script} ${loc}