diff options
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb | 20 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/files/patch-lib-pkgtools.rb | 20 |
4 files changed, 2 insertions, 42 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 0bfa936a65b6..35f9545d3198 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 2.1.5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://sunner.elcomnet.ru/~sem/ -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITE_SUBDIR= portupgrade DISTNAME= pkgtools-${DISTVERSION} MAINTAINER= sem@FreeBSD.org diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb deleted file mode 100644 index 87dcfe5ff3a8..000000000000 --- a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/pkgtools.rb.orig Sat Jun 3 10:05:09 2006 -+++ lib/pkgtools.rb Mon Jun 19 16:36:55 2006 -@@ -1048,7 +1048,7 @@ - - pkg = PkgInfo.new(pkgname) - -- re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh))(\.\w+)?$" -+ re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh)?)(\.\w+)?$" - - ret = [] - pkg.files.each { |file| -@@ -1066,7 +1066,7 @@ - - pkg = PkgInfo.new(pkgname) - -- re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+\.sh)(\.\w+)$" -+ re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh)?)(\.\w+)$" - - pkg.files.select { |file| - re =~ file && File.executable?(file) diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index 0bfa936a65b6..35f9545d3198 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 2.1.5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://sunner.elcomnet.ru/~sem/ -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITE_SUBDIR= portupgrade DISTNAME= pkgtools-${DISTVERSION} MAINTAINER= sem@FreeBSD.org diff --git a/sysutils/portupgrade-devel/files/patch-lib-pkgtools.rb b/sysutils/portupgrade-devel/files/patch-lib-pkgtools.rb deleted file mode 100644 index 87dcfe5ff3a8..000000000000 --- a/sysutils/portupgrade-devel/files/patch-lib-pkgtools.rb +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/pkgtools.rb.orig Sat Jun 3 10:05:09 2006 -+++ lib/pkgtools.rb Mon Jun 19 16:36:55 2006 -@@ -1048,7 +1048,7 @@ - - pkg = PkgInfo.new(pkgname) - -- re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh))(\.\w+)?$" -+ re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh)?)(\.\w+)?$" - - ret = [] - pkg.files.each { |file| -@@ -1066,7 +1066,7 @@ - - pkg = PkgInfo.new(pkgname) - -- re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+\.sh)(\.\w+)$" -+ re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh)?)(\.\w+)$" - - pkg.files.select { |file| - re =~ file && File.executable?(file) |