Attachment #179624 for bug #216807

Lines 1-7 Link Here

(-)Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= puppet	3	PORTNAME= puppet
4	PORTVERSION= 4.8.2	4	PORTVERSION= 4.9.1
5	CATEGORIES= sysutils	5	CATEGORIES= sysutils
6	MASTER_SITES= http://downloads.puppetlabs.com/puppet/	6	MASTER_SITES= http://downloads.puppetlabs.com/puppet/
7	PKGNAMESUFFIX= 4	7	PKGNAMESUFFIX= 4
Lines 75-81 Link Here
75	${WRKSRC}/ext/rack/config.ru	75	${WRKSRC}/ext/rack/config.ru
76		76
77	do-install:	77	do-install:
78	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}	78	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} --localedir=/var/puppet/share/locales
79		79
80	post-install:	80	post-install:
81	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests	81	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1485549930	1	TIMESTAMP = 1486269327
2	SHA256 (puppet-4.8.2.tar.gz) = fc71ca0be64b4b1282e0064b8fbf115c547cb87ca6b209da56e1b9569567404a	2	SHA256 (puppet-4.9.1.tar.gz) = db02cffb8339b349bd1ab2b15899511d3f5d449f0f591038256f0fb862f4c7db
3	SIZE (puppet-4.8.2.tar.gz) = 2873651	3	SIZE (puppet-4.9.1.tar.gz) = 2912770




--- lib/puppet.rb.orig	2017-02-04 20:55:19.503801289 -0800
+++ lib/puppet.rb	2017-02-04 20:58:54.650300411 -0800
@@ -53,6 +53,7 @@
 
   class << self
     if Puppet::GETTEXT_AVAILABLE
+      freebsd_locale_path = '/var/puppet/share/locales'
       # e.g. ~/code/puppet/locales. Also when running as a gem.
       local_locale_path = File.absolute_path('../locales', File.dirname(__FILE__))
       # e.g. /opt/puppetlabs/puppet/share/locale
@@ -60,7 +61,9 @@
       # e.g. C:\Program Files\Puppet Labs\Puppet\puppet\share\locale
       win32_system_locale_path = File.absolute_path('../../../../../puppet/share/locale', File.dirname(__FILE__))
 
-      if File.exist?(local_locale_path)
+      if File.exist?(freebsd_locale_path)
+        locale_path = freebsd_locale_path
+      elsif File.exist?(local_locale_path)
         locale_path = local_locale_path
       elsif File.exist?(win32_system_locale_path)
         locale_path = win32_system_locale_path

Lines 42-46 Link Here

(-)pkg-plist (+2 lines)
42	@dir(puppet,puppet,) %%ETCDIR%%/manifests	42	@dir(puppet,puppet,) %%ETCDIR%%/manifests
43	@dir(puppet,puppet,) %%ETCDIR%%/modules	43	@dir(puppet,puppet,) %%ETCDIR%%/modules
44	@dir(puppet,puppet,) /var/puppet	44	@dir(puppet,puppet,) /var/puppet
		45	@dir(puppet,puppet,) /var/puppet/share/locales
		46	@dir(puppet,puppet,) /var/puppet/share
45	@dir(puppet,puppet,) /var/log/puppet	47	@dir(puppet,puppet,) /var/log/puppet
46	@dir /var/run/puppet	48	@dir /var/run/puppet

Return to bug 216807

Line 0 Link Here

(-)files/patch-lib_puppet.rb (+21 lines)
	1	--- lib/puppet.rb.orig 2017-02-04 20:55:19.503801289 -0800
	2	+++ lib/puppet.rb 2017-02-04 20:58:54.650300411 -0800
	3	@@ -53,6 +53,7 @@
	4
	5	class << self
	6	if Puppet::GETTEXT_AVAILABLE
	7	+ freebsd_locale_path = '/var/puppet/share/locales'
	8	# e.g. ~/code/puppet/locales. Also when running as a gem.
	9	local_locale_path = File.absolute_path('../locales', File.dirname(__FILE__))
	10	# e.g. /opt/puppetlabs/puppet/share/locale
	11	@@ -60,7 +61,9 @@
	12	# e.g. C:\Program Files\Puppet Labs\Puppet\puppet\share\locale
	13	win32_system_locale_path = File.absolute_path('../../../../../puppet/share/locale', File.dirname(__FILE__))
	14
	15	- if File.exist?(local_locale_path)
	16	+ if File.exist?(freebsd_locale_path)
	17	+ locale_path = freebsd_locale_path
	18	+ elsif File.exist?(local_locale_path)
	19	locale_path = local_locale_path
	20	elsif File.exist?(win32_system_locale_path)
	21	locale_path = win32_system_locale_path