Date: Thu, 28 Jan 2016 20:51:55 -0700 From: Adam Weinberger <adamw@adamw.org> To: Alexey Dokuchaev <danfe@FreeBSD.org> Cc: Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r407331 - head/net/geoipupdate Message-ID: <17E923F7-F432-46B5-BF9F-C77D3BB9B0BE@adamw.org> In-Reply-To: <20160129015402.GA96343@FreeBSD.org> References: <201601270116.u0R1G1Vl041516@repo.freebsd.org> <20160129015402.GA96343@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 28 Jan, 2016, at 18:54, Alexey Dokuchaev <danfe@FreeBSD.org> wrote: >=20 > On Wed, Jan 27, 2016 at 01:16:01AM +0000, Adam Weinberger wrote: >> New Revision: 407331 >> URL: https://svnweb.freebsd.org/changeset/ports/407331 >>=20 >> Log: >> Update to 2.2.2. >>=20 >> Also, use localbase.mk instead of setting CPPFLAGS/LDFLAGS manually, = and >> use the new two-argument @sample instead of renaming and sed-ing. >>=20 >> [...] >> @@ -1,4 +1,4 @@ >> bin/geoipupdate >> -@sample etc/GeoIP.conf.sample >> +@sample etc/GeoIP.conf etc/GeoIP.conf.default >=20 > I think you've got it backwards, per what I read in CHANGE@20150926 = and > running post-install() from +MANIFEST with commands prepended with = echo: >=20 > if ! [ -f /usr/local/etc/GeoIP.conf.default ] > /bin/cp -p /usr/local/etc/GeoIP.conf = /usr/local/etc/GeoIP.conf.default > /bin/chmod u+w /usr/local/etc/GeoIP.conf.default > fi >=20 > Similarly, for pre-deinstall(): >=20 > if cmp -s /usr/local/etc/GeoIP.conf.default /usr/local/etc/GeoIP.conf > rm -f /usr/local/etc/GeoIP.conf.default > else > You may need to manually remove /usr/local/etc/GeoIP.conf.default = ... > fi >=20 > ./danfe Oh! You're totally right. I got confused by the wording from the = porters-handbook. "@sample file [file]" doesn't do much to resolve ambiguity :-P I've committed the correct order in r407449. Thanks for catching this! I'd suggest adding, after the first paragraph of 7.6.9: So, @sample etc/myapp.conf.sample and @sample etc/myapp.conf.sample etc/myapp.conf are equivalent. # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?17E923F7-F432-46B5-BF9F-C77D3BB9B0BE>