Index: head/sysutils/rubygem-r10k/Makefile =================================================================== --- head/sysutils/rubygem-r10k/Makefile (revision 475226) +++ head/sysutils/rubygem-r10k/Makefile (revision 475227) @@ -1,29 +1,34 @@ # $FreeBSD$ 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 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-colored>=1.2:textproc/rubygem-colored \ rubygem-cri>=2.6.1:devel/rubygem-cri \ rubygem-gettext-setup>=0.5:devel/rubygem-gettext-setup \ rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \ rubygem-multi_json>=1.10:devel/rubygem-multi_json \ rubygem-puppet_forge>=2.2.8:sysutils/rubygem-puppet_forge NO_ARCH= yes USE_RUBY= yes 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 Index: head/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb =================================================================== --- head/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb (nonexistent) +++ head/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb (revision 475227) @@ -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 = [] Property changes on: head/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property