aboutsummaryrefslogtreecommitdiffstats
path: root/net/GeoIP
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2014-10-13 09:31:28 +0800
committeradamw <adamw@FreeBSD.org>2014-10-13 09:31:28 +0800
commit9649dc25d6517b3c2ee4794742bdc69242fc5435 (patch)
treef558b1aa3adb69e5b837f228a55ea28d3ca700bf /net/GeoIP
parent15032a7663cc22bebe224528e41d745b06ff2ef2 (diff)
downloadfreebsd-ports-gnome-9649dc25d6517b3c2ee4794742bdc69242fc5435.tar.gz
freebsd-ports-gnome-9649dc25d6517b3c2ee4794742bdc69242fc5435.tar.zst
freebsd-ports-gnome-9649dc25d6517b3c2ee4794742bdc69242fc5435.zip
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
Diffstat (limited to 'net/GeoIP')
-rw-r--r--net/GeoIP/Makefile6
-rw-r--r--net/GeoIP/files/geoipupdate.sh.in2
-rw-r--r--net/GeoIP/pkg-plist1
3 files changed, 3 insertions, 6 deletions
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index bdbc5f069025..06f8a51a19f7 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -3,7 +3,7 @@
PORTNAME= GeoIP
PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net geography
MAINTAINER= adamw@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
diff --git a/net/GeoIP/files/geoipupdate.sh.in b/net/GeoIP/files/geoipupdate.sh.in
index 7d578188d547..6597102bf484 100644
--- a/net/GeoIP/files/geoipupdate.sh.in
+++ b/net/GeoIP/files/geoipupdate.sh.in
@@ -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"
diff --git a/net/GeoIP/pkg-plist b/net/GeoIP/pkg-plist
index 0ba36aaae949..6fea605b962d 100644
--- a/net/GeoIP/pkg-plist
+++ b/net/GeoIP/pkg-plist
@@ -10,4 +10,3 @@ lib/libGeoIP.so.1.6.2
libdata/pkgconfig/geoip.pc
man/man1/geoiplookup.1.gz
man/man1/geoiplookup6.1.gz
-@dirrmtry %%DATADIR%%