[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk pbulk-0.44: Remove a second call to psc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e3b59dc5199
branches:  trunk
changeset: 568973:0e3b59dc5199
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 30 21:14:43 2009 +0000

description:
pbulk-0.44: Remove a second call to pscan from a failed merge.

diffstat:

 pkgtools/pbulk/Makefile                 |  4 ++--
 pkgtools/pbulk/files/pbulk/scripts/scan |  3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 4878e32a03c8 -r 0e3b59dc5199 pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Wed Dec 30 21:13:15 2009 +0000
+++ b/pkgtools/pbulk/Makefile   Wed Dec 30 21:14:43 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2009/12/16 19:41:41 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2009/12/30 21:14:43 joerg Exp $
 
-DISTNAME=      pbulk-0.43
+DISTNAME=      pbulk-0.44
 COMMENT=       Modular bulk build framework
 
 PKG_DESTDIR_SUPPORT=   user-destdir
diff -r 4878e32a03c8 -r 0e3b59dc5199 pkgtools/pbulk/files/pbulk/scripts/scan
--- a/pkgtools/pbulk/files/pbulk/scripts/scan   Wed Dec 30 21:13:15 2009 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/scan   Wed Dec 30 21:14:43 2009 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: scan,v 1.5 2009/12/16 19:41:41 joerg Exp $
+# $NetBSD: scan,v 1.6 2009/12/30 21:14:43 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -47,7 +47,6 @@
                ${pscan} -v -M ${make} ${pkgsrc} ${loc}/pscan 2>> ${loc}/pscan.stderr
                ;;
        [yY][eE][sS])
-               ${pscan} -v -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan
                ${pscan} -v -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan 2>> ${loc}/pscan.stderr
                ;;
        *)