update to 1.3.14

ok alek@

net/GeoIP/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2004/12/16 00:31:20 alek Exp $
+# $OpenBSD: Makefile,v 1.7 2005/12/09 19:33:45 steven Exp $
 
 COMMENT=	"find the country where IP address/hostname originates from"
 
-DISTNAME=	GeoIP-1.3.8
+DISTNAME=	GeoIP-1.3.14
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.maxmind.com/geoip/
@@ -13,11 +13,12 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c m z
+WANTLIB=		c z
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--datadir=/var/db \
 		${CONFIGURE_SHARED}
+USE_LIBTOOL=	Yes
 
 EXAMPLESDIR=	${PREFIX}/share/examples/GeoIP
 

net/GeoIP/distinfo

@@ -1,4 +1,4 @@
-MD5 (GeoIP-1.3.8.tar.gz) = 7bbd491dfbe4314c817ba0bbc7fa0932
+MD5 (GeoIP-1.3.14.tar.gz) = a1f6fb744d85e96a457808f9c32fd334
-RMD160 (GeoIP-1.3.8.tar.gz) = 5b315b3933558acfb39cd297e54c9edceeca46d7
+RMD160 (GeoIP-1.3.14.tar.gz) = 9ada38e4b825dc4262a97a8c308eec3d077c1071
-SHA1 (GeoIP-1.3.8.tar.gz) = 5cb2b0568e9029c91056cd0809a155754987987b
+SHA1 (GeoIP-1.3.14.tar.gz) = dfba645d525c681c92df1bea715e70cac6045b2e
-SIZE (GeoIP-1.3.8.tar.gz) = 585538
+SIZE (GeoIP-1.3.14.tar.gz) = 677526

net/GeoIP/patches/patch-conf_Makefile_in

@@ -0,0 +1,21 @@
+$OpenBSD: patch-conf_Makefile_in,v 1.1 2005/12/09 19:33:45 steven Exp $
+--- conf/Makefile.in.orig	Wed Sep  7 23:07:43 2005
++++ conf/Makefile.in	Wed Dec  7 17:22:26 2005
+@@ -213,7 +213,7 @@ install-data-am:
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+-install-exec-am: install-sysconfDATA
++install-exec-am:
+ 
+ install-info: install-info-am
+ 
+@@ -242,7 +242,7 @@ uninstall-am: uninstall-info-am uninstal
+ 	uninstall-sysconfDATA
+ 
+ 
+-install-data-hook: install-sysconfDATA
++install-data-hook:
+ 	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+ 	else \

net/GeoIP/patches/patch-data_Makefile_in

@@ -0,0 +1,21 @@
+$OpenBSD: patch-data_Makefile_in,v 1.1 2005/12/09 19:33:45 steven Exp $
+--- data/Makefile.in.orig	Wed Sep  7 23:07:45 2005
++++ data/Makefile.in	Wed Dec  7 17:25:01 2005
+@@ -209,7 +209,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-pkgdataDATA
++install-data-am:
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+@@ -242,7 +242,7 @@ uninstall-am: uninstall-info-am uninstal
+ 	uninstall-pkgdataDATA
+ 
+ 
+-install-data-hook: install-pkgdataDATA
++install-data-hook:
+ 	@if test -f $(DESTDIR)$(DEFAULT_DB_FILE) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_DB_FILE)" ; \
+ 	else \

net/GeoIP/patches/patch-libGeoIP_GeoIP_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-libGeoIP_GeoIP_c,v 1.1 2005/12/09 19:33:45 steven Exp $
+--- libGeoIP/GeoIP.c.orig	Wed Dec  7 19:29:07 2005
++++ libGeoIP/GeoIP.c	Wed Dec  7 21:51:05 2005
+@@ -500,7 +500,7 @@ unsigned long _GeoIP_lookupaddress (cons
+ 			free(buf);
+ 			return 0;
+ 		}
+-		addr = *((unsigned long *) phe->h_addr_list[0]);
++		addr = (unsigned long) *((in_addr_t *) phe->h_addr_list[0]);
+ 	}
+ #ifdef HAVE_GETHOSTBYNAME_R
+ 	free(buf);

net/GeoIP/pkg/PFRAG.shared

@@ -1,4 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/11/11 19:32:57 naddy Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/09 19:33:45 steven Exp $
-@lib lib/libGeoIP.so.4.8
+@lib lib/libGeoIP.so.4.14
-@lib lib/libGeoIPBitReader.so.0.0
 @lib lib/libGeoIPUpdate.so.0.0

net/GeoIP/pkg/PLIST

@@ -1,16 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/11/11 19:32:57 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/12/09 19:33:45 steven Exp $
-bin/geoipexport
-bin/geoipexportlocations
 bin/geoiplookup
 bin/geoipupdate
 include/GeoIP.h
-include/GeoIPBitReader.h
 include/GeoIPCity.h
 include/GeoIPUpdate.h
 lib/libGeoIP.a
 lib/libGeoIP.la
-lib/libGeoIPBitReader.a
-lib/libGeoIPBitReader.la
 lib/libGeoIPUpdate.a
 lib/libGeoIPUpdate.la
 @man man/man1/geoiplookup.1