aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authoralepulver <alepulver@FreeBSD.org>2007-09-29 23:59:55 +0800
committeralepulver <alepulver@FreeBSD.org>2007-09-29 23:59:55 +0800
commita21840e5d5e2c6828c3d8de93b33538dbbe817ea (patch)
tree3cb69ab269a925d81afb2b2b6e39af53b1e3fd3c /sysutils
parent445ef291606bf187155c6c3a3693c7e4c3949796 (diff)
downloadfreebsd-ports-gnome-a21840e5d5e2c6828c3d8de93b33538dbbe817ea.tar.gz
freebsd-ports-gnome-a21840e5d5e2c6828c3d8de93b33538dbbe817ea.tar.zst
freebsd-ports-gnome-a21840e5d5e2c6828c3d8de93b33538dbbe817ea.zip
- Remove unnecessary patches.
Reported by: pav Forgotten by: alepulver (myself)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/puppet-devel/files/patch-define_batch13
-rw-r--r--sysutils/puppet-devel/files/patch-old_rcd_support25
-rw-r--r--sysutils/puppet-devel/files/patch-package-name-with-dash13
3 files changed, 0 insertions, 51 deletions
diff --git a/sysutils/puppet-devel/files/patch-define_batch b/sysutils/puppet-devel/files/patch-define_batch
deleted file mode 100644
index e97ffddaa161..000000000000
--- a/sysutils/puppet-devel/files/patch-define_batch
+++ /dev/null
@@ -1,13 +0,0 @@
-always define PATCH. without it, puppetd hangs when upgrading INTERACTIVE port.
-http://reductivelabs.com/trac/puppet/ticket/624
---- lib/puppet/provider/package/ports.rb.orig Tue May 8 14:55:34 2007
-+++ lib/puppet/provider/package/ports.rb Tue May 8 14:55:57 2007
-@@ -19,7 +19,7 @@
- # -p: create a package
- # -N: install if the package is missing, otherwise upgrade
- # -P: prefer binary packages
-- cmd = %w{-p -N -P} << @model[:name]
-+ cmd = %w{-p -N -P -M BATCH=yes} << @model[:name]
-
- output = portupgrade(*cmd)
- if output =~ /\*\* No such /
diff --git a/sysutils/puppet-devel/files/patch-old_rcd_support b/sysutils/puppet-devel/files/patch-old_rcd_support
deleted file mode 100644
index fb8d928d2f7e..000000000000
--- a/sysutils/puppet-devel/files/patch-old_rcd_support
+++ /dev/null
@@ -1,25 +0,0 @@
-Support both /etc/rc.d/daemon and /etc/rc.d/daemon.sh
-http://reductivelabs.com/trac/puppet/ticket/572
-
---- lib/puppet/provider/service/init.rb.orig Mon Apr 2 17:52:00 2007
-+++ lib/puppet/provider/service/init.rb Mon Apr 2 18:01:50 2007
-@@ -114,6 +114,19 @@
- # if we've gotten this far, we found a valid script
- return fqname
- }
-+ @model[:path].each { |path|
-+ fqname_sh = File.join(path,"#{name}.sh")
-+ begin
-+ stat = File.stat(fqname_sh)
-+ rescue
-+ # should probably rescue specific errors...
-+ self.debug("Could not find %s.sh in %s" % [name,path])
-+ next
-+ end
-+
-+ # if we've gotten this far, we found a valid script
-+ return fqname_sh
-+ }
- raise Puppet::Error, "Could not find init script for '%s'" % name
- end
-
diff --git a/sysutils/puppet-devel/files/patch-package-name-with-dash b/sysutils/puppet-devel/files/patch-package-name-with-dash
deleted file mode 100644
index 93b60bc6dfa0..000000000000
--- a/sysutils/puppet-devel/files/patch-package-name-with-dash
+++ /dev/null
@@ -1,13 +0,0 @@
-support package that contains '-' in its name, like syslog-ng
-http://reductivelabs.com/trac/puppet/ticket/628
---- lib/puppet/provider/package/ports.rb.orig Wed May 9 17:12:39 2007
-+++ lib/puppet/provider/package/ports.rb Wed May 9 17:13:57 2007
-@@ -47,7 +47,7 @@
- match = $2
- info = $3
-
-- unless pkgstuff =~ /^(\w+)-([0-9].+)$/
-+ unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
- raise Puppet::PackageError,
- "Could not match package info '%s'" % pkgstuff
- end