Date: Sun, 12 Dec 2010 00:35:41 +0100 From: olli hauer <ohauer@gmx.de> To: "Philip M. Gollucci" <pgollucci@p6m7g8.com> Cc: ohauer@FreeBSD.org, QAT@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, Russell Jackson <raj@csub.edu>, cvs-ports@FreeBSD.org, pgollucci@FreeBSD.org Subject: Re: cvs commit: ports/sysutils/puppet Makefile distinfo pkg-plist Message-ID: <4D040ACD.3030905@gmx.de> In-Reply-To: <4D040354.7020503@p6m7g8.com> References: <201012102307.oBAN7OKW063350@repoman.freebsd.org> <20101211021158.0C25F5A9660@jester1b.ixsystems.com> <4D02EED9.3050208@csub.edu> <4D03B850.8000406@p6m7g8.com> <4D03F48D.2060309@FreeBSD.org> <4D0401EC.9070209@csub.edu> <4D040354.7020503@p6m7g8.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------060206020007050200040305
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
On 2010-12-12 00:03, Philip M. Gollucci wrote:
> I'll apply it momentarily.
>
This patch is a way better (use ETCDIR instead etc/$portname)
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/puppet/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 10 Dec 2010 23:07:24 -0000 1.21
+++ Makefile 11 Dec 2010 23:28:01 -0000
@@ -50,7 +50,8 @@
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
+ @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
+ ${WRKSRC}/install.rb \
${WRKSRC}/lib/puppet/reference/configuration.rb \
${WRKSRC}/lib/puppet/defaults.rb \
${WRKSRC}/lib/puppet/util/run_mode.rb
@@ -66,16 +67,16 @@
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
do-install:
- @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb
+ @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb
--no-configs
post-install:
- ${INSTALL} -d ${PREFIX}/etc/${PORTNAME}
+ ${INSTALL} -d ${ETCDIR}
${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/sbin/puppetmasterd \
- --confdir=${PREFIX}/etc/${PORTNAME} \
+ --confdir=${ETCDIR} \
--rundir=${PUPPET_RUNDIR} \
--genconfig | \
${SED} -e 's/genconfig = true/# genconfig = false/' \
- > ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
+ > ${ETCDIR}/puppet.conf-dist
@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
@@ -89,6 +90,7 @@
.endif
.if !defined(NOPORTEXAMPLES)
cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+ ${INSTALL} ${WRKSRC}/conf/auth.conf ${EXAMPLESDIR}/etc
.endif
@${CAT} ${PKGMESSAGE}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/puppet/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist 10 Dec 2010 23:07:24 -0000 1.9
+++ pkg-plist 11 Dec 2010 23:28:01 -0000
@@ -9,6 +9,5 @@
sbin/puppetmasterd
sbin/puppetqd
sbin/puppetrun
-etc/puppet/puppet.conf-dist
-etc/puppet/auth.conf
-@dirrmtry etc/puppet
+%%ETCDIR%%/puppet.conf-dist
+@dirrmtry %%ETCDIR%%
Index: files/pkg-message.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/puppet/files/pkg-message.in,v
retrieving revision 1.3
diff -u -r1.3 pkg-message.in
--- files/pkg-message.in 4 Aug 2010 17:06:24 -0000 1.3
+++ files/pkg-message.in 11 Dec 2010 23:28:01 -0000
@@ -8,7 +8,7 @@
puppetmaster_enable="YES"
Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
-deprecated. Use a single file, %%PREFIX%%/etc/puppet/puppet.conf.
+deprecated. Use a single file, %%ETCDIR%%/puppet.conf.
The default PID directory is %%PUPPET_RUNDIR%%.
--------------060206020007050200040305
Content-Type: text/plain;
name="puppet.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="puppet.diff"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/puppet/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 10 Dec 2010 23:07:24 -0000 1.21
+++ Makefile 11 Dec 2010 23:28:01 -0000
@@ -50,7 +50,8 @@
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
+ @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
+ ${WRKSRC}/install.rb \
${WRKSRC}/lib/puppet/reference/configuration.rb \
${WRKSRC}/lib/puppet/defaults.rb \
${WRKSRC}/lib/puppet/util/run_mode.rb
@@ -66,16 +67,16 @@
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
do-install:
- @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb
+ @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs
post-install:
- ${INSTALL} -d ${PREFIX}/etc/${PORTNAME}
+ ${INSTALL} -d ${ETCDIR}
${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/sbin/puppetmasterd \
- --confdir=${PREFIX}/etc/${PORTNAME} \
+ --confdir=${ETCDIR} \
--rundir=${PUPPET_RUNDIR} \
--genconfig | \
${SED} -e 's/genconfig = true/# genconfig = false/' \
- > ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
+ > ${ETCDIR}/puppet.conf-dist
@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
@@ -89,6 +90,7 @@
.endif
.if !defined(NOPORTEXAMPLES)
cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+ ${INSTALL} ${WRKSRC}/conf/auth.conf ${EXAMPLESDIR}/etc
.endif
@${CAT} ${PKGMESSAGE}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/puppet/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist 10 Dec 2010 23:07:24 -0000 1.9
+++ pkg-plist 11 Dec 2010 23:28:01 -0000
@@ -9,6 +9,5 @@
sbin/puppetmasterd
sbin/puppetqd
sbin/puppetrun
-etc/puppet/puppet.conf-dist
-etc/puppet/auth.conf
-@dirrmtry etc/puppet
+%%ETCDIR%%/puppet.conf-dist
+@dirrmtry %%ETCDIR%%
Index: files/pkg-message.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/puppet/files/pkg-message.in,v
retrieving revision 1.3
diff -u -r1.3 pkg-message.in
--- files/pkg-message.in 4 Aug 2010 17:06:24 -0000 1.3
+++ files/pkg-message.in 11 Dec 2010 23:28:01 -0000
@@ -8,7 +8,7 @@
puppetmaster_enable="YES"
Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
-deprecated. Use a single file, %%PREFIX%%/etc/puppet/puppet.conf.
+deprecated. Use a single file, %%ETCDIR%%/puppet.conf.
The default PID directory is %%PUPPET_RUNDIR%%.
--------------060206020007050200040305--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D040ACD.3030905>