From owner-cvs-all@FreeBSD.ORG Sun Dec 12 00:00:11 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA0E81065670 for ; Sun, 12 Dec 2010 00:00:11 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by mx1.freebsd.org (Postfix) with SMTP id 117418FC0C for ; Sun, 12 Dec 2010 00:00:10 +0000 (UTC) Received: (qmail invoked by alias); 11 Dec 2010 23:33:28 -0000 Received: from u18-124.dslaccess.de (EHLO [172.20.1.100]) [194.231.39.124] by mail.gmx.net (mp004) with SMTP; 12 Dec 2010 00:33:28 +0100 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX1+UD6kYx0yUFyuooowwdTnQiUAjbMR8s/3MXU4+1k 5/CrKPAWWWQmzg Message-ID: <4D040ACD.3030905@gmx.de> Date: Sun, 12 Dec 2010 00:35:41 +0100 From: olli hauer User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: "Philip M. Gollucci" 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> In-Reply-To: <4D040354.7020503@p6m7g8.com> X-Enigmail-Version: 1.1.1 Content-Type: multipart/mixed; boundary="------------060206020007050200040305" X-Y-GMX-Trusted: 0 Cc: ohauer@FreeBSD.org, QAT@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, Russell Jackson , cvs-ports@FreeBSD.org, pgollucci@FreeBSD.org Subject: Re: cvs commit: ports/sysutils/puppet Makefile distinfo pkg-plist X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2010 00:00:11 -0000 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 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 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--