diff options
author | knu <knu@FreeBSD.org> | 2004-07-07 03:32:53 +0800 |
---|---|---|
committer | knu <knu@FreeBSD.org> | 2004-07-07 03:32:53 +0800 |
commit | 5a06d85aca067fd0e4e5b3193bbd4cb20cfa3570 (patch) | |
tree | 9aa1afe2e0e15ae2d43b97e5b48fdba266b6c64b /ports-mgmt/portupgrade-devel | |
parent | caac55af5a51e344074dbe648546ad2ee8137fce (diff) | |
download | freebsd-ports-gnome-5a06d85aca067fd0e4e5b3193bbd4cb20cfa3570.tar.gz freebsd-ports-gnome-5a06d85aca067fd0e4e5b3193bbd4cb20cfa3570.tar.zst freebsd-ports-gnome-5a06d85aca067fd0e4e5b3193bbd4cb20cfa3570.zip |
Fix a bug with -P when there are more than one binary package file for
a package to install or upgrade.
PR: ports/68598
Submitted by: Victor Prylipko <vic@liniya.ru>
Bug traced by: Andrew Bliznak <andrew@ort.lviv.net>
Diffstat (limited to 'ports-mgmt/portupgrade-devel')
-rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
-rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-portupgrade | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index f434320f6a88..0ed777b6f395 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20040701 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} diff --git a/ports-mgmt/portupgrade-devel/files/patch-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-portupgrade new file mode 100644 index 000000000000..3b818e4bf39b --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-portupgrade @@ -0,0 +1,16 @@ +Index: bin/portupgrade +=================================================================== +RCS file: /home/cvs/pkgtools/bin/portupgrade,v +retrieving revision 1.226 +diff -u -2 -r1.226 portupgrade +--- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226 ++++ bin/portupgrade 6 Jul 2004 19:18:10 -0000 +@@ -1691,5 +1691,7 @@ + end + +- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg } ++ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)| ++ pkg1 <=> pkg2 ++ } + + if latest_pkg |