From owner-cvs-ports@FreeBSD.ORG Sat May 29 19:05:58 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F221C16A4CE; Sat, 29 May 2004 19:05:57 -0700 (PDT) Received: from mtaw6.prodigy.net (mtaw6.prodigy.net [64.164.98.56]) by mx1.FreeBSD.org (Postfix) with ESMTP id E106B43D2F; Sat, 29 May 2004 19:05:57 -0700 (PDT) (envelope-from kris@obsecurity.org) Received: from obsecurity.dyndns.org (36cd68a4634a8696a37e58e0dd3f221d@adsl-67-115-73-128.dsl.lsan03.pacbell.net [67.115.73.128]) by mtaw6.prodigy.net (8.12.10/8.12.10) with ESMTP id i4U24X9G002962; Sat, 29 May 2004 19:04:33 -0700 (PDT) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id CF669520C4; Sat, 29 May 2004 19:05:56 -0700 (PDT) Date: Sat, 29 May 2004 19:05:56 -0700 From: Kris Kennaway To: Yen-Ming Lee Message-ID: <20040530020556.GB5773@xor.obsecurity.org> References: <200405292314.i4TNEVlb048366@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5I6of5zJg18YgZEa" Content-Disposition: inline In-Reply-To: <200405292314.i4TNEVlb048366@repoman.freebsd.org> User-Agent: Mutt/1.4.2.1i cc: cvs-ports@FreeBSD.org cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/net/GeoIP Makefile distinfo pkg-message pkg-plist ports/net/GeoIP/files patch-ltmain.sh X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 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: Sun, 30 May 2004 02:05:58 -0000 --5I6of5zJg18YgZEa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, May 29, 2004 at 04:14:31PM -0700, Yen-Ming Lee wrote: > | - @${CAT} ${PKGMESSAGE} > | +.if !exists(${PREFIX}/etc/GeoIP.conf.default) > | + @${CP} ${PREFIX}/etc/GeoIP.conf.default ${PREFIX}/etc/GeoIP.conf > | +.endif What about when this is installed from the package? This should be an @exec in the pkg-plist. You only did the other half (removal): > | +@unexec if cmp -s %D/etc/GeoIP.conf %D/etc/GeoIP.conf.default; then rm -f %D/etc/GeoIP.conf; fi > | +++ ports/net/GeoIP/distinfo 2004/05/29 23:14:31 1.14 > | @@ -1,2 +1,3 @@ > | -MD5 (GeoIP-1.2.2.tar.gz) = 6844bee99c6426924a11b1998460e6f6 > | +MD5 (GeoIP-1.3.1.tar.gz) = cbfb7be70e2b02140677008d6e902dac > | +SIZE (GeoIP-1.3.1.tar.gz) = 526429 > | SIZE (GeoIP-1.2.2.tar.gz) = 512557 You forgot to remove the old SIZE. Running 'make makesum' would have done this automatically. Kris --5I6of5zJg18YgZEa Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAuUGEWry0BWjoQKURAiWvAKCB3yGgY8bm5Lmu8gvqw1zInzxRjQCfYITk /RvfrjjlX++KmNQIJHSQE3I= =b5gM -----END PGP SIGNATURE----- --5I6of5zJg18YgZEa--