From owner-svn-ports-head@freebsd.org Fri Oct 6 16:16:00 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74388E3AD2C; Fri, 6 Oct 2017 16:16:00 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41012649FC; Fri, 6 Oct 2017 16:16:00 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v96GFxvN045503; Fri, 6 Oct 2017 16:15:59 GMT (envelope-from zleslie@FreeBSD.org) Received: (from zleslie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v96GFxA5045501; Fri, 6 Oct 2017 16:15:59 GMT (envelope-from zleslie@FreeBSD.org) Message-Id: <201710061615.v96GFxA5045501@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zleslie set sender to zleslie@FreeBSD.org using -f From: Zach Leslie Date: Fri, 6 Oct 2017 16:15:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451391 - in head/sysutils/puppet4: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zleslie X-SVN-Commit-Paths: in head/sysutils/puppet4: . files X-SVN-Commit-Revision: 451391 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Oct 2017 16:16:00 -0000 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