diff options
| author | joerg <joerg> | 2009-12-30 21:14:43 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-12-30 21:14:43 +0000 |
| commit | 4f05a9ec9b26241d9332cca5919468c3733b5565 (patch) | |
| tree | d1191d50274f272d6f7e59a9498097e6dfb25621 /pkgtools | |
| parent | efb3a997e2405a757106f7232c3466b0e14f6e03 (diff) | |
| download | pkgsrc-4f05a9ec9b26241d9332cca5919468c3733b5565.tar.gz | |
pbulk-0.44: Remove a second call to pscan from a failed merge.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/scan | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 6dde690bcb3..a8ad5aa1cae 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -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 --git a/pkgtools/pbulk/files/pbulk/scripts/scan b/pkgtools/pbulk/files/pbulk/scripts/scan index 80ebd3f0be0..e5e9ec48fe5 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/scan +++ b/pkgtools/pbulk/files/pbulk/scripts/scan @@ -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>. # All rights reserved. @@ -47,7 +47,6 @@ if [ -z "${limited_list}" ]; then ${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 ;; *) |