svn commit: r379542 - head/sysutils/puppet

[Steve Wills]

Author: swills
Date: Sat Feb 21 19:15:58 2015
New Revision: 379542
URL: https://svnweb.freebsd.org/changeset/ports/379542
QAT: https://qat.redports.org/buildarchive/r379542/

Log:
  sysutils/puppet: Update to 3.7.4
  
  While here, mark it broken with Ruby 2.2.
  
  PR:		197194
  Submitted by:	Rick <vmiller at hostileadmin.com>
  Submitted by:	Michael Moll <kvedulv at kvedulv.de>

Modified:
  head/sysutils/puppet/Makefile
  head/sysutils/puppet/distinfo
  head/sysutils/puppet/pkg-descr
  head/sysutils/puppet/pkg-plist

Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Sat Feb 21 19:06:11 2015	(r379541)
+++ head/sysutils/puppet/Makefile	Sat Feb 21 19:15:58 2015	(r379542)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	3.6.2
-PORTREVISION=	2
+PORTVERSION=	3.7.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -44,12 +43,17 @@ PATCHES_DESC=		Optional exclusive patche
 .if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_root
 .else
-BROKEN=	PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch.
+BROKEN=	PACKAGE_ROOT option patch is incompatible with PACKAGE_ORIGIN patch.
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
+# puppet 4.x should support ruby 2.2.x
+.if ${RUBY_VER} >= 2.2
+BROKEN=		Does not work with Ruby 2.2
+.endif
+
 .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
 RUN_DEPENDS+=	rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby
@@ -75,10 +79,11 @@ do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
 
 post-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests
 	${MKDIR} ${STAGEDIR}${ETCDIR}/modules
 	${MKDIR} ${STAGEDIR}/var/puppet
 	${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist
-	${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet master --genconfig \
+	${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
 		--confdir=${ETCDIR} \
 		--rundir=/var/run/puppet \
 		--vardir=/var/puppet \

Modified: head/sysutils/puppet/distinfo
==============================================================================
--- head/sysutils/puppet/distinfo	Sat Feb 21 19:06:11 2015	(r379541)
+++ head/sysutils/puppet/distinfo	Sat Feb 21 19:15:58 2015	(r379542)
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.6.2.tar.gz) = 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360
-SIZE (puppet-3.6.2.tar.gz) = 2252186
+SHA256 (puppet-3.7.4.tar.gz) = 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745
+SIZE (puppet-3.7.4.tar.gz) = 2600191

Modified: head/sysutils/puppet/pkg-descr
==============================================================================
--- head/sysutils/puppet/pkg-descr	Sat Feb 21 19:06:11 2015	(r379541)
+++ head/sysutils/puppet/pkg-descr	Sat Feb 21 19:15:58 2015	(r379542)
@@ -4,4 +4,4 @@ elements normally aggregated in differen
 hosts, along with obviously discrete elements like packages, services, and
 files.
 
-WWW: http://www.puppetlabs.com
+WWW: https://puppetlabs.com/puppet/puppet-open-source

Modified: head/sysutils/puppet/pkg-plist
==============================================================================
--- head/sysutils/puppet/pkg-plist	Sat Feb 21 19:06:11 2015	(r379541)
+++ head/sysutils/puppet/pkg-plist	Sat Feb 21 19:15:58 2015	(r379542)
@@ -46,5 +46,7 @@ man/man8/puppet.8.gz
 %%RUBY_SITELIBDIR%%/puppetx.rb
 %%ETCDIR%%/puppet.conf-dist
 %%ETCDIR%%/auth.conf-dist
+ at dir(puppet,puppet,) %%ETCDIR%%/manifests
+ at dir(puppet,puppet,) %%ETCDIR%%/modules
 @(puppet,puppet,) www/puppet/config.ru
 @dir(puppet,puppet,) /var/puppet