aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2015-04-30 12:28:27 +0800
committeradamw <adamw@FreeBSD.org>2015-04-30 12:28:27 +0800
commit6568952e82c5587e038117c13a6b03703eebcd47 (patch)
treea6bf513d4110161c9e82bc4dca491e6b3bd36e1f /net
parent9b5773147757258825c953c6f15d067d490f803e (diff)
downloadfreebsd-ports-gnome-6568952e82c5587e038117c13a6b03703eebcd47.tar.gz
freebsd-ports-gnome-6568952e82c5587e038117c13a6b03703eebcd47.tar.zst
freebsd-ports-gnome-6568952e82c5587e038117c13a6b03703eebcd47.zip
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.
Diffstat (limited to 'net')
-rw-r--r--net/GeoIP/Makefile1
-rw-r--r--net/GeoIP/files/geoipupdate.sh.in6
-rw-r--r--net/GeoIP/files/patch-man__Makefile.am6
3 files changed, 8 insertions, 5 deletions
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 603abb1b441b..88d0249ffa01 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -4,6 +4,7 @@
PORTNAME= GeoIP
PORTVERSION= 1.6.5
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= net geography
MAINTAINER= adamw@FreeBSD.org
diff --git a/net/GeoIP/files/geoipupdate.sh.in b/net/GeoIP/files/geoipupdate.sh.in
index 6597102bf484..7fb8a43d4f86 100644
--- a/net/GeoIP/files/geoipupdate.sh.in
+++ b/net/GeoIP/files/geoipupdate.sh.in
@@ -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
diff --git a/net/GeoIP/files/patch-man__Makefile.am b/net/GeoIP/files/patch-man__Makefile.am
index 2e31214cadb3..85c130436ce6 100644
--- a/net/GeoIP/files/patch-man__Makefile.am
+++ b/net/GeoIP/files/patch-man__Makefile.am
@@ -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