summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2008-01-11 13:29:37 +0000
committergdt <gdt@pkgsrc.org>2008-01-11 13:29:37 +0000
commit1dfd5850bd1495dcd262d18a9652704d435f0765 (patch)
tree5413d1a9cc9cb00d5853a335f9b91e930ec3be4d /pkgtools
parentd46a626e21ee7fd3d2f318e9ad35165ce977207a (diff)
downloadpkgsrc-1dfd5850bd1495dcd262d18a9652704d435f0765.tar.gz
Add patch from Brook Milligan to avoid treating warnings about
non-deletable packages as dependencies. Bump version to 0.14. Example problematic output (perhaps should also be fixed in pkg_install): Information for pkg_install-20070810: *** PACKAGE MAY NOT BE DELETED *** Built using: checkperms-1.7 *** PACKAGE MAY NOT BE DELETED ***
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_rolling-replace/Makefile4
-rwxr-xr-xpkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh3
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index d094746e762..e69839de1dc 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2007/12/02 02:11:05 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2008/01/11 13:29:37 gdt Exp $
-DISTNAME= pkg_rolling-replace-0.12
+DISTNAME= pkg_rolling-replace-0.13
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
index c7373919207..7fa3ce28232 100755
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: pkg_rolling-replace.sh,v 1.15 2007/12/02 02:11:05 tnn Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.16 2008/01/11 13:29:37 gdt Exp $
#<license>
# Copyright (c) 2006 BBN Technologies Corp. All rights reserved.
#
@@ -158,6 +158,7 @@ depgraph_installed()
print pkg" "pkg; \
state=1; \
} \
+ /^\** PACKAGE MAY NOT BE DELETED \**$/ { state=3; } \
/^./ { \
if (state == 2) { \
dep=$1; sub("-[0-9][^-]*$", "", dep); \