From owner-svn-ports-head@freebsd.org  Fri Jan 29 01:54:02 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 AA447A729AC;
 Fri, 29 Jan 2016 01:54:02 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id A0B101FED;
 Fri, 29 Jan 2016 01:54:02 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
 id 9F267105B; Fri, 29 Jan 2016 01:54:02 +0000 (UTC)
Date: Fri, 29 Jan 2016 01:54:02 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Adam Weinberger <adamw@FreeBSD.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r407331 - head/net/geoipupdate
Message-ID: <20160129015402.GA96343@FreeBSD.org>
References: <201601270116.u0R1G1Vl041516@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201601270116.u0R1G1Vl041516@repo.freebsd.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
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 01:54:02 -0000

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
> -@sample etc/GeoIP.conf.sample
> +@sample etc/GeoIP.conf etc/GeoIP.conf.default

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:

  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