Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Sep 2017 12:30:32 +0000 (UTC)
From:      =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r450365 - head/sysutils/puppet5
Message-ID:  <201709221230.v8MCUW2j034982@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: romain
Date: Fri Sep 22 12:30:32 2017
New Revision: 450365
URL: https://svnweb.freebsd.org/changeset/ports/450365

Log:
  Update to 5.2.0
  
  This include fixes related to the way available locales are found.
  
  With hat:	puppet

Modified:
  head/sysutils/puppet5/Makefile
  head/sysutils/puppet5/distinfo
  head/sysutils/puppet5/pkg-plist

Modified: head/sysutils/puppet5/Makefile
==============================================================================
--- head/sysutils/puppet5/Makefile	Fri Sep 22 12:29:39 2017	(r450364)
+++ head/sysutils/puppet5/Makefile	Fri Sep 22 12:30:32 2017	(r450365)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	5.1.0
+PORTVERSION=	5.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
@@ -14,7 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
 		rubygem-json_pure>=0:devel/rubygem-json_pure
-RUN_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
+RUN_DEPENDS=	rubygem-gettext-setup>=0:devel/rubygem-gettext-setup \
+		rubygem-hiera>=2.0:sysutils/rubygem-hiera \
 		rubygem-hocon>=0:devel/rubygem-hocon \
 		rubygem-json_pure>=0:devel/rubygem-json_pure \
 		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas
@@ -72,12 +73,14 @@ post-patch:
 		${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb
 	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
 		${WRKSRC}/lib/puppet/defaults.rb
+	@${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \
+		${WRKSRC}/lib/puppet/gettext/config.rb
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
 		${WRKSRC}/ext/rack/config.ru
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
-		--localedir=/var/puppet/share/locales
+		--localedir=${RUBY_SITELIBDIR}/puppet/locales
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests

Modified: head/sysutils/puppet5/distinfo
==============================================================================
--- head/sysutils/puppet5/distinfo	Fri Sep 22 12:29:39 2017	(r450364)
+++ head/sysutils/puppet5/distinfo	Fri Sep 22 12:30:32 2017	(r450365)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503053153
-SHA256 (puppet-5.1.0.tar.gz) = ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c
-SIZE (puppet-5.1.0.tar.gz) = 2734018
+TIMESTAMP = 1505385268
+SHA256 (puppet-5.2.0.tar.gz) = 4b6cedb9c5d288b3218d08e9f0b688596c173896a4575b26c9438151f32a135c
+SIZE (puppet-5.2.0.tar.gz) = 2834084

Modified: head/sysutils/puppet5/pkg-plist
==============================================================================
--- head/sysutils/puppet5/pkg-plist	Fri Sep 22 12:29:39 2017	(r450364)
+++ head/sysutils/puppet5/pkg-plist	Fri Sep 22 12:30:32 2017	(r450365)
@@ -35,13 +35,9 @@ man/man8/puppet-report.8.gz
 man/man8/puppet-resource.8.gz
 man/man8/puppet-status.8.gz
 man/man8/puppet.8.gz
-/var/puppet/share/locales/config.yaml
-/var/puppet/share/locales/puppet.pot
 @(puppet,puppet,) %%WWWDIR%%/config.ru
 @dir(puppet,puppet,) %%ETCDIR%%/manifests
 @dir(puppet,puppet,) %%ETCDIR%%/modules
 @dir(puppet,puppet,) /var/puppet
-@dir(puppet,puppet,) /var/puppet/share
-@dir(puppet,puppet,) /var/puppet/share/locales
 @dir(puppet,puppet,) /var/log/puppet
 @dir /var/run/puppet



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709221230.v8MCUW2j034982>