diff options
20 files changed, 16 insertions, 204 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 02520dc47f13..138a32855487 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -6,15 +6,14 @@ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo index 9a26ccdb6b5d..959b4149a7f0 100644 --- a/ports-mgmt/portupgrade-devel/distinfo +++ b/ports-mgmt/portupgrade-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 diff --git a/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb b/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb deleted file mode 100644 index 1632d02a1a08..000000000000 --- a/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb +++ /dev/null @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end diff --git a/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb b/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb deleted file mode 100644 index 7317dcc85de5..000000000000 --- a/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 diff --git a/ports-mgmt/portupgrade-devel/files/patch-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-portupgrade deleted file mode 100644 index 3b818e4bf39b..000000000000 --- a/ports-mgmt/portupgrade-devel/files/patch-portupgrade +++ /dev/null @@ -1,16 +0,0 @@ -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 diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 02520dc47f13..138a32855487 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,15 +6,14 @@ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index 9a26ccdb6b5d..959b4149a7f0 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 diff --git a/ports-mgmt/portupgrade/files/patch-pkgtools.rb b/ports-mgmt/portupgrade/files/patch-pkgtools.rb deleted file mode 100644 index 1632d02a1a08..000000000000 --- a/ports-mgmt/portupgrade/files/patch-pkgtools.rb +++ /dev/null @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end diff --git a/ports-mgmt/portupgrade/files/patch-portsdb.rb b/ports-mgmt/portupgrade/files/patch-portsdb.rb deleted file mode 100644 index 7317dcc85de5..000000000000 --- a/ports-mgmt/portupgrade/files/patch-portsdb.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 diff --git a/ports-mgmt/portupgrade/files/patch-portupgrade b/ports-mgmt/portupgrade/files/patch-portupgrade deleted file mode 100644 index 3b818e4bf39b..000000000000 --- a/ports-mgmt/portupgrade/files/patch-portupgrade +++ /dev/null @@ -1,16 +0,0 @@ -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 diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index 02520dc47f13..138a32855487 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -6,15 +6,14 @@ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index 9a26ccdb6b5d..959b4149a7f0 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 diff --git a/sysutils/portupgrade-devel/files/patch-pkgtools.rb b/sysutils/portupgrade-devel/files/patch-pkgtools.rb deleted file mode 100644 index 1632d02a1a08..000000000000 --- a/sysutils/portupgrade-devel/files/patch-pkgtools.rb +++ /dev/null @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end diff --git a/sysutils/portupgrade-devel/files/patch-portsdb.rb b/sysutils/portupgrade-devel/files/patch-portsdb.rb deleted file mode 100644 index 7317dcc85de5..000000000000 --- a/sysutils/portupgrade-devel/files/patch-portsdb.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 diff --git a/sysutils/portupgrade-devel/files/patch-portupgrade b/sysutils/portupgrade-devel/files/patch-portupgrade deleted file mode 100644 index 3b818e4bf39b..000000000000 --- a/sysutils/portupgrade-devel/files/patch-portupgrade +++ /dev/null @@ -1,16 +0,0 @@ -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 diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index 02520dc47f13..138a32855487 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -6,15 +6,14 @@ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo index 9a26ccdb6b5d..959b4149a7f0 100644 --- a/sysutils/portupgrade/distinfo +++ b/sysutils/portupgrade/distinfo @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 diff --git a/sysutils/portupgrade/files/patch-pkgtools.rb b/sysutils/portupgrade/files/patch-pkgtools.rb deleted file mode 100644 index 1632d02a1a08..000000000000 --- a/sysutils/portupgrade/files/patch-pkgtools.rb +++ /dev/null @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end diff --git a/sysutils/portupgrade/files/patch-portsdb.rb b/sysutils/portupgrade/files/patch-portsdb.rb deleted file mode 100644 index 7317dcc85de5..000000000000 --- a/sysutils/portupgrade/files/patch-portsdb.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 diff --git a/sysutils/portupgrade/files/patch-portupgrade b/sysutils/portupgrade/files/patch-portupgrade deleted file mode 100644 index 3b818e4bf39b..000000000000 --- a/sysutils/portupgrade/files/patch-portupgrade +++ /dev/null @@ -1,16 +0,0 @@ -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 |