aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2008-01-08 20:33:38 +0800
committersem <sem@FreeBSD.org>2008-01-08 20:33:38 +0800
commit3ec1c54438c6031dd528c2e93e345a13f2b98392 (patch)
treee8202e132380d34cf1cae1b1d0bbb216a36af70a /ports-mgmt
parent605535ee40d15efaca2e567a6414fa5a86d18fcd (diff)
downloadfreebsd-ports-gnome-3ec1c54438c6031dd528c2e93e345a13f2b98392.tar.gz
freebsd-ports-gnome-3ec1c54438c6031dd528c2e93e345a13f2b98392.tar.zst
freebsd-ports-gnome-3ec1c54438c6031dd528c2e93e345a13f2b98392.zip
- A patch from HEAD: when gcc installed, some libraries may be conflicted
with system ones. portsclean -Li ask to remove them. No removes by default, but we don't want an user remove system libraries just press 'y' in portscleanup -Li. PR: ports/116830 Reported by: clemens fischer <ino-news at spotteswoode.dnsalias.org>
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade/Makefile1
-rw-r--r--ports-mgmt/portupgrade/files/patch-bin-portsclean19
2 files changed, 20 insertions, 0 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 3abb13e939a6..1bc41086a2ab 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -7,6 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 2.3.1
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= ports-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/ports-mgmt/portupgrade/files/patch-bin-portsclean b/ports-mgmt/portupgrade/files/patch-bin-portsclean
new file mode 100644
index 000000000000..a5dbd3faa726
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-bin-portsclean
@@ -0,0 +1,19 @@
+Index: bin/portsclean
+===================================================================
+RCS file: /cvsroot/portupgrade/pkgtools/bin/portsclean,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- bin/portsclean 8 Jan 2008 11:32:27 -0000 1.9
++++ bin/portsclean 8 Jan 2008 12:09:15 -0000 1.10
+@@ -336,6 +336,10 @@
+
+ next if prev_path == path
+
++ # Skip system libraries (/lib, /usr/lib)
++ # XXX Warning on this?
++ next if /^\/lib/ !~ prev_path || /^\/usr\/lib/ !~ prev_path
++
+ puts "** #{path} is shadowed by #{prev_path}"
+
+ if dir == compatlibdir