From 6bffeb55e02dce00592294a5b1b51f650300c653 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 6 Oct 2017 16:15:59 +0000 Subject: [PATCH] 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) --- sysutils/puppet4/Makefile | 1 + sysutils/puppet4/files/patch-lib_puppet.rb | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 sysutils/puppet4/files/patch-lib_puppet.rb diff --git a/sysutils/puppet4/Makefile b/sysutils/puppet4/Makefile index 312d71e4fe71..0acc4789feb4 100644 --- a/sysutils/puppet4/Makefile +++ b/sysutils/puppet4/Makefile @@ -2,6 +2,7 @@ PORTNAME= puppet PORTVERSION= 4.10.8 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 4 diff --git a/sysutils/puppet4/files/patch-lib_puppet.rb b/sysutils/puppet4/files/patch-lib_puppet.rb new file mode 100644 index 000000000000..384f590866a2 --- /dev/null +++ b/sysutils/puppet4/files/patch-lib_puppet.rb @@ -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