diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/portupgrade-devel/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/files/patch-aa | 45 | ||||
| -rw-r--r-- | sysutils/portupgrade/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/portupgrade/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/portupgrade/files/patch-aa | 45 |
6 files changed, 6 insertions, 98 deletions
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index de782a0..f1079c2 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -6,13 +6,12 @@ # PORTNAME= portupgrade -PORTVERSION= 1.26 -PORTREVISION= 1 +PORTVERSION= 1.27 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-20010530 +DISTNAME= pkgtools-20010530b MAINTAINER= knu@FreeBSD.org diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index f458fd3..aa182b9 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1 +1 @@ -MD5 (pkgtools-20010530.tar.gz) = 04d3a9635511b9b226050ffa889ceb89 +MD5 (pkgtools-20010530b.tar.gz) = dacc64af0074fa2f94f8d9723c3d7a68 diff --git a/sysutils/portupgrade-devel/files/patch-aa b/sysutils/portupgrade-devel/files/patch-aa deleted file mode 100644 index cbad20f..0000000 --- a/sysutils/portupgrade-devel/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ -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/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index de782a0..f1079c2 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -6,13 +6,12 @@ # PORTNAME= portupgrade -PORTVERSION= 1.26 -PORTREVISION= 1 +PORTVERSION= 1.27 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.iDaemons.org/distfiles/ MASTER_SITE_SUBDIR= knu -DISTNAME= pkgtools-20010530 +DISTNAME= pkgtools-20010530b MAINTAINER= knu@FreeBSD.org diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo index f458fd3..aa182b9 100644 --- a/sysutils/portupgrade/distinfo +++ b/sysutils/portupgrade/distinfo @@ -1 +1 @@ -MD5 (pkgtools-20010530.tar.gz) = 04d3a9635511b9b226050ffa889ceb89 +MD5 (pkgtools-20010530b.tar.gz) = dacc64af0074fa2f94f8d9723c3d7a68 diff --git a/sysutils/portupgrade/files/patch-aa b/sysutils/portupgrade/files/patch-aa deleted file mode 100644 index cbad20f..0000000 --- a/sysutils/portupgrade/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ -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 |
