From owner-svn-ports-all@freebsd.org Sat Feb 23 05:38:29 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E7521507C44; Sat, 23 Feb 2019 05:38:29 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0D91273080; Sat, 23 Feb 2019 05:38:29 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C08ED18CB8; Sat, 23 Feb 2019 05:38:28 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1N5cSre089848; Sat, 23 Feb 2019 05:38:28 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1N5cRJq089841; Sat, 23 Feb 2019 05:38:27 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201902230538.x1N5cRJq089841@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Sat, 23 Feb 2019 05:38:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493642 - in head/sysutils: puppet4 puppet4/files puppet5 puppet5/files puppet6 puppet6/files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils: puppet4 puppet4/files puppet5 puppet5/files puppet6 puppet6/files X-SVN-Commit-Revision: 493642 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0D91273080 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.939,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2019 05:38:29 -0000 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}