Index: branches/2019Q1/net/GeoIP/Makefile
===================================================================
--- branches/2019Q1/net/GeoIP/Makefile	(revision 490219)
+++ branches/2019Q1/net/GeoIP/Makefile	(revision 490220)
@@ -1,36 +1,39 @@
 # Created by: Yen-Ming Lee <leeym@leeym.com>
 # $FreeBSD$
 
 PORTNAME=	GeoIP
 PORTVERSION=	1.6.12
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net geography
 MASTER_SITES=	https://github.com/maxmind/geoip-api-c/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Find the country that any IP address or hostname originates from
 
 LICENSE=	GPLv2
 
 USES=		libtool pathfix
+
+DEPRECATED=	Legacy databases no longer available. Switch to net/libmaxminddb instead
+EXPIRATION_DATE=2019-02-15
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 SUB_FILES=	geoipupdate.sh pkg-message
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	COPYING ChangeLog LICENSE README.md
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2019Q1/net/GeoIP/files/geoipupdate.sh.in
===================================================================
--- branches/2019Q1/net/GeoIP/files/geoipupdate.sh.in	(revision 490219)
+++ branches/2019Q1/net/GeoIP/files/geoipupdate.sh.in	(revision 490220)
@@ -1,50 +1,13 @@
 #!/bin/sh
 
-# You can set the following environment variables:
-#
-# GEOIP_DB_SERVER: The default download server is geolite.maxmind.com
-# GEOIP_FETCH_CITY: If set (to anything), download the GeoLite City DB
-# GEOIP_FETCH_ASN: If set, download the GeoIP ASN DB
+cat <<MSG
+===============================================================
+Maxmind no longer provides the legacy GeoIP databases, and have
+removed the databases from their servers entirely.
 
-GEOIP_DB_SERVER=${GEOIP_DB_SERVER:=geolite.maxmind.com}
-GEOIP_FETCH_CITY=${GEOIP_FETCH_CITY:=}
-GEOIP_FETCH_ASN=${GEOIP_FETCH_ASN:=}
-
-set -eu
-echo Fetching GeoIP.dat and GeoIPv6.dat...
-
-# arguments:
-# $1 URL
-# $2 output file name
-_fetch() {
-    url="$1"
-    out="$2"
-    TEMPDIR="$(mktemp -d '%%DATADIR%%/GeoIPupdate.XXXXXX')"
-    trap 'rc=$? ; set +e ; rm -rf "'"$TEMPDIR"'" ; exit $rc' 0
-    if fetch -o "$TEMPDIR/$out.gz" "$url"; then
-        gunzip "$TEMPDIR/$out.gz"
-        chmod 444 "$TEMPDIR/$out"
-        if ! mv -f "$TEMPDIR/$out" "%%DATADIR%%"/"$2"; then
-            echo "Unable to replace %%DATADIR%%/$2"
-            return 2
-        fi
-    else
-        echo "$2 download failed"
-        return 1
-    fi
-    rmdir "$TEMPDIR"
-    trap - 0
-    return 0
-}
-
-_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
-
-if [ -n "$GEOIP_FETCH_CITY" ]; then
-	_fetch "http://${GEOIP_DB_SERVER}/download/geoip/database/GeoLiteCity.dat.gz" GeoLiteCity.dat
-	_fetch "http://${GEOIP_DB_SERVER}/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" GeoLiteCityv6.dat
-fi
-if [ -n "$GEOIP_FETCH_ASN" ]; then
-	_fetch "http://${GEOIP_DB_SERVER}/download/geoip/database/asnum/GeoIPASNum.dat.gz" GeoIPASNum.dat
-	_fetch "http://${GEOIP_DB_SERVER}/download/geoip/database/asnum/GeoIPASNumv6.dat.gz" GeoIPASNumv6.dat
-fi
+If a port has an OPTION that supports GeoIP 2 (via
+net/libmaxminddb), please switch to that and use geoipupdate
+(net/geoipupdate) to fetch the GeoIP 2 databases.
+===============================================================
+MSG
+exit 1
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 490219)
+++ branches/2019Q1	(revision 490220)

Property changes on: branches/2019Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r489642,489971,489992,490212