From owner-svn-ports-head@freebsd.org  Fri Jan 29 03:52:06 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D307A72303;
 Fri, 29 Jan 2016 03:52:06 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "abg.ninja", Issuer "Gandi Standard SSL CA 2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id A163D1DAB;
 Fri, 29 Jan 2016 03:52:05 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: by apnoea.adamw.org (OpenSMTPD) with ESMTPSA id d57350a9
 TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO;
 Thu, 28 Jan 2016 20:51:56 -0700 (MST)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 9.2 \(3112\))
Subject: Re: svn commit: r407331 - head/net/geoipupdate
From: Adam Weinberger <adamw@adamw.org>
In-Reply-To: <20160129015402.GA96343@FreeBSD.org>
Date: Thu, 28 Jan 2016 20:51:55 -0700
Cc: Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org,
 svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <17E923F7-F432-46B5-BF9F-C77D3BB9B0BE@adamw.org>
References: <201601270116.u0R1G1Vl041516@repo.freebsd.org>
 <20160129015402.GA96343@FreeBSD.org>
To: Alexey Dokuchaev <danfe@FreeBSD.org>
X-Mailer: Apple Mail (2.3112)
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2016 03:52:06 -0000

> 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