aboutsummaryrefslogtreecommitdiff
path: root/sysutils/rubygem-facter
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2013-10-30 21:11:45 +0000
committerSteve Wills <swills@FreeBSD.org>2013-10-30 21:11:45 +0000
commit0c04628a51dd5bb1672d2246797138c0f1829781 (patch)
tree55b4fd4e8304241e2262326016acfb0a8e0a85f4 /sysutils/rubygem-facter
parent58e696356117338cd6797465f5865f2c3e072d7d (diff)
downloadports-0c04628a51dd5bb1672d2246797138c0f1829781.tar.gz
ports-0c04628a51dd5bb1672d2246797138c0f1829781.zip
- Add patch dropped in last commit
- Bump PORTREVISION Pointyhat to: swills
Notes
Notes: svn path=/head/; revision=332174
Diffstat (limited to 'sysutils/rubygem-facter')
-rw-r--r--sysutils/rubygem-facter/Makefile1
-rw-r--r--sysutils/rubygem-facter/files/patch-lib-facter-zpool_version.rb11
2 files changed, 12 insertions, 0 deletions
diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile
index d255fedd4ce3..9a43aefb3f5c 100644
--- a/sysutils/rubygem-facter/Makefile
+++ b/sysutils/rubygem-facter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= facter
PORTVERSION= 1.7.3
+PORTREVISION= 1
CATEGORIES= sysutils rubygems
MASTER_SITES= RG \
http://downloads.puppetlabs.com/facter/
diff --git a/sysutils/rubygem-facter/files/patch-lib-facter-zpool_version.rb b/sysutils/rubygem-facter/files/patch-lib-facter-zpool_version.rb
new file mode 100644
index 000000000000..1fbe2ee97ffd
--- /dev/null
+++ b/sysutils/rubygem-facter/files/patch-lib-facter-zpool_version.rb
@@ -0,0 +1,11 @@
+--- lib/facter/zpool_version.rb.orig
++++ lib/facter/zpool_version.rb
+@@ -4,7 +4,7 @@
+ setcode do
+ if Facter::Util::Resolution.which('zpool')
+ zpool_v = Facter::Util::Resolution.exec('zpool upgrade -v')
+- zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.nil?
++ zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.nil?
+ end
+ end
+ end