svn commit: r475227 - in head/sysutils/rubygem-r10k: . files

[Romain Tartière]

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 at FreeBSD.org
+MAINTAINER=	puppet at 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 <bsd.port.mk>

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 = []