Attachment 153274 Details for Bug 197194 – update port to 3.7.4

[patch] update port to 3.7.4

puppet-3.7.4.diff (text/plain), 2.35 KB, created by Michael Moll on 2015-02-21 15:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Moll

Created: 2015-02-21 15:30:10 UTC

Size: 2.35 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 379473)
>+++ Makefile	(working copy)
>@@ -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,7 +43,7 @@
> .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
> 
>@@ -75,10 +74,11 @@
> 	@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 \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 379473)
>+++ distinfo	(working copy)
>@@ -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
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 379473)
>+++ pkg-descr	(working copy)
>@@ -4,4 +4,4 @@
> hosts, along with obviously discrete elements like packages, services, and
> files.
> 
>-WWW: http://www.puppetlabs.com
>+WWW: https://puppetlabs.com/puppet/puppet-open-source
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 379473)
>+++ pkg-plist	(working copy)
>@@ -46,5 +46,7 @@
> %%RUBY_SITELIBDIR%%/puppetx.rb
> %%ETCDIR%%/puppet.conf-dist
> %%ETCDIR%%/auth.conf-dist
>+@dir(puppet,puppet,) %%ETCDIR%%/manifests
>+@dir(puppet,puppet,) %%ETCDIR%%/modules
> @(puppet,puppet,) www/puppet/config.ru
> @dir(puppet,puppet,) /var/puppet

Actions: View | Diff

Attachments on bug 197194: 152853 | 152854 | 153274 | 153275