Changes 1.4.6:

* Fix geoipupdate's my_printf function
* Fix typo in apps/geoipupdate-pureperl.pl replace PerlIO::Gzip with
  PerlIO::gzip
* Update region codes in libGeoIP/regionName.c
* Fix regioncode/generate_regionName.pl to handle regioncodes with ',' correct
* Update fips codes 20090201
* Fix unicode builds on WIN32 and eliminate some warnings
* Fix sign error in _iso_8859_1__utf8 for PPC64
* Change WIN32 to _WIN32, since _WIN32 is defined by default
* Remove the WSAStartup call from GeoIP_open
* Silence various warnings
* Add more timezone region's for Australia
* Fix possible segfault in apps/geoiplookup with null pointers in non gnu
  printf implementations for example solaris
* Add README.OSX to build fat binaries easy
* Silence vasprintf warning via AC_GNU_SOURCE
* Add several Makefiles to build a static GeoIP.lib for w32
* Silence signedness warnings
* Remove --with-city configure option
* Remove configure's --with-dbdir option. Use the similar --datadir instead
* Various autotools improvements and cleanups. Including parallel build fix.
* Fix libGeoIP/timeZone.c
* Fix timezone/generate_timeZone.pl
* Sync FIPS codes again Jan 14th, 2009
* Fix CA,NL regioncode
* Change logic in generate_regionName.pl and GeoIP_region_name_by_code
* Sync regionName.c with http://www.maxmind.com/app/fips10_4 from Dec 17th, 2008
* Fix _GeoIP_lookupaddress for 64bit big endian systems like ppc64
* Add proper WIN32/64 support
* Escape - in all manpages
* Add manpage for geoiplookup6
* Fix -d command line option
* GeoIPUpdate.c use vasprintf if avail, otherwise try vsnprintf and sprintf
* avoid pre/postincrement and assignment on the same variable

6 files changed, 27 insertions, 129 deletions

diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index bdac16e91ff..fb784b73a19 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2008/02/06 23:27:02 heinz Exp $
-#
+# $NetBSD: Makefile,v 1.20 2009/04/24 10:17:22 adam Exp $
 
-DISTNAME=	GeoIP-1.4.4
+DISTNAME=	GeoIP-1.4.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.maxmind.com/download/geoip/api/c/
 
@@ -15,10 +14,9 @@ COMMENT=	Find the country from any IP address
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 EGDIR=		${PREFIX}/share/examples/GeoIP
 CONF_FILES=	${EGDIR}/GeoIP.conf.default ${PKG_SYSCONFDIR}/GeoIP.conf
diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo
index c0cfbbeac40..868dea9e814 100644
--- a/net/GeoIP/distinfo
+++ b/net/GeoIP/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.10 2008/02/06 23:27:02 heinz Exp $
+$NetBSD: distinfo,v 1.11 2009/04/24 10:17:22 adam Exp $
 
-SHA1 (GeoIP-1.4.4.tar.gz) = 4a2937e7a8fc7c26aa88c0678791246b58d81d02
-RMD160 (GeoIP-1.4.4.tar.gz) = 4aa31840ec6496647551c6e12c9c5e32dceed426
-Size (GeoIP-1.4.4.tar.gz) = 944698 bytes
-SHA1 (patch-aa) = 0b40dd16471e6e94d04493dfb61bc1270161d2b1
-SHA1 (patch-ab) = 5b229ed08c66580d50965cbfa6b7af76154a6a60
-SHA1 (patch-ac) = 4705cdce7f4dc1eb5d814f0d2101dc95d948522c
-SHA1 (patch-ad) = 3d9235f7978d3bfff2d37fcb6c97c467998ba37e
+SHA1 (GeoIP-1.4.6.tar.gz) = e692954f447c13270de7860e586696991776d8a3
+RMD160 (GeoIP-1.4.6.tar.gz) = 67097c3f9c6bbdba1a4f7ee796713720dba19b0f
+Size (GeoIP-1.4.6.tar.gz) = 1045241 bytes
+SHA1 (patch-aa) = 13bf4c1c25d3c09c05cf03b1328ebbffd3b8c8b6
+SHA1 (patch-ad) = 5f23a3299ff093097a9d93527f85079b59091394
diff --git a/net/GeoIP/patches/patch-aa b/net/GeoIP/patches/patch-aa
index df806db654e..f2c2e4b887f 100644
--- a/net/GeoIP/patches/patch-aa
+++ b/net/GeoIP/patches/patch-aa
@@ -1,27 +1,27 @@
-$NetBSD: patch-aa,v 1.4 2008/02/06 23:27:02 heinz Exp $
+$NetBSD: patch-aa,v 1.5 2009/04/24 10:17:22 adam Exp $
 
   - pkgsrc patch: put configuration file into examples directory so CONF_FILES
     can use it as a reference.
 
   - pkgsrc patch: do not install the configuration file (in target
-    install-data-hook), let CONF_FILES handle it.
+    install-exec-hook), let CONF_FILES handle it.
 
---- conf/Makefile.in.orig	2008-01-22 04:14:24.000000000 +0100
+--- conf/Makefile.in.orig	2009-02-24 23:56:08.000000000 +0100
 +++ conf/Makefile.in
-@@ -23,7 +23,7 @@ bindir = @bindir@
+@@ -160,7 +160,7 @@ psdir = @psdir@
  sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @datadir@/examples/@PACKAGE@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -163,7 +163,6 @@ install-exec: install-exec-am
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+@@ -310,7 +310,6 @@ install-dvi: install-dvi-am
  
- install-data-am:
+ install-exec-am: install-dist_sysconfDATA
  	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
+-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ 
+ install-html: install-html-am
  
- install-am: all-am
diff --git a/net/GeoIP/patches/patch-ab b/net/GeoIP/patches/patch-ab
deleted file mode 100644
index 17ac27c8266..00000000000
--- a/net/GeoIP/patches/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/02/06 23:27:02 heinz Exp $
-
-  - synchronize man page with the code
-    http://sourceforge.net/tracker/index.php?func=detail&aid=1888355&group_id=66844&atid=515957
-
---- man/geoiplookup.1.orig	2007-08-16 01:09:29.000000000 +0200
-+++ man/geoiplookup.1
-@@ -3,27 +3,24 @@
- .SH NAME
- geoiplookup - look up country using IP Address or hostname
- .SH SYNOPSIS
--geoiplookup [-lv] <ipaddress|hostname>
-+geoiplookup [-d directory] [-f filename] [-v] <ipaddress|hostname>
- .SH DESCRIPTION
- geoiplookup uses the GeoIP library and database to find the Country
- that an IP address or hostname originates from.
- .PP
- For example
- .PP
--.I geoiplookup -l 80.60.233.195
-+.I geoiplookup 80.60.233.195
- .PP
--will find the Country that 80.60.233.195 originates from, in long format:
-+will find the Country that 80.60.233.195 originates from, in the following format:
- .PP
--.I Netherlands
-+.I NL, Netherlands
- .PP
- .SH OPTIONS
- .IP "-f"
- Specify a custom path to a single GeoIP datafile.
- .IP "-d"
- Specify a custom directory containing GeoIP datafile(s).  By default geoiplookup looks in DATADIR
--.IP "-l"
--By default, geoiplookup returns the ISO 3166 country code.  By specifying this
--option, geoiplookup prints the long format, namely the full country name.
- .IP "-v"
- Lists the date and build number for the GeoIP datafile(s).
- .SH AUTHOR
diff --git a/net/GeoIP/patches/patch-ac b/net/GeoIP/patches/patch-ac
deleted file mode 100644
index e72b5238789..00000000000
--- a/net/GeoIP/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/02/06 23:27:02 heinz Exp $
-
-  - probably a typo
-    http://sourceforge.net/tracker/index.php?func=detail&aid=1888390&group_id=66844&atid=515957
-
-  - move call of GeoIP_database_edition() to where it is actually needed.
-    Otherwise a segmentation fault may occur because gi may be NULL (see
-    GeoIP_open()).
-    http://sourceforge.net/tracker/index.php?func=detail&aid=1888390&group_id=66844&atid=515957
-
-  - GeoIP_country_code[] does not contain NULL, so the test for NULL can
-    never succeed. In order to change this we steal the assignment to
-    country_code from GeoIP_country_code_by_name(); while here move the
-    assignment to country_name where it is actually needed.
-    http://sourceforge.net/tracker/index.php?func=detail&aid=1888390&group_id=66844&atid=515957
-    
-
---- apps/geoiplookup.c.orig	2007-08-16 01:06:28.000000000 +0200
-+++ apps/geoiplookup.c
-@@ -64,22 +64,22 @@ int main (int argc, char *argv[]) {
- 		exit(1);
- 	}
- 
--	if (custom_file != NULL) {
-+	if (custom_directory != NULL) {
- 		GeoIP_setup_custom_directory(custom_directory);
- 	}
- 	_GeoIP_setup_dbfilename();
- 
- 	if (custom_file != NULL) {
- 		gi = GeoIP_open(custom_file, GEOIP_STANDARD);
--		i = GeoIP_database_edition(gi);
- 		if (NULL == gi) {
--			printf("%s not available, skipping...\n", GeoIPDBDescription[i]);
-+			printf("%s not available, skipping...\n", custom_file);
- 		} else {
- 			if (version_flag == 1) {
- 				db_info = GeoIP_database_info(gi);
- 				printf("%s: %s\n",GeoIPDBDescription[i],db_info);
- 				free(db_info);
- 			} else {
-+				i = GeoIP_database_edition(gi);
- 				geoiplookup(gi,hostname,i);
- 			}
- 		}
-@@ -126,11 +126,11 @@ void geoiplookup(GeoIP* gi,char *hostnam
- 	}
- 	if (GEOIP_COUNTRY_EDITION == i) {
- 		country_id = GeoIP_id_by_name(gi, hostname);
--		country_code = GeoIP_country_code[country_id];
--		country_name = GeoIP_country_name[country_id];
-+		country_code = (country_id > 0) ?  GeoIP_country_code[country_id] : NULL;
- 		if (country_code == NULL) {
- 			printf("%s: IP Address not found\n", GeoIPDBDescription[i]);
- 		} else {
-+			country_name = GeoIP_country_name[country_id];
- 			printf("%s: %s, %s\n", GeoIPDBDescription[i], country_code, country_name);
- 		}
- 	} else if (GEOIP_REGION_EDITION_REV0 == i || GEOIP_REGION_EDITION_REV1 == i) {
diff --git a/net/GeoIP/patches/patch-ad b/net/GeoIP/patches/patch-ad
index 8ccdd6751f9..1e0b5fbcbf8 100644
--- a/net/GeoIP/patches/patch-ad
+++ b/net/GeoIP/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.1 2008/02/06 23:27:03 heinz Exp $
+$NetBSD: patch-ad,v 1.2 2009/04/24 10:17:22 adam Exp $
 
   - test for success of _GeoIP_seek_record(). 0 is a valid return value.
     http://sourceforge.net/tracker/index.php?func=detail&aid=1888390&group_id=66844&atid=515957
 
---- libGeoIP/GeoIP.c.orig	2007-11-25 04:27:25.000000000 +0100
+--- libGeoIP/GeoIP.c.orig	2009-02-24 17:03:23.000000000 +0100
 +++ libGeoIP/GeoIP.c
-@@ -707,8 +707,8 @@ int GeoIP_id_by_name (GeoIP* gi, const c
+@@ -934,8 +934,8 @@ int GeoIP_id_by_name (GeoIP* gi, const c
  	}
  	if (!(ipnum = _GeoIP_lookupaddress(name)))
  		return 0;