1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00

sysutils/rubygem-facter: update 1.7.6 -> 2.0.2

- Update sysutils/rubygem-facter to 2.0.2 as in PR 191246
- Change maintainer address to robak@FreeBSD.org
- Update URL in pkg-descr

PR:		191246
Submitted by:	Michael Moll
Approved by:	swills (mentor)
This commit is contained in:
Bartek Rutkowski 2014-06-23 20:17:35 +00:00
parent 7dceec1a1f
commit 6f4024f7f7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=359003
5 changed files with 11 additions and 30 deletions

View File

@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME= facter
PORTVERSION= 1.7.6
PORTVERSION= 2.0.2
CATEGORIES= sysutils rubygems
MASTER_SITES= RG \
http://downloads.puppetlabs.com/facter/
MAINTAINER= robak@freebsd.org
MAINTAINER= robak@FreeBSD.org
COMMENT= Cross-platform Ruby library for retrieving facts from OS
USE_RUBY= yes
@ -18,8 +18,8 @@ PLIST_FILES= bin/facter
.include <bsd.port.pre.mk>
# Restrict dmidecode dependency to i386 and amd64 systems
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
# Restrict dmidecode dependency to Intel based systems
.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode
.endif

View File

@ -1,2 +1,2 @@
SHA256 (rubygem/facter-1.7.6.gem) = 592ab025a91011b80a82cdc1a105a3b84e85d17c65154ee97478f02f745da45d
SIZE (rubygem/facter-1.7.6.gem) = 203776
SHA256 (rubygem/facter-2.0.2.gem) = afa70d9278c98ba2a8bdf762673f418b4028ffa4d4634606719d44ef7b371069
SIZE (rubygem/facter-2.0.2.gem) = 198144

View File

@ -1,19 +0,0 @@
--- lib/facter/processor.rb.orig 2013-04-30 19:57:21.000000000 +0400
+++ lib/facter/processor.rb 2013-04-30 19:58:19.000000000 +0400
@@ -88,14 +88,14 @@
end
Facter.add("Processor") do
- confine :kernel => :openbsd
+ confine :kernel => [ :openbsd, :freebsd ]
setcode do
Facter::Util::Resolution.exec("uname -p")
end
end
Facter.add("ProcessorCount") do
- confine :kernel => :openbsd
+ confine :kernel => [ :openbsd, :freebsd ]
setcode do
Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
end

View File

@ -2,10 +2,10 @@
+++ 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?
if Facter::Core::Execution.which('zpool')
zpool_v = Facter::Core::Execution.exec('zpool upgrade -v')
- zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.empty?
+ zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.empty?
end
end
end

View File

@ -4,4 +4,4 @@ working only on certain operating systems or environments. Facter is
especially useful for retrieving things like operating system names, IP
addresses, MAC addresses, and SSH keys.
WWW: https://puppetlabs.com/puppet/related-projects/facter/
WWW: https://puppetlabs.com/facter