Update GeoIP to 1.6.0.

With this update, GeoIP no longer ships with the GeoIP data files, so
you MUST fetch them yourself, by running the geoipupdate.sh script.

6 files changed, 21 insertions, 37 deletions

diff --git a/UPDATING b/UPDATING
index fa3e357eea7b..3c1e99c8a53a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,13 @@ You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
 20140728:
+  AFFECTS: users of net/GeoIP
+  AUTHOR: adamw@FreeBSD.org
+
+  GeoIP no longer ships with the GeoIP database. To continue using GeoIP,
+  you MUST fetch it first by running geoipupdate.sh.
+
+20140728:
   AFFECTS: users of security/libtasn1 and any port that depends on it
   AUTHOR: novel@FreeBSD.org
 
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 52c7bf5c3fda..9a1ee7be1576 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -2,28 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	GeoIP
-PORTVERSION=	1.4.8
-PORTREVISION=	7
+PORTVERSION=	1.6.0
 CATEGORIES=	net geography
 MASTER_SITES=	http://geolite.maxmind.com/download/geoip/api/c/
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Find the country that any IP address or hostname originates from
 
-GNU_CONFIGURE=	yes
-USES=		libtool:oldver
-USE_LDCONFIG=	yes
+USES=		libtool:oldver pathfix
 USE_AUTOTOOLS=	aclocal automake libtoolize autoconf
 AUTOMAKE_ARGS=	--add-missing
+PATHFIX_MAKEFILEIN=	Makefile.am
+
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
 SUB_FILES=	geoipupdate.sh pkg-message
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
-	${MV} ${STAGEDIR}${DATADIR}/GeoIP.dat \
-		${STAGEDIR}${DATADIR}/GeoIP.dat.sample
-	${MV} ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.default \
-		${STAGEDIR}${PREFIX}/etc/GeoIP.conf.sample
-	${RM} ${STAGEDIR}${PREFIX}/etc/GeoIP.conf
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libGeoIP.so.*
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo
index 95cdaa2bf0ce..df6ce5a80ef2 100644
--- a/net/GeoIP/distinfo
+++ b/net/GeoIP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GeoIP-1.4.8.tar.gz) = cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4
-SIZE (GeoIP-1.4.8.tar.gz) = 1074829
+SHA256 (GeoIP-1.6.0.tar.gz) = 075a0c2815cd099e9ec35c9569db716a3fefcdbb6a10dbfa1ce7c6cd48d4a635
+SIZE (GeoIP-1.6.0.tar.gz) = 722173
diff --git a/net/GeoIP/files/patch-man__Makefile.am b/net/GeoIP/files/patch-man__Makefile.am
deleted file mode 100644
index 15ff6f25842f..000000000000
--- a/net/GeoIP/files/patch-man__Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./man/Makefile.am.orig	2011-03-27 23:00:36.000000000 +0200
-+++ ./man/Makefile.am	2014-07-23 19:37:28.000000000 +0200
-@@ -23,7 +23,9 @@
- LOOKUP6_MAN = $(mandir)/man1/geoiplookup6.1
- 
- install-data-hook:
-+	chmod u+w $(DESTDIR)$(mandir)/man1/*.1
- 	cat geoipupdate.1 | sed s,DATADIR,$(pkgdatadir), | sed s,CONF_DIR,$(sysconfdir), > $(DESTDIR)$(UPDATE_MAN)
- 	cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN)
- 	cat geoiplookup6.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP6_MAN)
-+	chmod u-w $(DESTDIR)$(mandir)/man1/*.1
- 
diff --git a/net/GeoIP/files/pkg-message.in b/net/GeoIP/files/pkg-message.in
index 33d448300daa..42bffd5ba168 100644
--- a/net/GeoIP/files/pkg-message.in
+++ b/net/GeoIP/files/pkg-message.in
@@ -1,4 +1,3 @@
-GeoIP does not ship with the latest data file, and it does
-not ship with any IPv6 data! To obtain the latest v4 and v6
-data, run:
+GeoIP does not ship with the actual data files. You must download
+them yourself! Please run:
 # %%PREFIX%%/bin/geoipupdate.sh
diff --git a/net/GeoIP/pkg-plist b/net/GeoIP/pkg-plist
index 8396d5f78238..ef09268a127b 100644
--- a/net/GeoIP/pkg-plist
+++ b/net/GeoIP/pkg-plist
@@ -1,21 +1,13 @@
 bin/geoiplookup
 bin/geoiplookup6
-bin/geoipupdate
 bin/geoipupdate.sh
-@sample etc/GeoIP.conf.sample
 include/GeoIP.h
 include/GeoIPCity.h
-include/GeoIPUpdate.h
 lib/libGeoIP.a
 lib/libGeoIP.la
 lib/libGeoIP.so
-lib/libGeoIP.so.5
-lib/libGeoIPUpdate.a
-lib/libGeoIPUpdate.la
-lib/libGeoIPUpdate.so
-lib/libGeoIPUpdate.so.0
-@sample %%DATADIR%%/GeoIP.dat.sample
+lib/libGeoIP.so.7
+libdata/pkgconfig/geoip.pc
 man/man1/geoiplookup.1.gz
 man/man1/geoiplookup6.1.gz
-man/man1/geoipupdate.1.gz
 @dirrmtry %%DATADIR%%