From owner-cvs-ports@FreeBSD.ORG Sat Dec 11 23:03:51 2010 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45FB01065670; Sat, 11 Dec 2010 23:03:51 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from exhub015-2.exch015.msoutlookonline.net (exhub015-2.exch015.msoutlookonline.net [207.5.72.94]) by mx1.freebsd.org (Postfix) with ESMTP id 27E148FC14; Sat, 11 Dec 2010 23:03:50 +0000 (UTC) Received: from philip.hq.rws (174.79.184.239) by smtpx15.msoutlookonline.net (207.5.72.103) with Microsoft SMTP Server (TLS) id 8.2.254.0; Sat, 11 Dec 2010 15:03:50 -0800 Message-ID: <4D040354.7020503@p6m7g8.com> Date: Sat, 11 Dec 2010 23:03:48 +0000 From: "Philip M. Gollucci" Organization: P6M7G8 Inc. User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.12) Gecko/20100908 Thunderbird/3.0.7 MIME-Version: 1.0 To: Russell Jackson 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> In-Reply-To: <4D0401EC.9070209@csub.edu> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Cc: ohauer@FreeBSD.org, QAT@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, pgollucci@FreeBSD.org Subject: Re: cvs commit: ports/sysutils/puppet Makefile distinfo pkg-plist X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Dec 2010 23:03:51 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I'll apply it momentarily. >> =================================================================== >> 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 21:49:01 -0000 >> @@ -51,6 +51,7 @@ >> >> post-patch: >> @${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \ >> + ${WRKSRC}/install.rb \ >> ${WRKSRC}/lib/puppet/reference/configuration.rb \ >> ${WRKSRC}/lib/puppet/defaults.rb \ >> ${WRKSRC}/lib/puppet/util/run_mode.rb >> @@ -66,7 +67,7 @@ >> @${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} >> 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 21:49:01 -0000 >> @@ -9,6 +9,5 @@ >> sbin/puppetmasterd >> sbin/puppetqd >> sbin/puppetrun >> -etc/puppet/puppet.conf-dist >> -etc/puppet/auth.conf >> +%%ETCDIR%%/puppet.conf-dist >> @dirrmtry etc/puppet - -- - ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 VP Apache Infrastructure; Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Sr. System Admin, Ridecharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iD8DBQFNBANUdbiP+9ubjBwRAjY3AJ9CKeFXTn1hjklEbiz6x9/ODHUxIACggy/O wZ2EX1ZRLYA/dKIBEBrCwHk= =xIOV -----END PGP SIGNATURE-----