svn commit: r385024 - in head/net/GeoIP: . files

[Adam Weinberger]

Author: adamw
Date: Thu Apr 30 04:28:27 2015
New Revision: 385024
URL: https://svnweb.freebsd.org/changeset/ports/385024

Log:
  Allow the server for the GeoIP database to be altered by an environment
  variable.
  
  PR:		199768
  
  While here, regenerate patch with 'make makepatch' to appease portlint.

Modified:
  head/net/GeoIP/Makefile
  head/net/GeoIP/files/geoipupdate.sh.in
  head/net/GeoIP/files/patch-man__Makefile.am

Modified: head/net/GeoIP/Makefile
==============================================================================
--- head/net/GeoIP/Makefile	Thu Apr 30 03:09:33 2015	(r385023)
+++ head/net/GeoIP/Makefile	Thu Apr 30 04:28:27 2015	(r385024)
@@ -4,6 +4,7 @@
 PORTNAME=	GeoIP
 PORTVERSION=	1.6.5
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net geography
 
 MAINTAINER=	adamw at FreeBSD.org

Modified: head/net/GeoIP/files/geoipupdate.sh.in
==============================================================================
--- head/net/GeoIP/files/geoipupdate.sh.in	Thu Apr 30 03:09:33 2015	(r385023)
+++ head/net/GeoIP/files/geoipupdate.sh.in	Thu Apr 30 04:28:27 2015	(r385024)
@@ -27,6 +27,8 @@ _fetch() {
     return 0
 }
 
-_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz" GeoIP.dat
+GEOIP_DB_SERVER=${GEOIP_DB_SERVER:=geolite.maxmind.com}
 
-_fetch "http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz" GeoIPv6.dat
+_fetch "http://${GEOIP_DB_SERVER}/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz" GeoIP.dat
+
+_fetch "http://${GEOIP_DB_SERVER}/download/geoip/database/GeoIPv6.dat.gz" GeoIPv6.dat

Modified: head/net/GeoIP/files/patch-man__Makefile.am
==============================================================================
--- head/net/GeoIP/files/patch-man__Makefile.am	Thu Apr 30 03:09:33 2015	(r385023)
+++ head/net/GeoIP/files/patch-man__Makefile.am	Thu Apr 30 04:28:27 2015	(r385024)
@@ -1,12 +1,12 @@
---- ./man/Makefile.am.orig	2014-08-11 20:36:57.000000000 +0200
-+++ ./man/Makefile.am	2014-08-11 20:38:56.000000000 +0200
+--- man/Makefile.am.orig	2015-04-30 04:26:22 UTC
++++ man/Makefile.am
 @@ -1,4 +1,4 @@
 -man_MANS = geoiplookup6.1 geoiplookup.1
 +NOINST_man_MANS = geoiplookup6.1 geoiplookup.1
  
  EXTRA_DIST = geoiplookup6.1.in geoiplookup.1.in
  
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ CLEANFILES = geoiplookup6.1 geoiplookup.
  LOOKUP_MAN = $(mandir)/man1/geoiplookup.1
  LOOKUP6_MAN = $(mandir)/man1/geoiplookup6.1