[Midnightbsd-cvs] mports [18784] trunk/net/GeoIP: for some reason, libtool was not getting pulled in.

[laffer1 at midnightbsd.org]

Revision: 18784
          http://svnweb.midnightbsd.org/mports/?rev=18784
Author:   laffer1
Date:     2015-05-03 22:33:19 -0400 (Sun, 03 May 2015)
Log Message:
-----------
for some reason, libtool was not getting pulled in.

Modified Paths:
--------------
    trunk/net/GeoIP/Makefile
    trunk/net/GeoIP/files/geoipupdate.sh.in

Modified: trunk/net/GeoIP/Makefile
===================================================================
--- trunk/net/GeoIP/Makefile	2015-05-04 02:28:41 UTC (rev 18783)
+++ trunk/net/GeoIP/Makefile	2015-05-04 02:33:19 UTC (rev 18784)
@@ -2,6 +2,7 @@
 
 PORTNAME=	GeoIP
 PORTVERSION=	1.6.5
+PORTREVISION=	1
 CATEGORIES=	net geography
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -16,6 +17,7 @@
 GH_COMMIT=	fd1d4fa
 
 USES=		autoreconf libtool pathfix
+USE_LIBTOOL=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 
 USE_LDCONFIG=	yes

Modified: trunk/net/GeoIP/files/geoipupdate.sh.in
===================================================================
--- trunk/net/GeoIP/files/geoipupdate.sh.in	2015-05-04 02:28:41 UTC (rev 18783)
+++ trunk/net/GeoIP/files/geoipupdate.sh.in	2015-05-04 02:33:19 UTC (rev 18784)
@@ -9,19 +9,20 @@
 _fetch() {
     url="$1"
     out="$2"
-    TEMPFILE="$(mktemp "%%DATADIR%%"/GeoIP.dat-XXXXXX)"
-    trap 'rc=$? ; set +e ; rm -f "'"$TEMPFILE"'" ; exit $rc' 0
-    if fetch -o - "$url" | gunzip >> "$TEMPFILE" ; then
-	chmod 444 "$TEMPFILE"
-	if ! mv -f "$TEMPFILE" "%%DATADIR%%"/"$2" ; then
-	    echo "Unable to replace %%DATADIR%%/$2"
-	    return 2
-	fi
+    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
+        echo "$2 download failed"
+        return 1
     fi
-    rm -f "$TEMPFILE"
+    rmdir "$TEMPDIR"
     trap - 0
     return 0
 }