Index: head/net/GeoIP/Makefile =================================================================== --- head/net/GeoIP/Makefile (revision 385023) +++ head/net/GeoIP/Makefile (revision 385024) @@ -1,38 +1,39 @@ # Created by: Yen-Ming Lee # $FreeBSD$ PORTNAME= GeoIP PORTVERSION= 1.6.5 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net geography MAINTAINER= adamw@FreeBSD.org COMMENT= Find the country that any IP address or hostname originates from LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= maxmind GH_PROJECT= geoip-api-c USES= autoreconf libtool pathfix PATHFIX_MAKEFILEIN= Makefile.am USE_LDCONFIG= yes GNU_CONFIGURE= yes SUB_FILES= geoipupdate.sh pkg-message PLIST_SUB+= PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= DOCS PORTDOCS= COPYING ChangeLog LICENSE README.md post-install: ${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libGeoIP.so.* @${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/net/GeoIP/files/geoipupdate.sh.in =================================================================== --- head/net/GeoIP/files/geoipupdate.sh.in (revision 385023) +++ head/net/GeoIP/files/geoipupdate.sh.in (revision 385024) @@ -1,32 +1,34 @@ #!/bin/sh 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://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 Index: head/net/GeoIP/files/patch-man__Makefile.am =================================================================== --- head/net/GeoIP/files/patch-man__Makefile.am (revision 385023) +++ head/net/GeoIP/files/patch-man__Makefile.am (revision 385024) @@ -1,17 +1,17 @@ ---- ./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 -install-data-hook: +install-data-hook: $(NOINST_man_MANS) cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN) cat geoiplookup6.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP6_MAN)