diff options
| author | sem <sem@FreeBSD.org> | 2008-02-10 20:18:00 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2008-02-10 20:18:00 +0800 |
| commit | c9c546f02d3574eea35bdcb446aad3f3bc63742b (patch) | |
| tree | 022b6894b4d84ca1b01e90453bc4c971453e49c5 /ports-mgmt/portupgrade | |
| parent | 396590a3f4e722292fd7b2a688a29b06f1b8aa3d (diff) | |
| download | freebsd-ports-graphics-c9c546f02d3574eea35bdcb446aad3f3bc63742b.tar.gz freebsd-ports-graphics-c9c546f02d3574eea35bdcb446aad3f3bc63742b.tar.zst freebsd-ports-graphics-c9c546f02d3574eea35bdcb446aad3f3bc63742b.zip | |
- When -o specifised, gather depends for specified origin.
- Just ignore a package if there is no port directory exists. A correct way
for users is to place the ports in HOLD_PKGS in pkgtools,conf, but
they did not. So it makes my life a little easy.
Diffstat (limited to 'ports-mgmt/portupgrade')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin-portupgrade | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index e56036ea261..a7fbbc1dda1 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.2 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/ports-mgmt/portupgrade/files/patch-bin-portupgrade b/ports-mgmt/portupgrade/files/patch-bin-portupgrade new file mode 100644 index 00000000000..57abf029ebd --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-bin-portupgrade @@ -0,0 +1,32 @@ +Index: bin/portupgrade +=================================================================== +RCS file: /cvsroot/portupgrade/pkgtools/bin/portupgrade,v +retrieving revision 1.49 +retrieving revision 1.50 +diff -u -r1.49 -r1.50 +--- bin/portupgrade 4 Feb 2008 11:34:20 -0000 1.49 ++++ bin/portupgrade 10 Feb 2008 12:04:39 -0000 1.50 +@@ -617,7 +617,11 @@ + not_need_upgrade = [] + upgrade_tasks.each do |task| + pkg = PkgInfo.new(task) +- origin = $pkgdb.origin(task) ++ if task == first && $origin ++ origin = $origin ++ else ++ origin = $pkgdb.origin(task) ++ end + if !origin.nil? + begin + name = get_pkgname(origin) +@@ -625,6 +629,10 @@ + $results << PkgResult.new(origin, :ignored, e.message) + not_need_upgrade << task + next ++ rescue PortDirError => e ++ $results << PkgResult.new(origin, :ignored, e.message) ++ not_need_upgrade << task ++ next + end + if name == '' + warning_message "There are errors in a meta info for #{task}" |