aboutsummaryrefslogtreecommitdiff
path: root/sysutils/rubygem-facter
diff options
context:
space:
mode:
authorRomain Tartière <romain@FreeBSD.org>2020-08-31 19:57:09 +0000
committerRomain Tartière <romain@FreeBSD.org>2020-08-31 19:57:09 +0000
commit1434e6b77d79a1669041c0965737062c8e48db1b (patch)
tree711d16c2c14a4fd004dc954b2e7d30068a23ce26 /sysutils/rubygem-facter
parent265e73a6afeba289d37ff315db3376a91a5ebf9d (diff)
downloadports-1434e6b77d79a1669041c0965737062c8e48db1b.tar.gz
ports-1434e6b77d79a1669041c0965737062c8e48db1b.zip
Notes
Diffstat (limited to 'sysutils/rubygem-facter')
-rw-r--r--sysutils/rubygem-facter/Makefile33
-rw-r--r--sysutils/rubygem-facter/distinfo6
-rw-r--r--sysutils/rubygem-facter/files/patch-lib_facter_custom__facts_util_config.rb10
3 files changed, 20 insertions, 29 deletions
diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile
index b04284c97ebc..89312d57821f 100644
--- a/sysutils/rubygem-facter/Makefile
+++ b/sysutils/rubygem-facter/Makefile
@@ -2,44 +2,25 @@
# $FreeBSD$
PORTNAME= facter
-PORTVERSION= 2.5.1
-PORTREVISION= 2
+PORTVERSION= 4.0.35
CATEGORIES= sysutils rubygems
-MASTER_SITES= RG \
- http://downloads.puppetlabs.com/facter/
+MASTER_SITES= RG
-MAINTAINER= robak@FreeBSD.org
+MAINTAINER= puppet@FreeBSD.org
COMMENT= Cross-platform Ruby library for retrieving facts from OS
LICENSE= APACHE20
-LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_RUBY= yes
+RUN_DEPENDS= rubygem-hocon>=1.3:devel/rubygem-hocon \
+ rubygem-thor>=1.0.1:devel/rubygem-thor
+
USES= gem
+USE_RUBY= yes
PLIST_FILES= bin/facter ${GEMS_DIR}/facter
-OPTIONS_DEFINE= EC2_FACTS ZFS_FACTS
-EC2_FACTS_DESC= Generate AWS EC2 related facts
-ZFS_FACTS_DESC= Generate ZFS related facts
-
-OPTIONS_DEFAULT= EC2_FACTS ZFS_FACTS
-
.include <bsd.port.pre.mk>
-# Restrict dmidecode dependency to x86-based systems
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-RUN_DEPENDS+= dmidecode:sysutils/dmidecode
-.endif
-
-post-patch-EC2_FACTS-off:
- @${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/ec2.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
- @${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/ec2\/rest.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
-
-post-patch-ZFS_FACTS-off:
- @${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/zfs_version.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
- @${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/zpool_version.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
-
post-install:
${RLN} ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter-${PORTVERSION} ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter
diff --git a/sysutils/rubygem-facter/distinfo b/sysutils/rubygem-facter/distinfo
index 2c83e433cc1b..e808272dec50 100644
--- a/sysutils/rubygem-facter/distinfo
+++ b/sysutils/rubygem-facter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508036681
-SHA256 (rubygem/facter-2.5.1.gem) = 6108a6178ee727088915984d161c2006e5bf991134fd37f29417ec5fbdfee51c
-SIZE (rubygem/facter-2.5.1.gem) = 254464
+TIMESTAMP = 1598484920
+SHA256 (rubygem/facter-4.0.35.gem) = 229749ba7151278d7bf980e032497c03e316d1073e9f58be56ec82977cfa04ca
+SIZE (rubygem/facter-4.0.35.gem) = 124416
diff --git a/sysutils/rubygem-facter/files/patch-lib_facter_custom__facts_util_config.rb b/sysutils/rubygem-facter/files/patch-lib_facter_custom__facts_util_config.rb
new file mode 100644
index 000000000000..9bc20c1a5681
--- /dev/null
+++ b/sysutils/rubygem-facter/files/patch-lib_facter_custom__facts_util_config.rb
@@ -0,0 +1,10 @@
+--- lib/facter/custom_facts/util/config.rb.orig 2020-08-31 03:41:56 UTC
++++ lib/facter/custom_facts/util/config.rb
+@@ -43,6 +43,7 @@ module LegacyFacter
+ [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
+ else
+ [
++ '/usr/local/etc/facter/facts.d/',
+ '/etc/puppetlabs/facter/facts.d',
+ '/etc/facter/facts.d/',
+ '/opt/puppetlabs/facter/facts.d'