From owner-svn-ports-head@FreeBSD.ORG Mon Oct 13 01:31:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E913B20D; Mon, 13 Oct 2014 01:31:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBF905F8; Mon, 13 Oct 2014 01:31:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9D1VTCP009533; Mon, 13 Oct 2014 01:31:29 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9D1VT4C009529; Mon, 13 Oct 2014 01:31:29 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201410130131.s9D1VT4C009529@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 13 Oct 2014 01:31:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370750 - in head/net/GeoIP: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2014 01:31:30 -0000 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@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 -@dirrmtry %%DATADIR%%