svn commit: r547208 - in head/sysutils/rubygem-facter: . files

[Romain Tartière]

Author: romain
Date: Mon Aug 31 19:57:09 2020
New Revision: 547208
URL: https://svnweb.freebsd.org/changeset/ports/547208

Log:
  Update to 4.0.35
  
  ChangeLog:
  https://github.com/puppetlabs/facter/blob/4.x/CHANGELOG.md#4035-2020-08-19
  
  Pass maintainership to puppet@ [1]
  
  PR:		249036 [1]
  Approved by:	robak (maintainer) [1]
  With hat:	puppet

Added:
  head/sysutils/rubygem-facter/files/
  head/sysutils/rubygem-facter/files/patch-lib_facter_custom__facts_util_config.rb   (contents, props changed)
Modified:
  head/sysutils/rubygem-facter/Makefile
  head/sysutils/rubygem-facter/distinfo

Modified: head/sysutils/rubygem-facter/Makefile
==============================================================================
--- head/sysutils/rubygem-facter/Makefile	Mon Aug 31 19:53:18 2020	(r547207)
+++ head/sysutils/rubygem-facter/Makefile	Mon Aug 31 19:57:09 2020	(r547208)
@@ -2,43 +2,24 @@
 # $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 at FreeBSD.org
+MAINTAINER=	puppet at 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

Modified: head/sysutils/rubygem-facter/distinfo
==============================================================================
--- head/sysutils/rubygem-facter/distinfo	Mon Aug 31 19:53:18 2020	(r547207)
+++ head/sysutils/rubygem-facter/distinfo	Mon Aug 31 19:57:09 2020	(r547208)
@@ -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

Added: head/sysutils/rubygem-facter/files/patch-lib_facter_custom__facts_util_config.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/rubygem-facter/files/patch-lib_facter_custom__facts_util_config.rb	Mon Aug 31 19:57:09 2020	(r547208)
@@ -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'