From owner-svn-ports-head@freebsd.org Tue Jul 24 06:47:50 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BECEC10426EB; Tue, 24 Jul 2018 06:47:49 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FD63825A9; Tue, 24 Jul 2018 06:47:49 +0000 (UTC) (envelope-from romain@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4AC4527D49; Tue, 24 Jul 2018 06:47:49 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6O6ln2q025916; Tue, 24 Jul 2018 06:47:49 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6O6lm03025914; Tue, 24 Jul 2018 06:47:48 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201807240647.w6O6lm03025914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Tue, 24 Jul 2018 06:47:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475227 - in head/sysutils/rubygem-r10k: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils/rubygem-r10k: . files X-SVN-Commit-Revision: 475227 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.27 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: Tue, 24 Jul 2018 06:47:50 -0000 Author: romain Date: Tue Jul 24 06:47:48 2018 New Revision: 475227 URL: https://svnweb.freebsd.org/changeset/ports/475227 Log: Add a patch to search for configuration files under PREFIX, e.g. /usr/local/etc/r10k/r10k.yaml /usr/local/etc/r10k.yaml While here, pass maintainership to puppet@ PR: 227341 Submitted by: romain Approved by: swills (with ruby hat) Added: head/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb (contents, props changed) Modified: head/sysutils/rubygem-r10k/Makefile Modified: head/sysutils/rubygem-r10k/Makefile ============================================================================== --- head/sysutils/rubygem-r10k/Makefile Tue Jul 24 06:33:50 2018 (r475226) +++ head/sysutils/rubygem-r10k/Makefile Tue Jul 24 06:47:48 2018 (r475227) @@ -2,10 +2,11 @@ PORTNAME= r10k PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= puppet@FreeBSD.org COMMENT= Tool for deploying Puppet environments and modules LICENSE= APACHE20 @@ -25,5 +26,9 @@ USES= gem shebangfix PLIST_FILES= bin/r10k SHEBANG_FILES= integration/*/*.sh + +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ + ${WRKSRC}/lib/r10k/settings/loader.rb .include Added: head/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb Tue Jul 24 06:47:48 2018 (r475227) @@ -0,0 +1,24 @@ +--- lib/r10k/settings/loader.rb.orig 2018-04-07 11:13:36 UTC ++++ lib/r10k/settings/loader.rb +@@ -8,8 +8,8 @@ module R10K + # + # r10k.yaml is checked for in the following locations: + # - $PWD/r10k.yaml +- # - /etc/puppetlabs/r10k/r10k.yaml +- # - /etc/r10k.yaml ++ # - %%PREFIX%%/etc/r10k/r10k.yaml ++ # - %%PREFIX%%/etc/r10k.yaml + class Loader + + def self.search(override = nil) +@@ -21,8 +21,8 @@ module R10K + attr_reader :loadpath + + CONFIG_FILE = 'r10k.yaml' +- DEFAULT_LOCATION = File.join('/etc/puppetlabs/r10k', CONFIG_FILE) +- OLD_DEFAULT_LOCATION = File.join('/etc', CONFIG_FILE) ++ DEFAULT_LOCATION = File.join('%%PREFIX%%/etc/r10k', CONFIG_FILE) ++ OLD_DEFAULT_LOCATION = File.join('%%PREFIX%%/etc', CONFIG_FILE) + + def initialize + @loadpath = []