svn commit: r430595 - in head/sysutils: puppet38 puppet38/files puppet4 puppet4/files
Steve Wills
swills at FreeBSD.org
Wed Jan 4 21:19:47 UTC 2017
Author: swills
Date: Wed Jan 4 21:19:45 2017
New Revision: 430595
URL: https://svnweb.freebsd.org/changeset/ports/430595
Log:
sysutils/puppet{38,4}: fix path to daemontools'es commands
PR: 208628
Submitted by: Alexey <fbsd98816551 at avksrv.org>
Approved by: Zach Leslie <freebsd at zleslie.info> (maintainer of sysutils/puppet4)
Added:
head/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb (contents, props changed)
head/sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb (contents, props changed)
Modified:
head/sysutils/puppet38/Makefile
head/sysutils/puppet4/Makefile
Modified: head/sysutils/puppet38/Makefile
==============================================================================
--- head/sysutils/puppet38/Makefile Wed Jan 4 20:51:46 2017 (r430594)
+++ head/sysutils/puppet38/Makefile Wed Jan 4 21:19:45 2017 (r430595)
@@ -3,6 +3,7 @@
PORTNAME= puppet
PORTVERSION= 3.8.7
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 38
Added: head/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb Wed Jan 4 21:19:45 2017 (r430595)
@@ -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
Modified: head/sysutils/puppet4/Makefile
==============================================================================
--- head/sysutils/puppet4/Makefile Wed Jan 4 20:51:46 2017 (r430594)
+++ head/sysutils/puppet4/Makefile Wed Jan 4 21:19:45 2017 (r430595)
@@ -2,6 +2,7 @@
PORTNAME= puppet
PORTVERSION= 4.6.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 4
Added: head/sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/puppet4/files/patch-lib_puppet_provider_service_daemontools.rb Wed Jan 4 21:19:45 2017 (r430595)
@@ -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
More information about the svn-ports-all
mailing list