diff options
author | sem <sem@FreeBSD.org> | 2006-07-02 22:26:15 +0800 |
---|---|---|
committer | sem <sem@FreeBSD.org> | 2006-07-02 22:26:15 +0800 |
commit | d0a4354e008cf3ff765457c40b7ebdff777c3ead (patch) | |
tree | 74e72f3f3f01297b09db60bdec35440b1d2b3e04 /ports-mgmt | |
parent | 0daa750005ca40db699d7ea32e289511eb45701f (diff) | |
download | freebsd-ports-gnome-d0a4354e008cf3ff765457c40b7ebdff777c3ead.tar.gz freebsd-ports-gnome-d0a4354e008cf3ff765457c40b7ebdff777c3ead.tar.zst freebsd-ports-gnome-d0a4354e008cf3ff765457c40b7ebdff777c3ead.zip |
- Remove forgotten patch.
- Fix MASTER_SITE_SUBDIR.
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
-rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb | 20 |
2 files changed, 1 insertions, 21 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) |