Attachment #153274 for bug #197194




# $FreeBSD$

PORTNAME=	puppet
PORTVERSION=	3.7.4
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	http://downloads.puppetlabs.com/puppet/


.if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN}
EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_root
.else
BROKEN=	PACKAGE_ROOT option patch is incompatible with PACKAGE_ORIGIN patch.
.endif
.endif


	@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 agent --genconfig \
		--confdir=${ETCDIR} \
		--rundir=/var/run/puppet \
		--vardir=/var/puppet \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (puppet-3.6.2.tar.gz) = 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360	1	SHA256 (puppet-3.7.4.tar.gz) = 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745
2	SIZE (puppet-3.6.2.tar.gz) = 2252186	2	SIZE (puppet-3.7.4.tar.gz) = 2600191

Lines 4-7 Link Here

(-)pkg-descr (-1 / +1 lines)
4	hosts, along with obviously discrete elements like packages, services, and	4	hosts, along with obviously discrete elements like packages, services, and
5	files.	5	files.
6		6
7	WWW: http://www.puppetlabs.com	7	WWW: https://puppetlabs.com/puppet/puppet-open-source

Lines 46-50 Link Here

(-)pkg-plist (+2 lines)
46	%%RUBY_SITELIBDIR%%/puppetx.rb	46	%%RUBY_SITELIBDIR%%/puppetx.rb
47	%%ETCDIR%%/puppet.conf-dist	47	%%ETCDIR%%/puppet.conf-dist
48	%%ETCDIR%%/auth.conf-dist	48	%%ETCDIR%%/auth.conf-dist
		49	@dir(puppet,puppet,) %%ETCDIR%%/manifests
		50	@dir(puppet,puppet,) %%ETCDIR%%/modules
49	@(puppet,puppet,) www/puppet/config.ru	51	@(puppet,puppet,) www/puppet/config.ru
50	@dir(puppet,puppet,) /var/puppet	52	@dir(puppet,puppet,) /var/puppet

Return to bug 197194

Lines 2-9 Link Here

(-)Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= puppet	4	PORTNAME= puppet
5	PORTVERSION= 3.6.2	5	PORTVERSION= 3.7.4
6	PORTREVISION= 2
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= http://downloads.puppetlabs.com/puppet/	7	MASTER_SITES= http://downloads.puppetlabs.com/puppet/
9		8
Lines 44-50 Link Here
44	.if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN}	43	.if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN}
45	EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_root	44	EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_root
46	.else	45	.else
47	BROKEN= PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch.	46	BROKEN= PACKAGE_ROOT option patch is incompatible with PACKAGE_ORIGIN patch.
48	.endif	47	.endif
49	.endif	48	.endif
50		49
Lines 75-84 Link Here
75	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}	74	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
76		75
77	post-install:	76	post-install:
		77	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests
78	${MKDIR} ${STAGEDIR}${ETCDIR}/modules	78	${MKDIR} ${STAGEDIR}${ETCDIR}/modules
79	${MKDIR} ${STAGEDIR}/var/puppet	79	${MKDIR} ${STAGEDIR}/var/puppet
80	${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist	80	${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist
81	${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet master --genconfig \	81	${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
82	--confdir=${ETCDIR} \	82	--confdir=${ETCDIR} \
83	--rundir=/var/run/puppet \	83	--rundir=/var/run/puppet \
84	--vardir=/var/puppet \	84	--vardir=/var/puppet \