svn commit: r451391 - in head/sysutils/puppet4: . files

[Zach Leslie]

Author: zleslie
Date: Fri Oct  6 16:15:59 2017
New Revision: 451391
URL: https://svnweb.freebsd.org/changeset/ports/451391

Log:
  Patch puppet.rb for locales issue
  
  We are currently installing locales to a directory that is unexpected
  by puppet and throws loads of warnings in the logs. Here we patch the location
  that looks for the locales location to use the location that we install the
  locales to. This has been corrected in newer versions of puppet, and the
  sysutils/puppet5 port does not install to this same location.
  
  Approved-by:	mat(co-mentor)

Added:
  head/sysutils/puppet4/files/patch-lib_puppet.rb   (contents, props changed)
Modified:
  head/sysutils/puppet4/Makefile

Modified: head/sysutils/puppet4/Makefile
==============================================================================
--- head/sysutils/puppet4/Makefile	Fri Oct  6 16:12:22 2017	(r451390)
+++ head/sysutils/puppet4/Makefile	Fri Oct  6 16:15:59 2017	(r451391)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	4.10.8
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	4

Added: head/sysutils/puppet4/files/patch-lib_puppet.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/puppet4/files/patch-lib_puppet.rb	Fri Oct  6 16:15:59 2017	(r451391)
@@ -0,0 +1,11 @@
+--- lib/puppet.rb.orig	2017-10-04 19:54:04.901540166 -0700
++++ lib/puppet.rb	2017-10-04 19:54:43.391840139 -0700
+@@ -29,7 +29,7 @@
+   require 'locale'
+ 
+   # e.g. ~/code/puppet/locales. Also when running as a gem.
+-  local_locale_path = File.absolute_path('../locales', File.dirname(__FILE__))
++  local_locale_path = File.absolute_path('/var/puppet/share/locales', File.dirname(__FILE__))
+   # e.g. /opt/puppetlabs/puppet/share/locale
+   posix_system_locale_path = File.absolute_path('../../../share/locale', File.dirname(__FILE__))
+   # e.g. C:\Program Files\Puppet Labs\Puppet\puppet\share\locale