- net/GeoIP uses its own libtool even if we define USE_LIBTOOL*

- add missing @exec and remove old SIZE in net/GeoIP
- update for libGeoIP.4 in LIB_DEPENDS and bump PORTREVISION
- utilize PORTDOCS in www/mod_geoip

Noticed by:	kris

10 files changed, 17 insertions, 19 deletions

diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index c810b3d0b6ea..a55285b2f158 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	verlihub
 PORTVERSION=	0.9.7r5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	verlihub
@@ -15,7 +16,7 @@ DISTNAME=	verlihub-0.9.7-RC5
 MAINTAINER=	hurbold@yahoo.com
 COMMENT=	Verlihub Linux/Unix Direct Connect Hub Software
 
-LIB_DEPENDS=	GeoIP.3:${PORTSDIR}/net/GeoIP \
+LIB_DEPENDS=	GeoIP.4:${PORTSDIR}/net/GeoIP \
 		pcre.0:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 7660e2e44a65..c7758e529282 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	http://www.maxmind.com/download/geoip/api/c/
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Find the country that any IP address or hostname originates from
 
-USE_LIBTOOL_VER=13
-CONFIGURE_ARGS=	--with-gnu-ld=yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=		geoiplookup.1 geoipupdate.1
diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo
index e14139183763..ce2a4adb3755 100644
--- a/net/GeoIP/distinfo
+++ b/net/GeoIP/distinfo
@@ -1,3 +1,2 @@
 MD5 (GeoIP-1.3.1.tar.gz) = cbfb7be70e2b02140677008d6e902dac
 SIZE (GeoIP-1.3.1.tar.gz) = 526429
-SIZE (GeoIP-1.2.2.tar.gz) = 512557
diff --git a/net/GeoIP/pkg-plist b/net/GeoIP/pkg-plist
index 2b15652d4acd..7721e30ee25c 100644
--- a/net/GeoIP/pkg-plist
+++ b/net/GeoIP/pkg-plist
@@ -4,6 +4,7 @@ bin/geoiplookup
 bin/geoipupdate
 @unexec if cmp -s %D/etc/GeoIP.conf %D/etc/GeoIP.conf.default; then rm -f %D/etc/GeoIP.conf; fi
 etc/GeoIP.conf.default
+@exec [ -f %B/GeoIP.conf ] || cp %B/%f %B/GeoIP.conf
 include/GeoIP.h
 include/GeoIPBitReader.h
 include/GeoIPCity.h
diff --git a/net/p5-Geo-IP/Makefile b/net/p5-Geo-IP/Makefile
index 527e4201ed22..c10caf98e4de 100644
--- a/net/p5-Geo-IP/Makefile
+++ b/net/p5-Geo-IP/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Geo-IP
 PORTVERSION=	1.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		http://www.maxmind.com/download/geoip/api/perl/
@@ -17,7 +17,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Gets country name by IP or hostname
 
-LIB_DEPENDS=	GeoIP.3:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	GeoIP.4:${PORTSDIR}/net/GeoIP
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	LIBS='-L${LOCALBASE}/lib' INC='-I${LOCALBASE}/include'
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index a8ebd9df309e..31f343c7c9c1 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GeoIP
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	http://www.maxmind.com/download/geoip/api/python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ DISTNAME=	${PORTNAME}-Python-${PORTVERSION}
 MAINTAINER=	sw@gegenunendlich.de
 COMMENT=	Mapping of IP addresses/hostnames to country names in Python
 
-LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	GeoIP.4:${PORTSDIR}/net/GeoIP
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
diff --git a/net/ruby-net-geoip/Makefile b/net/ruby-net-geoip/Makefile
index 24017959c9af..c50344eb847d 100644
--- a/net/ruby-net-geoip/Makefile
+++ b/net/ruby-net-geoip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	net-geoip
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ruby
 MASTER_SITES=	http://www.rubynet.org/modules/net/geoip/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -16,9 +16,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	A Ruby extension that wraps around libGeoIP
 
-LIB_DEPENDS=	GeoIP.3:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	GeoIP.4:${PORTSDIR}/net/GeoIP
 
-USE_BZIP2=      yes
+USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/net/verlihub/Makefile b/net/verlihub/Makefile
index c810b3d0b6ea..a55285b2f158 100644
--- a/net/verlihub/Makefile
+++ b/net/verlihub/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	verlihub
 PORTVERSION=	0.9.7r5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	verlihub
@@ -15,7 +16,7 @@ DISTNAME=	verlihub-0.9.7-RC5
 MAINTAINER=	hurbold@yahoo.com
 COMMENT=	Verlihub Linux/Unix Direct Connect Hub Software
 
-LIB_DEPENDS=	GeoIP.3:${PORTSDIR}/net/GeoIP \
+LIB_DEPENDS=	GeoIP.4:${PORTSDIR}/net/GeoIP \
 		pcre.0:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
diff --git a/www/mod_geoip/Makefile b/www/mod_geoip/Makefile
index dc6416bd0f3d..e2f282443ad7 100644
--- a/www/mod_geoip/Makefile
+++ b/www/mod_geoip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_geoip
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.maxmind.com/download/geoip/api/mod_geoip/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -14,13 +15,13 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	An Apache module that provides the country code of the client's IP
 
-LIB_DEPENDS=	GeoIP.3:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	GeoIP.4:${PORTSDIR}/net/GeoIP
 
 USE_APACHE=	yes
 
 .include <bsd.port.pre.mk>
 
-DOCS=		Changes INSTALL README README.php
+PORTDOCS=		Changes INSTALL README README.php
 
 do-build:
 	@cd ${WRKSRC} && \
@@ -30,7 +31,7 @@ do-install:
 	${APXS} -i -A -n geoip ${WRKSRC}/mod_geoip.so
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mod_geoip
-.for f in ${DOCS}
+.for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/mod_geoip/
 .endfor
 .endif
diff --git a/www/mod_geoip/pkg-plist b/www/mod_geoip/pkg-plist
index 81499bdfedd7..e921ebb48e58 100644
--- a/www/mod_geoip/pkg-plist
+++ b/www/mod_geoip/pkg-plist
@@ -1,8 +1,3 @@
 libexec/apache/mod_geoip.so
 @exec %D/sbin/apxs -e -A -n geoip %D/%F
 @unexec %D/sbin/apxs -e -A -n geoip %D/%F
-share/doc/mod_geoip/Changes
-share/doc/mod_geoip/INSTALL
-share/doc/mod_geoip/README
-share/doc/mod_geoip/README.php
-@dirrm share/doc/mod_geoip