Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Sep 2018 07:44:49 +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: r480786 - in head/sysutils: . puppet4 puppet5 puppet6 puppet6/files
Message-ID:  <201809270744.w8R7inQm040874@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: romain
Date: Thu Sep 27 07:44:48 2018
New Revision: 480786
URL: https://svnweb.freebsd.org/changeset/ports/480786

Log:
  New port: sysutils/puppet6
  
  Release notes:
  https://puppet.com/docs/puppet/6.0/release_notes.html
  
  With hat:	puppet

Added:
  head/sysutils/puppet6/
     - copied from r480785, head/sysutils/puppet5/
Deleted:
  head/sysutils/puppet6/files/patch-ext__rack__config.ru
  head/sysutils/puppet6/files/puppetmaster.in
Modified:
  head/sysutils/Makefile
  head/sysutils/puppet4/Makefile
  head/sysutils/puppet5/Makefile
  head/sysutils/puppet6/Makefile
  head/sysutils/puppet6/distinfo
  head/sysutils/puppet6/files/pkg-message.in
  head/sysutils/puppet6/pkg-plist

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Thu Sep 27 07:06:25 2018	(r480785)
+++ head/sysutils/Makefile	Thu Sep 27 07:44:48 2018	(r480786)
@@ -955,6 +955,7 @@
     SUBDIR += puppet-mode.el
     SUBDIR += puppet4
     SUBDIR += puppet5
+    SUBDIR += puppet6
     SUBDIR += puppetserver
     SUBDIR += puppetserver5
     SUBDIR += pv

Modified: head/sysutils/puppet4/Makefile
==============================================================================
--- head/sysutils/puppet4/Makefile	Thu Sep 27 07:06:25 2018	(r480785)
+++ head/sysutils/puppet4/Makefile	Thu Sep 27 07:44:48 2018	(r480786)
@@ -20,7 +20,7 @@ RUN_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
-CONFLICTS_INSTALL=	puppet5-*
+CONFLICTS_INSTALL=	puppet5-* puppet6-*
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RUBY=	yes

Modified: head/sysutils/puppet5/Makefile
==============================================================================
--- head/sysutils/puppet5/Makefile	Thu Sep 27 07:06:25 2018	(r480785)
+++ head/sysutils/puppet5/Makefile	Thu Sep 27 07:44:48 2018	(r480786)
@@ -24,7 +24,7 @@ RUN_DEPENDS=	rubygem-gettext-setup>=0:devel/rubygem-ge
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
-CONFLICTS_INSTALL=	puppet4-*
+CONFLICTS_INSTALL=	puppet4-* puppet6-*
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RUBY=	yes

Modified: head/sysutils/puppet6/Makefile
==============================================================================
--- head/sysutils/puppet5/Makefile	Thu Sep 27 07:06:25 2018	(r480785)
+++ head/sysutils/puppet6/Makefile	Thu Sep 27 07:44:48 2018	(r480786)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	5.5.6
+PORTVERSION=	6.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
-PKGNAMESUFFIX=	5
+PKGNAMESUFFIX=	6
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Configuration management framework written in Ruby
@@ -14,21 +14,25 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		fails to install: Could not load facter; cannot install
 
-BUILD_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
-		rubygem-json_pure>=0:devel/rubygem-json_pure
-RUN_DEPENDS=	rubygem-gettext-setup>=0:devel/rubygem-gettext-setup \
+BUILD_DEPENDS=	facter>=3.0:sysutils/facter \
 		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-gettext-setup>=0:devel/rubygem-gettext-setup \
+		rubygem-hiera>=2.0:sysutils/rubygem-hiera \
 		rubygem-hocon>=0:devel/rubygem-hocon \
 		rubygem-json_pure>=0:devel/rubygem-json_pure \
-		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas
+		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \
+		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
-CONFLICTS_INSTALL=	puppet4-*
+CONFLICTS_INSTALL=	puppet4-* puppet5-*
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RUBY=	yes
-USE_RC_SUBR=	puppet puppetmaster
+USE_RC_SUBR=	puppet
 PORTDOCS=	LICENSE README.md
 PORTEXAMPLES=	*
 USERS=		puppet
@@ -37,19 +41,7 @@ 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 2.x (written in Ruby)
-CFACTER_DESC=	Use facter 3.x (experimental rewrite in C++)
-
-RFACTER_BUILD_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
-RFACTER_RUN_DEPENDS=	rubygem-facter>=2.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}|" \
 		${WRKSRC}/install.rb \
@@ -77,8 +69,6 @@ post-patch:
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \
 		${WRKSRC}/lib/puppet/gettext/config.rb
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
-		${WRKSRC}/ext/rack/config.ru
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
@@ -100,8 +90,6 @@ post-install:
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/sysutils/puppet6/distinfo
==============================================================================
--- head/sysutils/puppet5/distinfo	Thu Sep 27 07:06:25 2018	(r480785)
+++ head/sysutils/puppet6/distinfo	Thu Sep 27 07:44:48 2018	(r480786)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535014786
-SHA256 (puppet-5.5.6.tar.gz) = 0ac5f5b737c7980cb37809c20491370d5f609f3ca22dc2655068d39624433ed0
-SIZE (puppet-5.5.6.tar.gz) = 3026301
+TIMESTAMP = 1537339060
+SHA256 (puppet-6.0.0.tar.gz) = d60b018007ee1f1ac882aa2ba9a9052e6b6e5993b4d300fabf76307a42e362d0
+SIZE (puppet-6.0.0.tar.gz) = 2790790

Modified: head/sysutils/puppet6/files/pkg-message.in
==============================================================================
--- head/sysutils/puppet5/files/pkg-message.in	Thu Sep 27 07:06:25 2018	(r480785)
+++ head/sysutils/puppet6/files/pkg-message.in	Thu Sep 27 07:44:48 2018	(r480786)
@@ -3,12 +3,5 @@ To enable the puppet agent, add the following to /etc/
 
 	puppet_enable="YES"
 
-To enable the puppetmaster, add the following to /etc/rc.conf:
-
-	puppetmaster_enable="YES"
-
-Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
-deprecated. Use a single file, %%ETCDIR%%/puppet.conf.
-
 The default PID directory is /var/run/puppet
 

Modified: head/sysutils/puppet6/pkg-plist
==============================================================================
--- head/sysutils/puppet5/pkg-plist	Thu Sep 27 07:06:25 2018	(r480785)
+++ head/sysutils/puppet6/pkg-plist	Thu Sep 27 07:44:48 2018	(r480786)
@@ -9,12 +9,7 @@ bin/puppet
 man/man5/puppet.conf.5.gz
 man/man8/puppet-agent.8.gz
 man/man8/puppet-apply.8.gz
-man/man8/puppet-ca.8.gz
 man/man8/puppet-catalog.8.gz
-man/man8/puppet-cert.8.gz
-man/man8/puppet-certificate.8.gz
-man/man8/puppet-certificate_request.8.gz
-man/man8/puppet-certificate_revocation_list.8.gz
 man/man8/puppet-config.8.gz
 man/man8/puppet-describe.8.gz
 man/man8/puppet-device.8.gz
@@ -27,7 +22,6 @@ man/man8/puppet-help.8.gz
 man/man8/puppet-key.8.gz
 man/man8/puppet-lookup.8.gz
 man/man8/puppet-man.8.gz
-man/man8/puppet-master.8.gz
 man/man8/puppet-module.8.gz
 man/man8/puppet-node.8.gz
 man/man8/puppet-parser.8.gz
@@ -35,9 +29,9 @@ man/man8/puppet-plugin.8.gz
 man/man8/puppet-report.8.gz
 man/man8/puppet-resource.8.gz
 man/man8/puppet-script.8.gz
+man/man8/puppet-ssl.8.gz
 man/man8/puppet-status.8.gz
 man/man8/puppet.8.gz
-@(puppet,puppet,) %%WWWDIR%%/config.ru
 @dir(puppet,puppet,) %%ETCDIR%%/manifests
 @dir(puppet,puppet,) %%ETCDIR%%/modules
 @dir(puppet,puppet,) /var/puppet



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