From 6067dde6f9d2e8b2de403543898b9f55cf1fd526 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sat, 12 Apr 2014 09:58:43 +0000
Subject: [PATCH] update to newer geolite database

---
 net/GeoIP/Makefile | 13 ++++++++-----
 net/GeoIP/distinfo |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 40c7bcbab36..3e983144130 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.29 2014/03/18 17:56:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2014/04/12 09:58:43 sthen Exp $
 
 COMMENT=	find the country where IP address/hostname originates from
 
 V=		1.6.0
+REVISION=	0
 DISTNAME=	GeoIP-$V
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} geolite-data-20140316.tar.bz2:0
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		geolite-data-20140402.tar.bz2:0
 
 SHARED_LIBS +=	GeoIP                9.0      # 7.0
 
@@ -36,8 +38,10 @@ pre-test:
 
 # maintainer convenience target
 geolite:
+	set -x; \
 	t=`mktemp -d /tmp/geoip.XXXXXXXXXX`; \
-	f=geolite-data-`date +%Y%m%d`.tar.bz2; \
+	d=`date +%Y%m%d`; \
+	f=geolite-data-$${d}.tar.bz2; \
 	cd $$t; \
 	mkdir data; \
 	cd data; \
@@ -45,8 +49,7 @@ geolite:
 	echo "see http://www.maxmind.com and http://dev.maxmind.com/geoip/legacy/geolite/." >> readme.txt; \
 	echo "Distributed under Creative Commons Attribution-ShareAlike 3.0 Unported License." >> readme.txt; \
 	echo "Created at `date -z UTC` and intended for OS packaging purposes." >> readme.txt; \
-	ftp http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz \
-	http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz \
+	ftp http://geolite.maxmind.com/download/geoip/database/{GeoIPv6.dat.gz,GeoLiteCountry/GeoIP.dat.gz}; \
 	gunzip *gz; \
 	cd ..; \
 	tar cjf $$f data; \
diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo
index 616e63d67f1..2d7eaf69143 100644
--- a/net/GeoIP/distinfo
+++ b/net/GeoIP/distinfo
@@ -1,4 +1,4 @@
 SHA256 (GeoIP-1.6.0.tar.gz) = RD9GuJw9YmroFGPCqsmDAP/x47Z0+vBgcIQ/vv7c9xA=
-SHA256 (geolite-data-20140316.tar.bz2) = F3o9jz96Hk2Y5QJiM4U7CClE7YeKaKqx5SpymYST89M=
+SHA256 (geolite-data-20140402.tar.bz2) = x44ChhHJROGYobkkRwq0BDPLNitpl9DrVqWlrSVKyFo=
 SIZE (GeoIP-1.6.0.tar.gz) = 445559
-SIZE (geolite-data-20140316.tar.bz2) = 894750
+SIZE (geolite-data-20140402.tar.bz2) = 946514