diff options
| author | swills <swills@FreeBSD.org> | 2017-01-05 05:19:45 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2017-01-05 05:19:45 +0800 |
| commit | 17f21b361dc593514efd1c74bbc6a4c03cca6154 (patch) | |
| tree | 1ff065712e0b825114c497a36a8868dde5ef6b26 | |
| parent | 8ef50abca0aeee843cc1ecc88a847f5faafd95cc (diff) | |
| download | freebsd-ports-gnome-17f21b361dc593514efd1c74bbc6a4c03cca6154.tar.gz freebsd-ports-gnome-17f21b361dc593514efd1c74bbc6a4c03cca6154.tar.zst freebsd-ports-gnome-17f21b361dc593514efd1c74bbc6a4c03cca6154.zip | |
sysutils/puppet{38,4}: fix path to daemontools'es commands
PR: 208628
Submitted by: Alexey <fbsd98816551@avksrv.org>
Approved by: Zach Leslie <freebsd@zleslie.info> (maintainer of sysutils/puppet4)
| -rw-r--r-- | sysutils/puppet38/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb | 20 | ||||
| -rw-r--r-- | sysutils/puppet4/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb | 20 |
4 files changed, 42 insertions, 0 deletions
diff --git a/sysutils/puppet38/Makefile b/sysutils/puppet38/Makefile index 48b13f39a421..ab995393c7cc 100644 --- a/sysutils/puppet38/Makefile +++ b/sysutils/puppet38/Makefile @@ -3,6 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.8.7 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 38 diff --git a/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb new file mode 100644 index 000000000000..3857c824a1ba --- /dev/null +++ b/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb @@ -0,0 +1,20 @@ +--- lib/puppet/provider/service/daemontools.rb.orig 2016-04-25 18:52:09 UTC ++++ lib/puppet/provider/service/daemontools.rb +@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae + + EOT + +- commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat" ++ commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat" + + class << self + attr_writer :defpath +@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae + # find the service dir on this node + def servicedir + unless @servicedir +- ["/service", "/etc/service","/var/lib/svscan"].each do |path| ++ ["/var/service", "/etc/service","/var/lib/svscan"].each do |path| + if Puppet::FileSystem.exist?(path) + @servicedir = path + break diff --git a/sysutils/puppet4/Makefile b/sysutils/puppet4/Makefile index 2fe7df113a48..c270d791fef4 100644 --- a/sysutils/puppet4/Makefile +++ b/sysutils/puppet4/Makefile @@ -2,6 +2,7 @@ PORTNAME= puppet PORTVERSION= 4.6.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 4 diff --git a/sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb new file mode 100644 index 000000000000..3857c824a1ba --- /dev/null +++ b/sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb @@ -0,0 +1,20 @@ +--- lib/puppet/provider/service/daemontools.rb.orig 2016-04-25 18:52:09 UTC ++++ lib/puppet/provider/service/daemontools.rb +@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae + + EOT + +- commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat" ++ commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat" + + class << self + attr_writer :defpath +@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae + # find the service dir on this node + def servicedir + unless @servicedir +- ["/service", "/etc/service","/var/lib/svscan"].each do |path| ++ ["/var/service", "/etc/service","/var/lib/svscan"].each do |path| + if Puppet::FileSystem.exist?(path) + @servicedir = path + break |