summaryrefslogtreecommitdiff
path: root/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb
blob: 87dcfe5ff3a8d96162c1141d1b4f50d983043605 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
--- 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)