From owner-svn-ports-head@freebsd.org Sat Aug 12 13:35:42 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D2A0DD6F05; Sat, 12 Aug 2017 13:35:42 +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 mx1.freebsd.org (Postfix) with ESMTPS id 672831B82; Sat, 12 Aug 2017 13:35:42 +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 v7CDZfg9093419; Sat, 12 Aug 2017 13:35:41 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7CDZfN4093416; Sat, 12 Aug 2017 13:35:41 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201708121335.v7CDZfN4093416@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, 12 Aug 2017 13:35:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447830 - in head/sysutils/puppet4: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils/puppet4: . files X-SVN-Commit-Revision: 447830 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Aug 2017 13:35:42 -0000 Author: romain Date: Sat Aug 12 13:35:40 2017 New Revision: 447830 URL: https://svnweb.freebsd.org/changeset/ports/447830 Log: Update to 4.10.6 - Ensure an UTF-8 locale is used to avoid problems with facter; - Ensure /usr/local/bin is in $PATH when puppet runs; - Update conflicts (remove old ones and register a new one for the upcomming puppet5); With hat: puppet Modified: head/sysutils/puppet4/Makefile head/sysutils/puppet4/distinfo head/sysutils/puppet4/files/puppet.in Modified: head/sysutils/puppet4/Makefile ============================================================================== --- head/sysutils/puppet4/Makefile Sat Aug 12 13:21:07 2017 (r447829) +++ head/sysutils/puppet4/Makefile Sat Aug 12 13:35:40 2017 (r447830) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 4.10.4 +PORTVERSION= 4.10.6 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 4 @@ -20,7 +20,7 @@ RUN_DEPENDS= rubygem-hiera>=2.0:sysutils/rubygem-hiera USES= cpe CPE_VENDOR= puppetlabs -CONFLICTS_INSTALL= puppet38-* puppet37-* +CONFLICTS_INSTALL= puppet5-* NO_ARCH= yes NO_BUILD= yes USE_RUBY= yes @@ -75,7 +75,7 @@ post-patch: ${WRKSRC}/ext/rack/config.ru do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ + @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ --localedir=/var/puppet/share/locales post-install: @@ -83,7 +83,7 @@ post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}/var/puppet ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist - ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ + ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ --vardir=/var/puppet \ Modified: head/sysutils/puppet4/distinfo ============================================================================== --- head/sysutils/puppet4/distinfo Sat Aug 12 13:21:07 2017 (r447829) +++ head/sysutils/puppet4/distinfo Sat Aug 12 13:35:40 2017 (r447830) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498495069 -SHA256 (puppet-4.10.4.tar.gz) = 59b8510ddf2f49342a39ccbe26bc7b2ea5e16d79de9dd572d929de58967aab90 -SIZE (puppet-4.10.4.tar.gz) = 2968202 +TIMESTAMP = 1502442267 +SHA256 (puppet-4.10.6.tar.gz) = 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a +SIZE (puppet-4.10.6.tar.gz) = 2977099 Modified: head/sysutils/puppet4/files/puppet.in ============================================================================== --- head/sysutils/puppet4/files/puppet.in Sat Aug 12 13:21:07 2017 (r447829) +++ head/sysutils/puppet4/files/puppet.in Sat Aug 12 13:35:40 2017 (r447830) @@ -30,4 +30,20 @@ unset puppet_flags pidfile="${puppet_rundir}/agent.pid" start_precmd="install -d -o puppet -g puppet ${pidfile%/*}" +PATH="${PATH}:/usr/local/bin" + +# An UTF-8 locale is required +: LC_ALL=${LC_ALL:=C.UTF-8} +case $LC_ALL in + *.UTF-8) + ;; + *.*) + LC_ALL="${LC_ALL%.*}.UTF-8" + ;; + *) + LC_ALL=C.UTF-8 + ;; +esac +export LC_ALL + run_rc_command "$1"