Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Aug 2020 20:02:28 +0000 (UTC)
From:      =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547211 - head/sysutils/puppet6
Message-ID:  <202008312002.07VK2SGT083621@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: romain
Date: Mon Aug 31 20:02:27 2020
New Revision: 547211
URL: https://svnweb.freebsd.org/changeset/ports/547211

Log:
  Update to 6.18.0
  
  Release notes:
  https://puppet.com/docs/puppet/6.18/release_notes_puppet.html#release_notes_puppet_x-18-0
  
  While here, reintroduce the RFACTER option to use the Future Facter 4.x with
  Puppet.
  
  With hat:	puppet

Modified:
  head/sysutils/puppet6/Makefile
  head/sysutils/puppet6/distinfo

Modified: head/sysutils/puppet6/Makefile
==============================================================================
--- head/sysutils/puppet6/Makefile	Mon Aug 31 20:01:58 2020	(r547210)
+++ head/sysutils/puppet6/Makefile	Mon Aug 31 20:02:27 2020	(r547211)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	6.17.0
+PORTVERSION=	6.18.0
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	6
 
@@ -13,13 +13,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		fails to install: Could not load facter; cannot install
 
-BUILD_DEPENDS=	facter>=3.0:sysutils/facter \
-		rubygem-deep_merge>=1.0:devel/rubygem-deep_merge \
+BUILD_DEPENDS=	rubygem-deep_merge>=1.0:devel/rubygem-deep_merge \
 		rubygem-hiera>=2.0:sysutils/rubygem-hiera \
 		rubygem-json_pure>=0:devel/rubygem-json_pure \
 		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
-RUN_DEPENDS=	facter>=3.0:sysutils/facter \
-		rubygem-concurrent-ruby>0:devel/rubygem-concurrent-ruby \
+RUN_DEPENDS=	rubygem-concurrent-ruby>0:devel/rubygem-concurrent-ruby \
 		rubygem-deep_merge>0:devel/rubygem-deep_merge \
 		rubygem-gettext-setup>=0:devel/rubygem-gettext-setup \
 		rubygem-hiera>=2.0:sysutils/rubygem-hiera \
@@ -47,6 +45,18 @@ SUB_FILES+=	pkg-message
 SUB_LIST=	RUBY=${RUBY}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFAULT=	CFACTER
+OPTIONS_RADIO=		FACTER
+OPTIONS_RADIO_FACTER=	CFACTER RFACTER
+
+RFACTER_DESC=	Use facter 4.x (future facter, written in Ruby)
+CFACTER_DESC=	Use facter 3.x (written in C++)
+
+RFACTER_BUILD_DEPENDS=	rubygem-facter>=4.0:sysutils/rubygem-facter
+RFACTER_RUN_DEPENDS=	rubygem-facter>=4.0:sysutils/rubygem-facter
+
+CFACTER_BUILD_DEPENDS=	facter>=3.0:sysutils/facter
+CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \

Modified: head/sysutils/puppet6/distinfo
==============================================================================
--- head/sysutils/puppet6/distinfo	Mon Aug 31 20:01:58 2020	(r547210)
+++ head/sysutils/puppet6/distinfo	Mon Aug 31 20:02:27 2020	(r547211)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594765831
-SHA256 (puppetlabs-puppet-6.17.0_GH0.tar.gz) = 7df661a22b8199dc493c68ab856ca40b3001d4dde850a59ee16ca474e4d21ad3
-SIZE (puppetlabs-puppet-6.17.0_GH0.tar.gz) = 3359164
+TIMESTAMP = 1598484535
+SHA256 (puppetlabs-puppet-6.18.0_GH0.tar.gz) = 95d2a820e12c9e6dab9cbbbfd12848bfd8e46a9b35803f2fd7f03d19c3173082
+SIZE (puppetlabs-puppet-6.18.0_GH0.tar.gz) = 3368659



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008312002.07VK2SGT083621>