4 files changed, 12 insertions, 54 deletions

diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 0bba3f472ccd..1f48e01bbf0f 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	GeoIP
-PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTVERSION=	1.1.9
 CATEGORIES=	net
 MASTER_SITES=	http://www.maxmind.com/download/geoip/api/c/
 
diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo
index a4501fc06dcd..c8e1096f0311 100644
--- a/net/GeoIP/distinfo
+++ b/net/GeoIP/distinfo
@@ -1 +1 @@
-MD5 (GeoIP-1.1.4.tar.gz) = 204a38ec98f3cc7102fefbeec2b52fac
+MD5 (GeoIP-1.1.9.tar.gz) = 8cc99c85d251969c1d5e6f729f12cf9b
diff --git a/net/GeoIP/files/patch-conf::Makefile.in b/net/GeoIP/files/patch-conf::Makefile.in
index eb466dab6ee6..dfa6d896a45b 100644
--- a/net/GeoIP/files/patch-conf::Makefile.in
+++ b/net/GeoIP/files/patch-conf::Makefile.in
@@ -1,6 +1,6 @@
---- conf/Makefile.in.orig	Fri Sep 27 12:21:01 2002
-+++ conf/Makefile.in	Fri Sep 27 12:26:02 2002
-@@ -242,12 +242,12 @@
+--- conf/Makefile.in.orig	Mon Mar 10 17:25:32 2003
++++ conf/Makefile.in	Sun Apr  6 17:59:17 2003
+@@ -205,12 +205,12 @@
  
  
  install-data-hook: install-sysconfDATA
@@ -10,12 +10,12 @@
 -	        echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
 -	        $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
 -	fi
-+	# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
-+	#        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
-+	# else \
-+	#         echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-+	#         $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
-+	# fi
++#	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
++#	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
++#	else \
++#	        echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
++#	        $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
++#	fi
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/GeoIP/files/patch-libGeoIP::Makefile b/net/GeoIP/files/patch-libGeoIP::Makefile
deleted file mode 100644
index 4f98c9e0c03d..000000000000
--- a/net/GeoIP/files/patch-libGeoIP::Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- libGeoIP/Makefile.am.orig	Wed Jan 15 09:36:37 2003
-+++ libGeoIP/Makefile.am	Wed Jan 15 09:36:58 2003
-@@ -1,15 +1,15 @@
- lib_LTLIBRARIES = libGeoIP.la libGeoIPUpdate.la libGeoIPBitReader.la
- 
--EXTRA_DIST = md5.h global.h GeoIPUpdate.h
-+EXTRA_DIST = md5.h global.h
- 
- AM_CPPFLAGS = -DGEOIPDATADIR=\"$(pkgdatadir)\" -Wall
- 
- if WITH_CITY
- libGeoIP_la_SOURCES = GeoIP.c GeoIPCity.c
--include_HEADERS = GeoIP.h GeoIPCity.h GeoIPBitReader.h
-+include_HEADERS = GeoIP.h GeoIPCity.h GeoIPBitReader.h GeoIPUpdate.h
- else
- libGeoIP_la_SOURCES = GeoIP.c
--include_HEADERS = GeoIP.h GeoIPBitReader.h
-+include_HEADERS = GeoIP.h GeoIPBitReader.h GeoIPUpdate.h
- endif
- 
- libGeoIPUpdate_la_SOURCES = GeoIPUpdate.c md5.c
---- libGeoIP/Makefile.in.orig	Wed Jan 15 09:37:09 2003
-+++ libGeoIP/Makefile.in	Wed Jan 15 09:38:35 2003
-@@ -87,14 +87,14 @@
- install_sh = @install_sh@
- lib_LTLIBRARIES = libGeoIP.la libGeoIPUpdate.la libGeoIPBitReader.la
- 
--EXTRA_DIST = md5.h global.h GeoIPUpdate.h
-+EXTRA_DIST = md5.h global.h
- 
- AM_CPPFLAGS = -DGEOIPDATADIR=\"$(pkgdatadir)\" -Wall
- 
- @WITH_CITY_TRUE@libGeoIP_la_SOURCES = GeoIP.c GeoIPCity.c
- @WITH_CITY_FALSE@libGeoIP_la_SOURCES = GeoIP.c
--@WITH_CITY_TRUE@include_HEADERS = GeoIP.h GeoIPCity.h GeoIPBitReader.h
--@WITH_CITY_FALSE@include_HEADERS = GeoIP.h GeoIPBitReader.h
-+@WITH_CITY_TRUE@include_HEADERS = GeoIP.h GeoIPCity.h GeoIPBitReader.h GeoIPUpdate.h
-+@WITH_CITY_FALSE@include_HEADERS = GeoIP.h GeoIPBitReader.h GeoIPUpdate.h
- 
- libGeoIPUpdate_la_SOURCES = GeoIPUpdate.c md5.c
- libGeoIPBitReader_la_SOURCES = GeoIPBitReader.c