svn commit: r407331 - head/net/geoipupdate

[Adam Weinberger]

> On 28 Jan, 2016, at 18:54, Alexey Dokuchaev <danfe at FreeBSD.org> wrote:
> 
> On Wed, Jan 27, 2016 at 01:16:01AM +0000, Adam Weinberger wrote:
>> New Revision: 407331
>> URL: https://svnweb.freebsd.org/changeset/ports/407331
>> 
>> Log:
>>  Update to 2.2.2.
>> 
>>  Also, use localbase.mk instead of setting CPPFLAGS/LDFLAGS manually, and
>>  use the new two-argument @sample instead of renaming and sed-ing.
>> 
>> [...]
>> @@ -1,4 +1,4 @@
>> bin/geoipupdate
>> - at sample etc/GeoIP.conf.sample
>> + at sample etc/GeoIP.conf etc/GeoIP.conf.default
> 
> I think you've got it backwards, per what I read in CHANGE at 20150926 and
> running post-install() from +MANIFEST with commands prepended with echo:
> 
>  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
> 
> Similarly, for pre-deinstall():
> 
>  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
> 
> ./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


-- 
Adam Weinberger
adamw at adamw.org
http://www.adamw.org