diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2008-01-08 12:33:38 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2008-01-08 12:33:38 +0000 |
| commit | f7f6bf4ae2df8c4d6ce8fcd42a60159b79081974 (patch) | |
| tree | 85d4d85afcd4a891d7ee40c6dd9c1646233f4c74 /ports-mgmt | |
| parent | Fix bad ICU patch file (diff) | |
- 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>
Notes
Notes:
svn path=/head/; revision=205258
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin-portsclean | 19 |
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 |