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

[Adam Weinberger]

Author: adamw
Date: Mon Oct 13 01:31:28 2014
New Revision: 370750
URL: https://svnweb.freebsd.org/changeset/ports/370750
QAT: https://qat.redports.org/buildarchive/r370750/

Log:
  Create the temporary directory within DATADIR, to ensure they're created
  on the same device as their destination.
  
  While here, use USES=autoreconf, and remove the @dirrm.
  
  PR:		194086
  Submitted by:	Yasuhito FUTATSUKI

Modified:
  head/net/GeoIP/Makefile
  head/net/GeoIP/files/geoipupdate.sh.in
  head/net/GeoIP/pkg-plist

Modified: head/net/GeoIP/Makefile
==============================================================================
--- head/net/GeoIP/Makefile	Sun Oct 12 23:56:13 2014	(r370749)
+++ head/net/GeoIP/Makefile	Mon Oct 13 01:31:28 2014	(r370750)
@@ -3,7 +3,7 @@
 
 PORTNAME=	GeoIP
 PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net geography
 
 MAINTAINER=	adamw at FreeBSD.org
@@ -15,9 +15,7 @@ GH_PROJECT=	geoip-api-c
 GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	2e9100a
 
-USES=		libtool pathfix
-USE_AUTOTOOLS=	aclocal automake libtoolize autoconf
-AUTOMAKE_ARGS=	--add-missing
+USES=		autoreconf libtool pathfix
 PATHFIX_MAKEFILEIN=	Makefile.am
 
 USE_LDCONFIG=	yes

Modified: head/net/GeoIP/files/geoipupdate.sh.in
==============================================================================
--- head/net/GeoIP/files/geoipupdate.sh.in	Sun Oct 12 23:56:13 2014	(r370749)
+++ head/net/GeoIP/files/geoipupdate.sh.in	Mon Oct 13 01:31:28 2014	(r370750)
@@ -9,7 +9,7 @@ echo Fetching GeoIP.dat and GeoIPv6.dat.
 _fetch() {
     url="$1"
     out="$2"
-    TEMPDIR="$(mktemp -d /tmp/GeoIPupdate.XXXXXX)"
+    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"

Modified: head/net/GeoIP/pkg-plist
==============================================================================
--- head/net/GeoIP/pkg-plist	Sun Oct 12 23:56:13 2014	(r370749)
+++ head/net/GeoIP/pkg-plist	Mon Oct 13 01:31:28 2014	(r370750)
@@ -10,4 +10,3 @@ lib/libGeoIP.so.1.6.2
 libdata/pkgconfig/geoip.pc
 man/man1/geoiplookup.1.gz
 man/man1/geoiplookup6.1.gz
- at dirrmtry %%DATADIR%%