svn commit: r493642 - in head/sysutils: puppet4 puppet4/files puppet5 puppet5/files puppet6 puppet6/files

[Romain Tartière]

Author: romain
Date: Sat Feb 23 05:38:27 2019
New Revision: 493642
URL: https://svnweb.freebsd.org/changeset/ports/493642

Log:
  Do not hardcode /usr/local and rely on %%PREFIX%%.
  
  While here, also add %%PREFIX%%/sbin to $PATH.
  Bump PORTREVISION for this change.
  
  With hat:	puppet

Modified:
  head/sysutils/puppet4/Makefile
  head/sysutils/puppet4/files/puppet.in
  head/sysutils/puppet5/Makefile
  head/sysutils/puppet5/files/puppet.in
  head/sysutils/puppet6/Makefile
  head/sysutils/puppet6/files/puppet.in

Modified: head/sysutils/puppet4/Makefile
==============================================================================
--- head/sysutils/puppet4/Makefile	Sat Feb 23 05:22:13 2019	(r493641)
+++ head/sysutils/puppet4/Makefile	Sat Feb 23 05:38:27 2019	(r493642)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	4.10.12
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	4

Modified: head/sysutils/puppet4/files/puppet.in
==============================================================================
--- head/sysutils/puppet4/files/puppet.in	Sat Feb 23 05:22:13 2019	(r493641)
+++ head/sysutils/puppet4/files/puppet.in	Sat Feb 23 05:38:27 2019	(r493642)
@@ -30,7 +30,7 @@ unset puppet_flags
 pidfile="${puppet_rundir}/agent.pid"
 start_precmd="install -d -o puppet -g puppet ${pidfile%/*}"
 
-PATH="${PATH}:/usr/local/bin"
+PATH="${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin"
 
 # An UTF-8 locale is required
 : LC_ALL=${LC_ALL:=C.UTF-8}

Modified: head/sysutils/puppet5/Makefile
==============================================================================
--- head/sysutils/puppet5/Makefile	Sat Feb 23 05:22:13 2019	(r493641)
+++ head/sysutils/puppet5/Makefile	Sat Feb 23 05:38:27 2019	(r493642)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	5.5.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5

Modified: head/sysutils/puppet5/files/puppet.in
==============================================================================
--- head/sysutils/puppet5/files/puppet.in	Sat Feb 23 05:22:13 2019	(r493641)
+++ head/sysutils/puppet5/files/puppet.in	Sat Feb 23 05:38:27 2019	(r493642)
@@ -30,7 +30,7 @@ unset puppet_flags
 pidfile="${puppet_rundir}/agent.pid"
 start_precmd="install -d -o puppet -g puppet ${pidfile%/*}"
 
-PATH="${PATH}:/usr/local/bin"
+PATH="${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin"
 
 # An UTF-8 locale is required
 : LC_ALL=${LC_ALL:=C.UTF-8}

Modified: head/sysutils/puppet6/Makefile
==============================================================================
--- head/sysutils/puppet6/Makefile	Sat Feb 23 05:22:13 2019	(r493641)
+++ head/sysutils/puppet6/Makefile	Sat Feb 23 05:38:27 2019	(r493642)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	6.3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	6
 

Modified: head/sysutils/puppet6/files/puppet.in
==============================================================================
--- head/sysutils/puppet6/files/puppet.in	Sat Feb 23 05:22:13 2019	(r493641)
+++ head/sysutils/puppet6/files/puppet.in	Sat Feb 23 05:38:27 2019	(r493642)
@@ -30,7 +30,7 @@ unset puppet_flags
 pidfile="${puppet_rundir}/agent.pid"
 start_precmd="install -d -o puppet -g puppet ${pidfile%/*}"
 
-PATH="${PATH}:/usr/local/bin"
+PATH="${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin"
 
 # An UTF-8 locale is required
 : LC_ALL=${LC_ALL:=C.UTF-8}