From owner-svn-ports-head@FreeBSD.ORG Thu Apr 30 04:28:29 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 476BF6CA; Thu, 30 Apr 2015 04:28:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B70C18F8; Thu, 30 Apr 2015 04:28:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3U4SSDo057939; Thu, 30 Apr 2015 04:28:28 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3U4SSHP057936; Thu, 30 Apr 2015 04:28:28 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201504300428.t3U4SSHP057936@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Thu, 30 Apr 2015 04:28:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385024 - in head/net/GeoIP: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 04:28:29 -0000 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@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