From owner-freebsd-ports Sun Sep 22 0: 0:17 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C98EE37B407 for ; Sun, 22 Sep 2002 00:00:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7554A43E65 for ; Sun, 22 Sep 2002 00:00:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M70CCo037645 for ; Sun, 22 Sep 2002 00:00:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M70Ceo037642; Sun, 22 Sep 2002 00:00:12 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D669637B401; Sat, 21 Sep 2002 23:55:24 -0700 (PDT) Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73A1243E42; Sat, 21 Sep 2002 23:55:24 -0700 (PDT) (envelope-from edwin@mavetju.org) Received: from k7.mavetju (topaz.mdcc.cx [212.204.230.141]) by topaz.mdcc.cx (Postfix) with ESMTP id 0357B2B8D8; Sun, 22 Sep 2002 08:55:12 +0200 (CEST) Received: by k7.mavetju (Postfix, from userid 1001) id E96436A7124; Sun, 22 Sep 2002 16:54:39 +1000 (EST) Message-Id: <20020922065439.E96436A7124@k7.mavetju> Date: Sun, 22 Sep 2002 16:54:39 +1000 (EST) From: Edwin Groothuis Reply-To: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org Cc: leeym@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/43230: [patch] misc/GeoIP - fix pkg-plist and other things Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 43230 >Category: ports >Synopsis: [patch] misc/GeoIP - fix pkg-plist and other things >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Sep 22 00:00:11 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 4.5-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #4: Sat Sep 14 10:41:50 EST 2002 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386 $FreeBSD: ports/misc/GeoIP/Makefile,v 1.4 2002/09/09 09:59:29 leeym Exp $ >Description: This patch is to... - Get rid of the file leftover after "make clean" - Make sure that the package has a message about copying etc/GeoIP.conf.default to etc/GeoIP.conf >How-To-Repeat: n/a >Fix: Add this file to misc/GeoIP/files as patch-conf::Makefile.am --- conf/Makefile.am.old Sun Sep 22 16:44:52 2002 +++ conf/Makefile.am Sun Sep 22 16:47:13 2002 @@ -5,9 +5,9 @@ DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf install-data-hook: install-sysconfDATA - @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ - echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ - else \ - echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ - $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ - fi +# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ +# echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ +# else \ +# echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ +# $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ +# fi Add this file to misc/GeoIP as pkg-message *** *** Please do this after you've ran the installation: *** - Copy ${PREFIX}/etc/GeoIP.conf.default to ${PREFIX}/etc/GeoIP.conf *** Apply this patch to misc/GeoIP/Makefile --- Makefile.old Sun Sep 22 16:40:14 2002 +++ Makefile Sun Sep 22 16:49:42 2002 @@ -20,4 +20,7 @@ MAN1= geoiplookup.1 geoipupdate.1 +post-install: + @${CAT} pkg-message + .include >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message