From 1b5b1d26d56f77594c8423b1f5d11ebb0ef85224 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Sun, 28 Mar 2004 22:40:25 +0000 Subject: Fix a stupid bug introduced by the last update, which destroyed pkgnames and caused portupgrade to fail. Reported by: Palle Girgensohn --- sysutils/portupgrade-devel/Makefile | 1 + sysutils/portupgrade-devel/files/patch-pkgversion.rb | 9 +++++++++ sysutils/portupgrade/Makefile | 1 + sysutils/portupgrade/files/patch-pkgversion.rb | 9 +++++++++ 4 files changed, 20 insertions(+) create mode 100644 sysutils/portupgrade-devel/files/patch-pkgversion.rb create mode 100644 sysutils/portupgrade/files/patch-pkgversion.rb (limited to 'sysutils') diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index c1d1ff0ba6c1..f0fb16101736 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20040325 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} diff --git a/sysutils/portupgrade-devel/files/patch-pkgversion.rb b/sysutils/portupgrade-devel/files/patch-pkgversion.rb new file mode 100644 index 000000000000..9a644935fbcd --- /dev/null +++ b/sysutils/portupgrade-devel/files/patch-pkgversion.rb @@ -0,0 +1,9 @@ +--- lib/pkgversion.rb.orig Mon Mar 29 07:35:38 2004 ++++ lib/pkgversion.rb Mon Mar 29 07:36:10 2004 +@@ -62,4 +62,4 @@ + # ignore padded 0's +- n1.gsub!(/(^|\D)0+(\d)/, "\\1\\2") +- n2.gsub!(/(^|\D)0+(\d)/, "\\1\\2") ++ n1 = n1.gsub(/(^|\D)0+(\d)/, "\\1\\2") ++ n2 = n2.gsub(/(^|\D)0+(\d)/, "\\1\\2") + diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index c1d1ff0ba6c1..f0fb16101736 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20040325 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} diff --git a/sysutils/portupgrade/files/patch-pkgversion.rb b/sysutils/portupgrade/files/patch-pkgversion.rb new file mode 100644 index 000000000000..9a644935fbcd --- /dev/null +++ b/sysutils/portupgrade/files/patch-pkgversion.rb @@ -0,0 +1,9 @@ +--- lib/pkgversion.rb.orig Mon Mar 29 07:35:38 2004 ++++ lib/pkgversion.rb Mon Mar 29 07:36:10 2004 +@@ -62,4 +62,4 @@ + # ignore padded 0's +- n1.gsub!(/(^|\D)0+(\d)/, "\\1\\2") +- n2.gsub!(/(^|\D)0+(\d)/, "\\1\\2") ++ n1 = n1.gsub(/(^|\D)0+(\d)/, "\\1\\2") ++ n2 = n2.gsub(/(^|\D)0+(\d)/, "\\1\\2") + -- cgit v1.2.3