aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorromain <romain@FreeBSD.org>2017-09-22 20:30:32 +0800
committerromain <romain@FreeBSD.org>2017-09-22 20:30:32 +0800
commit01ccf5295bedbf8e53b400f901361fc6b5e4c630 (patch)
treea99919d6693acbfcbde4f624b976b63e379932ec
parent44a49b46a30c8acce7097b5be287f427f1ffd255 (diff)
downloadfreebsd-ports-gnome-01ccf5295bedbf8e53b400f901361fc6b5e4c630.tar.gz
freebsd-ports-gnome-01ccf5295bedbf8e53b400f901361fc6b5e4c630.tar.zst
freebsd-ports-gnome-01ccf5295bedbf8e53b400f901361fc6b5e4c630.zip
Update to 5.2.0
This include fixes related to the way available locales are found. With hat: puppet
-rw-r--r--sysutils/puppet5/Makefile9
-rw-r--r--sysutils/puppet5/distinfo6
-rw-r--r--sysutils/puppet5/pkg-plist4
3 files changed, 9 insertions, 10 deletions
diff --git a/sysutils/puppet5/Makefile b/sysutils/puppet5/Makefile
index 488db82ea6f4..5cdaf71a550b 100644
--- a/sysutils/puppet5/Makefile
+++ b/sysutils/puppet5/Makefile
@@ -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
diff --git a/sysutils/puppet5/distinfo b/sysutils/puppet5/distinfo
index 6c56830e56b8..d7b9c04dedd0 100644
--- a/sysutils/puppet5/distinfo
+++ b/sysutils/puppet5/distinfo
@@ -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
diff --git a/sysutils/puppet5/pkg-plist b/sysutils/puppet5/pkg-plist
index c66e6ffb91ea..ff4137def2c6 100644
--- a/sysutils/puppet5/pkg-plist
+++ b/sysutils/puppet5/pkg-plist
@@ -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