diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2001-05-29 21:42:06 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2001-05-29 21:42:06 +0000 |
| commit | cbe50db5a938d093a8ab21f20c5903d9dec93b6e (patch) | |
| tree | b8c4158d1827263c6dee554b9d5686add72eb055 /ports-mgmt | |
| parent | adec4b87b54c0acc6a4258a99cb5dd0c1236455e (diff) | |
| download | ports-cbe50db5a938d093a8ab21f20c5903d9dec93b6e.tar.gz ports-cbe50db5a938d093a8ab21f20c5903d9dec93b6e.zip | |
Notes
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 a0526f7e4157..de782a060101 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 000000000000..cbad20fdd930 --- /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 a0526f7e4157..de782a060101 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 000000000000..cbad20fdd930 --- /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 |