From leeym@utopia.leeym.com  Sat Dec  4 16:42:02 2004
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 27E0D16A4CE; Sat,  4 Dec 2004 16:42:02 +0000 (GMT)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C7A8043D58; Sat,  4 Dec 2004 16:42:01 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id A80B43EA13D;
	Sun,  5 Dec 2004 00:42:00 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 52258-10; Sun,  5 Dec 2004 00:41:45 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id 958C23EA134; Sun,  5 Dec 2004 00:41:42 +0800 (CST)
Message-Id: <20041204164142.958C23EA134@utopia.leeym.com>
Date: Sun,  5 Dec 2004 00:41:42 +0800 (CST)
From: Yen-Ming Lee <leeym@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: seanc@FreeBSD.org
Subject: [PATCH] net/GeoIP: update to 1.3.8
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         74677
>Category:       ports
>Synopsis:       [PATCH] net/GeoIP: update to 1.3.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    seanc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 04 16:50:28 GMT 2004
>Closed-Date:    Sat Dec 25 05:34:46 GMT 2004
>Last-Modified:  Sat Dec 25 05:34:46 GMT 2004
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Oct 25 01:17:22 CST 2004
>Description:
- Update to 1.3.8
- utilize DATADIR
- fix problem when installing default config file

Port maintainer (seanc@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- GeoIP-1.3.8.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/GeoIP/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- Makefile	31 Aug 2004 19:40:12 -0000	1.22
+++ Makefile	4 Dec 2004 16:40:57 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	GeoIP
-PORTVERSION=	1.3.6
+PORTVERSION=	1.3.8
 CATEGORIES=	net
 MASTER_SITES=	http://www.maxmind.com/download/geoip/api/c/
 
@@ -19,8 +19,8 @@
 MAN1=		geoiplookup.1 geoipupdate.1
 
 post-install:
-.if !exists(${PREFIX}/etc/GeoIP.conf.default)
-	@${CP} ${PREFIX}/etc/GeoIP.conf.default ${PREFIX}/etc/GeoIP.conf
+.if !exists(${PREFIX}/etc/GeoIP.conf)
+	@${INSTALL_DATA} ${PREFIX}/etc/GeoIP.conf.default ${PREFIX}/etc/GeoIP.conf
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/GeoIP/distinfo,v
retrieving revision 1.16
diff -u -u -r1.16 distinfo
--- distinfo	31 Aug 2004 19:40:12 -0000	1.16
+++ distinfo	4 Dec 2004 16:40:57 -0000
@@ -1,2 +1,2 @@
-MD5 (GeoIP-1.3.6.tar.gz) = f5afa496b562a7524b9b33b1d30dbee9
-SIZE (GeoIP-1.3.6.tar.gz) = 579850
+MD5 (GeoIP-1.3.8.tar.gz) = 7bbd491dfbe4314c817ba0bbc7fa0932
+SIZE (GeoIP-1.3.8.tar.gz) = 585538
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/GeoIP/pkg-plist,v
retrieving revision 1.10
diff -u -u -r1.10 pkg-plist
--- pkg-plist	30 May 2004 07:19:41 -0000	1.10
+++ pkg-plist	4 Dec 2004 16:40:57 -0000
@@ -18,5 +18,5 @@
 lib/libGeoIPUpdate.a
 lib/libGeoIPUpdate.so
 lib/libGeoIPUpdate.so.0
-share/GeoIP/GeoIP.dat
-@unexec rmdir %D/share/GeoIP 2>/dev/null || true
+%%DATADIR%%/GeoIP.dat
+@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
--- GeoIP-1.3.8.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->seanc 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Dec 5 04:26:35 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74677 
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Sat Dec 25 05:34:42 GMT 2004 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74677 
>Unformatted:
