Update sysutils/ruby-facter to 1.5.8.

* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Move MASTER_SITES to first section.
* Update HOMEPAGE.
* Add LICENSE.
* Remove default value of GEM_BUILD.
* Add CONFLICTS since it will install the same name commands both
  ruby18 and ruby19 based packages.


1.5.8
=====
ca2da36  Updated install.rb and created man page
3671c9f  [#4583] Refactor uptime to use Resolution.exec
fca8861  [#4594] Reintroduce fix for #1291 from original patch
32c0cb0  [#4594] Revert "fixes #2573, #2085, #1291..."
e7df4c0  Updated CHANGELOG for 1.5.8rc2
9c9cabd  Better fix for Bug 4569: Uptime Fact is incorrect on Windows
01a515f  [#4289] operatingsystemrelease fact for oel, ovs
b6c0a6b  Fix for bug #4569
51bcebe  Fixed Rakefile package task version detection
81ccb48  Removed references to Reductive Labs in the Rakefile

1.5.8rc1
========
f280703  Incremented version to 1.5.8
98ef5e8  Updated CHANGELOG for 1.5.8rc1
4398b36  Updated CHANGELOG rake task
e02be1d  [#4156] Updating spec to match Kai's change
bff84c2  [#4156] Applying patch by Kai
b7fe989  [#2330] Update uptime calculation to use /bin/cat
e9a60bc  Facter::Manufacturer - sunos test + simplified regex
be411c0  Facter::Manufacturer - test for SunOS and FreeBSD
67f6604  [#4062] Implement operating system facts for MeeGo
a2bcacd  [#2330] Uptime should not make redundant system calls
ce7bd9f  Refactor rakefile to use spec.ops, separate rcov task
faaa169  Fix #4352 - Support for detecting KVM virtuals on FreeBSD
82286e4  Fix #4352 - Support for detecting virtuals (jails) on FreeBSD
b2c2114  Properly wrapped the windows ipaddress fact in a setcode block.
1bd2ca2  Fixed #3929 - Added user confine to AIX memory facts
8106bc3  Adding HP-UX support to Facter's IP facts
83b3ea6  Fixed #3393 - Updates to Facter for MS Windows
ffcae46  Fixed #3403 - Added fact to query vlans; added spec test
d4b8401  Merged Jos Backus patch to remove requirement for ftools altogether
73dcbb9  Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7
d109def  Fix #1365 - load all facts via cli
6c87917  Fixed failing test introduced by previous commit
c5b8d3b  Fixes #3740 - split dmi output on regex
25bf5c2  Fix virtual unit test on non-linux by stubbing kernel
9a00eae  Fixed #2313 - Somewhat essential hardware facts not available on OpenBSD, patch included
e19024b  Fixed #2938 - interfaces that don't match ^\w+[.:]?\d+ are ignored
97879f9  Added support for Slackware in operatingsystem and operatingsystemrelease
802e6c2  Fixed #3542 - Ruby 1.9: broken unittest, String#each no longer exists
2f016f3  Fixed #3541 - Ruby 1.9: broken unittest, unexpected invocation: Process.waitall()
84d3d9f  Fixed #3445 - Facter does not handle solaris branded zones properly
b5a8de0  Fix for #3411 install.rb should not put "." first in the tmp_dirs
8ea33eb  Fixed #3447 - OVS and OEL not matching in operatingsystemrelease
aeee83c  Fixed #3410 - Warnings in rake spec
8bf8cb5  Fixes #3397 - is_virtual fact does not detect Linux-VServer
62b6773  Add kvm support to virtual fact
dca615c  fixes #2573, #2085, #1291 - fixes domain and fqdn facts resolution
86447c8  Revert "use popen3 in Resolution.exec"
7750f03  Fix #2341 - stricter handling of dmidecode split
f4269d9  Fix #2746 - add architecture support for GNU/kFreeBSD
50cef83  Fix missing error case
356cf15  Remove whitespace in DMI facts (#3008, #3011)
feecd39  Only ignore IPs starting with 127.
68fc123  Added package signing task
33fb770  use popen3 in Resolution.exec to catch stderr
8109806  introduce a warn mechanism for debugging
b2c1ca5  Add docs to Mac OS X package creation script and clean out old docs in the preflight
5412eab  Fixed : 2788 - ftools missing in Ruby 1.9
5b95a12  Fixes #2704. Problem finding install.rb three levels up
9aef69e  Removed all ChangeLog

3 files changed, 43 insertions, 18 deletions

diff --git a/sysutils/ruby-facter/Makefile b/sysutils/ruby-facter/Makefile
index e1cf866bb34..4fc60d85dc9 100644
--- a/sysutils/ruby-facter/Makefile
+++ b/sysutils/ruby-facter/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2009/11/17 18:46:15 apb Exp $
+# $NetBSD: Makefile,v 1.7 2010/09/10 07:56:40 taca Exp $
 
-DISTNAME=		facter-1.5.7
-PKGNAME=		${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=		sysutils
+DISTNAME=	facter-1.5.8
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+CATEGORIES=	sysutils
+MASTER_SITES=	http://reductivelabs.com/downloads/gems/
 
-MAINTAINER=		tonnerre@NetBSD.org
-HOMEPAGE=		http://www.reductivelabs.com/projects/facter/
-MASTER_SITES=		http://reductivelabs.com/downloads/gems/
-COMMENT=		Cross-platform Ruby library for retrieving facts from OS
+MAINTAINER=	tonnerre@NetBSD.org
+HOMEPAGE=	http://www.puppetlabs.com/puppet/related-projects/facter/
+COMMENT=	Cross-platform Ruby library for retrieving facts from OS
+LICENSE=	gnu-gpl-v2
 
-GEM_BUILD=		gemspec
+CONFLICTS+=	ruby[1-9][0-9]-facter-*
 
-.include "../../misc/rubygems/rubygem.mk"
+pre-configure:
+	${CHMOD} -R g-w ${WRKSRC}
+
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ruby-facter/PLIST b/sysutils/ruby-facter/PLIST
index dcf26dbf451..58792033271 100644
--- a/sysutils/ruby-facter/PLIST
+++ b/sysutils/ruby-facter/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2009/10/21 21:03:28 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/09/10 07:56:40 taca Exp $
 bin/facter
-${GEM_HOME}/cache/facter-${PKGVERSION}.gem
+${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG
 ${GEM_LIBDIR}/COPYING
-${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/INSTALL
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/README
@@ -58,6 +57,9 @@ ${GEM_LIBDIR}/lib/facter/ssh.rb
 ${GEM_LIBDIR}/lib/facter/timezone.rb
 ${GEM_LIBDIR}/lib/facter/uniqueid.rb
 ${GEM_LIBDIR}/lib/facter/uptime.rb
+${GEM_LIBDIR}/lib/facter/uptime_days.rb
+${GEM_LIBDIR}/lib/facter/uptime_hours.rb
+${GEM_LIBDIR}/lib/facter/uptime_seconds.rb
 ${GEM_LIBDIR}/lib/facter/util/collection.rb
 ${GEM_LIBDIR}/lib/facter/util/confine.rb
 ${GEM_LIBDIR}/lib/facter/util/fact.rb
@@ -74,8 +76,13 @@ ${GEM_LIBDIR}/lib/facter/util/resolution.rb
 ${GEM_LIBDIR}/lib/facter/util/uptime.rb
 ${GEM_LIBDIR}/lib/facter/util/values.rb
 ${GEM_LIBDIR}/lib/facter/util/virtual.rb
+${GEM_LIBDIR}/lib/facter/util/vlans.rb
 ${GEM_LIBDIR}/lib/facter/virtual.rb
+${GEM_LIBDIR}/lib/facter/vlans.rb
 ${GEM_LIBDIR}/spec/Rakefile
+${GEM_LIBDIR}/spec/fixtures/uptime/sysctl_kern_boottime
+${GEM_LIBDIR}/spec/fixtures/uptime/ubuntu_proc_uptime
+${GEM_LIBDIR}/spec/fixtures/uptime/who_b_boottime
 ${GEM_LIBDIR}/spec/integration/facter.rb
 ${GEM_LIBDIR}/spec/spec.opts
 ${GEM_LIBDIR}/spec/spec_helper.rb
@@ -83,20 +90,34 @@ ${GEM_LIBDIR}/spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
 ${GEM_LIBDIR}/spec/unit/data/Mac_OS_X_10.5.5_ifconfig
 ${GEM_LIBDIR}/spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces
 ${GEM_LIBDIR}/spec/unit/data/darwin_ifconfig_single_interface
+${GEM_LIBDIR}/spec/unit/data/freebsd_dmidecode
+${GEM_LIBDIR}/spec/unit/data/hpux_ifconfig
+${GEM_LIBDIR}/spec/unit/data/hpux_ifconfig_single_interface
+${GEM_LIBDIR}/spec/unit/data/hpux_netscan
+${GEM_LIBDIR}/spec/unit/data/hpux_netstat_all_interfaces
+${GEM_LIBDIR}/spec/unit/data/linux_dmidecode_with_spaces
 ${GEM_LIBDIR}/spec/unit/data/linux_ifconfig_all_with_single_interface
+${GEM_LIBDIR}/spec/unit/data/linux_vlan_config
+${GEM_LIBDIR}/spec/unit/data/opensolaris_smbios
 ${GEM_LIBDIR}/spec/unit/data/solaris_ifconfig_all_with_multiple_interfaces
 ${GEM_LIBDIR}/spec/unit/data/solaris_ifconfig_single_interface
 ${GEM_LIBDIR}/spec/unit/facter.rb
 ${GEM_LIBDIR}/spec/unit/interfaces.rb
 ${GEM_LIBDIR}/spec/unit/operatingsystem.rb
+${GEM_LIBDIR}/spec/unit/operatingsystemrelease.rb
 ${GEM_LIBDIR}/spec/unit/selinux.rb
+${GEM_LIBDIR}/spec/unit/uptime.rb
 ${GEM_LIBDIR}/spec/unit/util/collection.rb
 ${GEM_LIBDIR}/spec/unit/util/confine.rb
 ${GEM_LIBDIR}/spec/unit/util/fact.rb
 ${GEM_LIBDIR}/spec/unit/util/ip.rb
 ${GEM_LIBDIR}/spec/unit/util/loader.rb
 ${GEM_LIBDIR}/spec/unit/util/macosx.rb
+${GEM_LIBDIR}/spec/unit/util/manufacturer.rb
 ${GEM_LIBDIR}/spec/unit/util/resolution.rb
+${GEM_LIBDIR}/spec/unit/util/uptime.rb
 ${GEM_LIBDIR}/spec/unit/util/virtual.rb
+${GEM_LIBDIR}/spec/unit/util/vlans.rb
 ${GEM_LIBDIR}/spec/unit/virtual.rb
-${GEM_HOME}/specifications/facter-${PKGVERSION}.gemspec
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
+
diff --git a/sysutils/ruby-facter/distinfo b/sysutils/ruby-facter/distinfo
index b3aa342c95a..e920b79019a 100644
--- a/sysutils/ruby-facter/distinfo
+++ b/sysutils/ruby-facter/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2009/10/21 21:03:28 tonnerre Exp $
+$NetBSD: distinfo,v 1.6 2010/09/10 07:56:40 taca Exp $
 
-SHA1 (facter-1.5.7.gem) = 30e412bcc217d697f029eee71883475011dde18c
-RMD160 (facter-1.5.7.gem) = 7b5d48384ea59e606c6f17c91dcbc802c84e07a1
-Size (facter-1.5.7.gem) = 75776 bytes
+SHA1 (facter-1.5.8.gem) = 7abaf7d37a6d7cd891a2ab04443fdef41060c145
+RMD160 (facter-1.5.8.gem) = 0aee9f378fd3de876e23a033b750874626b7e700
+Size (facter-1.5.8.gem) = 74240 bytes