[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk Don't compare a function name against N...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/76dd3e3f664c
branches:  trunk
changeset: 531724:76dd3e3f664c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Aug 05 14:15:55 2007 +0000

description:
Don't compare a function name against NULL, master_mode is meant here.
Thanks tnn@.

Reverse the test for extracting the bootstrap kit as the old version
hits set -e error handling.

Bump to pbulk-1.11.

diffstat:

 pkgtools/pbulk/Makefile                         |  4 ++--
 pkgtools/pbulk/files/pbulk/pbuild/pbuild.c      |  4 ++--
 pkgtools/pbulk/files/pbulk/scripts/client-clean |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 78a8fe032e0b -r 76dd3e3f664c pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Sun Aug 05 13:58:05 2007 +0000
+++ b/pkgtools/pbulk/Makefile   Sun Aug 05 14:15:55 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2007/08/05 12:30:10 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2007/08/05 14:15:55 joerg Exp $
 
-DISTNAME=      pbulk-0.10
+DISTNAME=      pbulk-0.11
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 78a8fe032e0b -r 76dd3e3f664c pkgtools/pbulk/files/pbulk/pbuild/pbuild.c
--- a/pkgtools/pbulk/files/pbulk/pbuild/pbuild.c        Sun Aug 05 13:58:05 2007 +0000
+++ b/pkgtools/pbulk/files/pbulk/pbuild/pbuild.c        Sun Aug 05 14:15:55 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pbuild.c,v 1.4 2007/07/21 15:29:50 tnn Exp $ */
+/* $NetBSD: pbuild.c,v 1.5 2007/08/05 14:15:55 joerg Exp $ */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -138,7 +138,7 @@
                stat_mode(stat_port);
        }
 
-       if (master_mode == NULL) {
+       if (master_port == NULL) {
                build_cmd = strrchr(build_path, '/');
                if (build_cmd == NULL)
                        build_cmd = build_path;
diff -r 78a8fe032e0b -r 76dd3e3f664c pkgtools/pbulk/files/pbulk/scripts/client-clean
--- a/pkgtools/pbulk/files/pbulk/scripts/client-clean   Sun Aug 05 13:58:05 2007 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/client-clean   Sun Aug 05 14:15:55 2007 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: client-clean,v 1.1.1.1 2007/06/19 19:49:59 joerg Exp $
+# $NetBSD: client-clean,v 1.2 2007/08/05 14:15:55 joerg Exp $
 
 . @PBULK_CONFIG@
 
@@ -8,4 +8,4 @@
 # Clean build system first
 rm -rf ${prefix} ${pkgdb} ${varbase}/qmail 2> /dev/null || true
 # Install fresh bootstrap state
-[ -n "${bootstrapkit}" ] &&  tar xzf ${bootstrapkit} -C /
+[ -z "${bootstrapkit}" ] || tar xzf ${bootstrapkit} -C /