Attachment #143999 for bug #191246

View | Details | Raw Unified | Return to bug 191246
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= facter	4	PORTNAME= facter
5	PORTVERSION= 1.7.6	5	PORTVERSION= 2.0.2
6	CATEGORIES= sysutils rubygems	6	CATEGORIES= sysutils rubygems
7	MASTER_SITES= RG \	7	MASTER_SITES= RG \
8	http://downloads.puppetlabs.com/facter/	8	http://downloads.puppetlabs.com/facter/
Lines 18-25 Link Here
18		18
19	.include <bsd.port.pre.mk>	19	.include <bsd.port.pre.mk>
20		20
21	# Restrict dmidecode dependency to i386 and amd64 systems	21	# Restrict dmidecode dependency to Intel based systems
22	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	22	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386" \|\| ${ARCH} == "ia64"
23	RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode	23	RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode
24	.endif	24	.endif
25		25

Lines 1-2 Link Here

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




--- 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

Lines 2-11 Link Here

(-)files/patch-lib-facter-zpool_version.rb (-4 / +4 lines)
2	+++ lib/facter/zpool_version.rb	2	+++ lib/facter/zpool_version.rb
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4	setcode do	4	setcode do
5	if Facter::Util::Resolution.which('zpool')	5	if Facter::Core::Execution.which('zpool')
6	zpool_v = Facter::Util::Resolution.exec('zpool upgrade -v')	6	zpool_v = Facter::Core::Execution.exec('zpool upgrade -v')
7	- zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.nil?	7	- zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.empty?
8	+ zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.nil?	8	+ zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.empty?
9	end	9	end
10	end	10	end
11	end	11	end

Lines 4-7 Link Here

(-)pkg-descr (-1 / +1 lines)
4	especially useful for retrieving things like operating system names, IP	4	especially useful for retrieving things like operating system names, IP
5	addresses, MAC addresses, and SSH keys.	5	addresses, MAC addresses, and SSH keys.
6		6
7	WWW: https://puppetlabs.com/puppet/related-projects/facter/	7	WWW: https://puppetlabs.com/facter

Return to bug 191246

Lines 1-19 Link Here

(-)files/patch-lib-facter-processor.rb (-19 lines)
1	--- lib/facter/processor.rb.orig 2013-04-30 19:57:21.000000000 +0400
2	+++ lib/facter/processor.rb 2013-04-30 19:58:19.000000000 +0400
3	@@ -88,14 +88,14 @@
4	end
5
6	Facter.add("Processor") do
7	- confine :kernel => :openbsd
8	+ confine :kernel => [ :openbsd, :freebsd ]
9	setcode do
10	Facter::Util::Resolution.exec("uname -p")
11	end
12	end
13
14	Facter.add("ProcessorCount") do
15	- confine :kernel => :openbsd
16	+ confine :kernel => [ :openbsd, :freebsd ]
17	setcode do
18	Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
19	end