diff options
| author | knu <knu@FreeBSD.org> | 2001-05-29 21:42:06 +0000 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2001-05-29 21:42:06 +0000 |
| commit | e1d289c999c545896a7c4670f6127f9d16423f63 (patch) | |
| tree | 8c573c266f74e040ff0d292dbe35c4dfcd217a39 /ports-mgmt | |
| parent | 31a6bbce320aa076ea0a12a1b9f54c9719ad9656 (diff) | |
| download | FreeBSD-ports-e1d289c999c545896a7c4670f6127f9d16423f63.zip FreeBSD-ports-e1d289c999c545896a7c4670f6127f9d16423f63.tar.gz | |
Apply a hotfix to fix a couple of bugs/misfeatures.
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-aa | 45 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-aa | 45 |
4 files changed, 92 insertions, 0 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index a0526f7..de782a0 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 1.26 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ diff --git a/ports-mgmt/portupgrade-devel/files/patch-aa b/ports-mgmt/portupgrade-devel/files/patch-aa new file mode 100644 index 0000000..cbad20f --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-aa @@ -0,0 +1,45 @@ +Index: pkgdb.rb +=================================================================== +RCS file: /home/cvs/pkgtools/pkgdb.rb,v +retrieving revision 1.13 +diff -u -r1.13 pkgdb.rb +--- pkgdb.rb 2001/05/29 19:12:44 1.13 ++++ pkgdb.rb 2001/05/29 21:28:33 +@@ -113,9 +113,20 @@ + + def glob(pattern = '*') + list = [] ++ complete = false + +- Dir.glob(File.join(@db_dir, pattern)).sort.each do |pkgname| ++ g = Dir.glob(File.join(@db_dir, pattern)) ++ if g.empty? ++ complete = true ++ g = Dir.glob(File.join(@db_dir, pattern + '-*')) ++ end ++ ++ g.sort.each do |pkgname| + pkgname.slice!(0, @db_dir.size + 1) ++ ++ if complete ++ /^#{Regexp.quote(pattern)}-[^\-]+$/ =~ pkgname or next ++ end + + next unless installed?(pkgname) + +Index: portversion +=================================================================== +RCS file: /home/cvs/pkgtools/portversion,v +retrieving revision 1.4 +diff -u -r1.4 portversion +--- portversion 2001/05/29 20:38:32 1.4 ++++ portversion 2001/05/29 21:32:00 +@@ -208,7 +208,7 @@ + newpkg = nil + + if $? +- return [5, nil] ++# return [5, nil] + end + + begin diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index a0526f7..de782a0 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 1.26 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ diff --git a/ports-mgmt/portupgrade/files/patch-aa b/ports-mgmt/portupgrade/files/patch-aa new file mode 100644 index 0000000..cbad20f --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-aa @@ -0,0 +1,45 @@ +Index: pkgdb.rb +=================================================================== +RCS file: /home/cvs/pkgtools/pkgdb.rb,v +retrieving revision 1.13 +diff -u -r1.13 pkgdb.rb +--- pkgdb.rb 2001/05/29 19:12:44 1.13 ++++ pkgdb.rb 2001/05/29 21:28:33 +@@ -113,9 +113,20 @@ + + def glob(pattern = '*') + list = [] ++ complete = false + +- Dir.glob(File.join(@db_dir, pattern)).sort.each do |pkgname| ++ g = Dir.glob(File.join(@db_dir, pattern)) ++ if g.empty? ++ complete = true ++ g = Dir.glob(File.join(@db_dir, pattern + '-*')) ++ end ++ ++ g.sort.each do |pkgname| + pkgname.slice!(0, @db_dir.size + 1) ++ ++ if complete ++ /^#{Regexp.quote(pattern)}-[^\-]+$/ =~ pkgname or next ++ end + + next unless installed?(pkgname) + +Index: portversion +=================================================================== +RCS file: /home/cvs/pkgtools/portversion,v +retrieving revision 1.4 +diff -u -r1.4 portversion +--- portversion 2001/05/29 20:38:32 1.4 ++++ portversion 2001/05/29 21:32:00 +@@ -208,7 +208,7 @@ + newpkg = nil + + if $? +- return [5, nil] ++# return [5, nil] + end + + begin |
