[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk pbulk 0.18:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d940808753a4
branches:  trunk
changeset: 537753:d940808753a4
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jan 15 21:43:31 2008 +0000

description:
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.

diffstat:

 pkgtools/pbulk/Makefile                    |  22 ++++++++++++++--------
 pkgtools/pbulk/files/pbulk/pbuild/master.c |   3 ++-
 pkgtools/pbulk/files/pbulk/pbulk.conf      |   5 +++--
 pkgtools/pbulk/files/pbulk/scripts/build   |  19 +++++++++++--------
 pkgtools/pbulk/files/pbulk/scripts/report  |   8 ++++----
 pkgtools/pbulk/files/pbulk/scripts/upload  |   6 ++++--
 6 files changed, 38 insertions(+), 25 deletions(-)

diffs (163 lines):

diff -r 22be4f46c4db -r d940808753a4 pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Tue Jan 15 19:31:18 2008 +0000
+++ b/pkgtools/pbulk/Makefile   Tue Jan 15 21:43:31 2008 +0000
@@ -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 @@
                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 @@
        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 @@
 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 -r 22be4f46c4db -r d940808753a4 pkgtools/pbulk/files/pbulk/pbuild/master.c
--- a/pkgtools/pbulk/files/pbulk/pbuild/master.c        Tue Jan 15 19:31:18 2008 +0000
+++ b/pkgtools/pbulk/files/pbulk/pbuild/master.c        Tue Jan 15 21:43:31 2008 +0000
@@ -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@localhost>.
@@ -244,6 +244,7 @@
        peer = xmalloc(sizeof(*peer));
        peer->fd = fd;
        peer->buf = NULL;
+       peer->job = NULL;
        recv_command(peer);
 }
 
diff -r 22be4f46c4db -r d940808753a4 pkgtools/pbulk/files/pbulk/pbulk.conf
--- a/pkgtools/pbulk/files/pbulk/pbulk.conf     Tue Jan 15 19:31:18 2008 +0000
+++ b/pkgtools/pbulk/files/pbulk/pbulk.conf     Tue Jan 15 21:43:31 2008 +0000
@@ -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 @@
 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 -r 22be4f46c4db -r d940808753a4 pkgtools/pbulk/files/pbulk/scripts/build
--- a/pkgtools/pbulk/files/pbulk/scripts/build  Tue Jan 15 19:31:18 2008 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/build  Tue Jan 15 21:43:31 2008 +0000
@@ -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@localhost>.
 # All rights reserved.
@@ -55,10 +55,13 @@
 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 -r 22be4f46c4db -r d940808753a4 pkgtools/pbulk/files/pbulk/scripts/report
--- a/pkgtools/pbulk/files/pbulk/scripts/report Tue Jan 15 19:31:18 2008 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/report Tue Jan 15 21:43:31 2008 +0000
@@ -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@localhost>.
 # All rights reserved.
@@ -41,9 +41,9 @@
 ${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 -r 22be4f46c4db -r d940808753a4 pkgtools/pbulk/files/pbulk/scripts/upload
--- a/pkgtools/pbulk/files/pbulk/scripts/upload Tue Jan 15 19:31:18 2008 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/upload Tue Jan 15 21:43:31 2008 +0000
@@ -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@localhost>.
 # All rights reserved.
@@ -37,7 +37,9 @@
 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}