freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysutils/puppet{38,4}: fix path to daemontools'es commands

Browse Source 
PR:		208628
Submitted by:	Alexey <fbsd98816551@avksrv.org>
Approved by:	Zach Leslie <freebsd@zleslie.info> (maintainer of sysutils/puppet4)
This commit is contained in:
Steve Wills
2017-01-04 21:19:45 +00:00
parent bda391284d
commit f2eea0b52f
4 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/puppet38/Makefile
View File

@@ -3,6 +3,7 @@
PORTNAME= puppet
PORTVERSION= 3.8.7
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 38

20
sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb Normal file
View File

@@ -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

1
sysutils/puppet4/Makefile
View File

@@ -2,6 +2,7 @@
PORTNAME= puppet
PORTVERSION= 4.6.2
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 4

20
sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb Normal file
View File

@@ -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