diff options
-rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 10 | ||||
-rw-r--r-- | ports-mgmt/portupgrade-devel/distinfo | 7 | ||||
-rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb | 14 | ||||
-rw-r--r-- | ports-mgmt/portupgrade/Makefile | 10 | ||||
-rw-r--r-- | ports-mgmt/portupgrade/distinfo | 7 | ||||
-rw-r--r-- | ports-mgmt/portupgrade/files/patch-pkgtools.rb | 14 | ||||
-rw-r--r-- | sysutils/portupgrade-devel/Makefile | 10 | ||||
-rw-r--r-- | sysutils/portupgrade-devel/distinfo | 7 | ||||
-rw-r--r-- | sysutils/portupgrade-devel/files/patch-pkgtools.rb | 14 | ||||
-rw-r--r-- | sysutils/portupgrade/Makefile | 10 | ||||
-rw-r--r-- | sysutils/portupgrade/distinfo | 7 | ||||
-rw-r--r-- | sysutils/portupgrade/files/patch-pkgtools.rb | 14 |
12 files changed, 16 insertions, 108 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index a65fe1c15ed8..0b59403b833a 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -6,23 +6,19 @@ # PORTNAME= portupgrade -PORTVERSION= 20021119 +PORTVERSION= 20021209 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20021101 +DISTVERSION= ${PORTVERSION} .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -PATCHFILES= ${DISTNAME}-20021103.diff.bz2 \ - pkgtools-20021103-20021106.diff.bz2 \ - pkgtools-20021106-20021109.diff.bz2 \ - pkgtools-20021109-20021113.diff.bz2 \ - pkgtools-20021113-${PORTVERSION}.diff.bz2 +PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo index c19bd1895a95..d81f701e3396 100644 --- a/ports-mgmt/portupgrade-devel/distinfo +++ b/ports-mgmt/portupgrade-devel/distinfo @@ -1,6 +1 @@ -MD5 (pkgtools-20021101.tar.bz2) = 56d5eb15e5cf03233e91c518af7c4bb8 -MD5 (pkgtools-20021101-20021103.diff.bz2) = 223d19090ae98ff54838a7472f766bed -MD5 (pkgtools-20021103-20021106.diff.bz2) = d9e878d0bade89a59d20c891de5bb8d9 -MD5 (pkgtools-20021106-20021109.diff.bz2) = f983a3efd722f88df91bce036aa40f9d -MD5 (pkgtools-20021109-20021113.diff.bz2) = c9d205b39b1d36c0db592364e52fff0b -MD5 (pkgtools-20021113-20021119.diff.bz2) = 716ad4791718361f3d930db05beba9b6 +MD5 (pkgtools-20021209.tar.bz2) = 55898afff6ffe56fe739a3689b55a067 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 8caf4b3d3bfb..000000000000 --- a/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.100 -diff -u -1 -r1.100 pkgtools.rb ---- lib/pkgtools.rb 19 Nov 2002 04:53:50 -0000 1.100 -+++ lib/pkgtools.rb 20 Nov 2002 06:01:28 -0000 -@@ -649,4 +649,4 @@ - -- filter_file(shelljoin('sed', '-E', -- "s|^(@comment[[:space:]]+ORIGIN:).*$|\\1#{origin}|"), -+ filter_file(shelljoin('sed', -+ "s|^\\(@comment[ \t][ \t]*ORIGIN:\\).*$|\\1#{origin}|"), - contents_file) diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index a65fe1c15ed8..0b59403b833a 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,23 +6,19 @@ # PORTNAME= portupgrade -PORTVERSION= 20021119 +PORTVERSION= 20021209 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20021101 +DISTVERSION= ${PORTVERSION} .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -PATCHFILES= ${DISTNAME}-20021103.diff.bz2 \ - pkgtools-20021103-20021106.diff.bz2 \ - pkgtools-20021106-20021109.diff.bz2 \ - pkgtools-20021109-20021113.diff.bz2 \ - pkgtools-20021113-${PORTVERSION}.diff.bz2 +PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index c19bd1895a95..d81f701e3396 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,6 +1 @@ -MD5 (pkgtools-20021101.tar.bz2) = 56d5eb15e5cf03233e91c518af7c4bb8 -MD5 (pkgtools-20021101-20021103.diff.bz2) = 223d19090ae98ff54838a7472f766bed -MD5 (pkgtools-20021103-20021106.diff.bz2) = d9e878d0bade89a59d20c891de5bb8d9 -MD5 (pkgtools-20021106-20021109.diff.bz2) = f983a3efd722f88df91bce036aa40f9d -MD5 (pkgtools-20021109-20021113.diff.bz2) = c9d205b39b1d36c0db592364e52fff0b -MD5 (pkgtools-20021113-20021119.diff.bz2) = 716ad4791718361f3d930db05beba9b6 +MD5 (pkgtools-20021209.tar.bz2) = 55898afff6ffe56fe739a3689b55a067 diff --git a/ports-mgmt/portupgrade/files/patch-pkgtools.rb b/ports-mgmt/portupgrade/files/patch-pkgtools.rb deleted file mode 100644 index 8caf4b3d3bfb..000000000000 --- a/ports-mgmt/portupgrade/files/patch-pkgtools.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.100 -diff -u -1 -r1.100 pkgtools.rb ---- lib/pkgtools.rb 19 Nov 2002 04:53:50 -0000 1.100 -+++ lib/pkgtools.rb 20 Nov 2002 06:01:28 -0000 -@@ -649,4 +649,4 @@ - -- filter_file(shelljoin('sed', '-E', -- "s|^(@comment[[:space:]]+ORIGIN:).*$|\\1#{origin}|"), -+ filter_file(shelljoin('sed', -+ "s|^\\(@comment[ \t][ \t]*ORIGIN:\\).*$|\\1#{origin}|"), - contents_file) diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index a65fe1c15ed8..0b59403b833a 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -6,23 +6,19 @@ # PORTNAME= portupgrade -PORTVERSION= 20021119 +PORTVERSION= 20021209 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20021101 +DISTVERSION= ${PORTVERSION} .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -PATCHFILES= ${DISTNAME}-20021103.diff.bz2 \ - pkgtools-20021103-20021106.diff.bz2 \ - pkgtools-20021106-20021109.diff.bz2 \ - pkgtools-20021109-20021113.diff.bz2 \ - pkgtools-20021113-${PORTVERSION}.diff.bz2 +PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index c19bd1895a95..d81f701e3396 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1,6 +1 @@ -MD5 (pkgtools-20021101.tar.bz2) = 56d5eb15e5cf03233e91c518af7c4bb8 -MD5 (pkgtools-20021101-20021103.diff.bz2) = 223d19090ae98ff54838a7472f766bed -MD5 (pkgtools-20021103-20021106.diff.bz2) = d9e878d0bade89a59d20c891de5bb8d9 -MD5 (pkgtools-20021106-20021109.diff.bz2) = f983a3efd722f88df91bce036aa40f9d -MD5 (pkgtools-20021109-20021113.diff.bz2) = c9d205b39b1d36c0db592364e52fff0b -MD5 (pkgtools-20021113-20021119.diff.bz2) = 716ad4791718361f3d930db05beba9b6 +MD5 (pkgtools-20021209.tar.bz2) = 55898afff6ffe56fe739a3689b55a067 diff --git a/sysutils/portupgrade-devel/files/patch-pkgtools.rb b/sysutils/portupgrade-devel/files/patch-pkgtools.rb deleted file mode 100644 index 8caf4b3d3bfb..000000000000 --- a/sysutils/portupgrade-devel/files/patch-pkgtools.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.100 -diff -u -1 -r1.100 pkgtools.rb ---- lib/pkgtools.rb 19 Nov 2002 04:53:50 -0000 1.100 -+++ lib/pkgtools.rb 20 Nov 2002 06:01:28 -0000 -@@ -649,4 +649,4 @@ - -- filter_file(shelljoin('sed', '-E', -- "s|^(@comment[[:space:]]+ORIGIN:).*$|\\1#{origin}|"), -+ filter_file(shelljoin('sed', -+ "s|^\\(@comment[ \t][ \t]*ORIGIN:\\).*$|\\1#{origin}|"), - contents_file) diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index a65fe1c15ed8..0b59403b833a 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -6,23 +6,19 @@ # PORTNAME= portupgrade -PORTVERSION= 20021119 +PORTVERSION= 20021209 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20021101 +DISTVERSION= ${PORTVERSION} .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -PATCHFILES= ${DISTNAME}-20021103.diff.bz2 \ - pkgtools-20021103-20021106.diff.bz2 \ - pkgtools-20021106-20021109.diff.bz2 \ - pkgtools-20021109-20021113.diff.bz2 \ - pkgtools-20021113-${PORTVERSION}.diff.bz2 +PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo index c19bd1895a95..d81f701e3396 100644 --- a/sysutils/portupgrade/distinfo +++ b/sysutils/portupgrade/distinfo @@ -1,6 +1 @@ -MD5 (pkgtools-20021101.tar.bz2) = 56d5eb15e5cf03233e91c518af7c4bb8 -MD5 (pkgtools-20021101-20021103.diff.bz2) = 223d19090ae98ff54838a7472f766bed -MD5 (pkgtools-20021103-20021106.diff.bz2) = d9e878d0bade89a59d20c891de5bb8d9 -MD5 (pkgtools-20021106-20021109.diff.bz2) = f983a3efd722f88df91bce036aa40f9d -MD5 (pkgtools-20021109-20021113.diff.bz2) = c9d205b39b1d36c0db592364e52fff0b -MD5 (pkgtools-20021113-20021119.diff.bz2) = 716ad4791718361f3d930db05beba9b6 +MD5 (pkgtools-20021209.tar.bz2) = 55898afff6ffe56fe739a3689b55a067 diff --git a/sysutils/portupgrade/files/patch-pkgtools.rb b/sysutils/portupgrade/files/patch-pkgtools.rb deleted file mode 100644 index 8caf4b3d3bfb..000000000000 --- a/sysutils/portupgrade/files/patch-pkgtools.rb +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.100 -diff -u -1 -r1.100 pkgtools.rb ---- lib/pkgtools.rb 19 Nov 2002 04:53:50 -0000 1.100 -+++ lib/pkgtools.rb 20 Nov 2002 06:01:28 -0000 -@@ -649,4 +649,4 @@ - -- filter_file(shelljoin('sed', '-E', -- "s|^(@comment[[:space:]]+ORIGIN:).*$|\\1#{origin}|"), -+ filter_file(shelljoin('sed', -+ "s|^\\(@comment[ \t][ \t]*ORIGIN:\\).*$|\\1#{origin}|"), - contents_file) |