From owner-svn-ports-all@FreeBSD.ORG  Thu May  8 10:52:15 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 216491AF;
 Thu,  8 May 2014 10:52:15 +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 0EDF6D5E;
 Thu,  8 May 2014 10:52:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s48AqE3B050078;
 Thu, 8 May 2014 10:52:14 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s48AqEJh050077;
 Thu, 8 May 2014 10:52:14 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201405081052.s48AqEJh050077@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Thu, 8 May 2014 10:52:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r353284 - head/converters/osm2pgsql
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 May 2014 10:52:15 -0000

Author: tijl
Date: Thu May  8 10:52:14 2014
New Revision: 353284
URL: http://svnweb.freebsd.org/changeset/ports/353284
QAT: https://qat.redports.org/buildarchive/r353284/

Log:
  - Merge two USES definitions.
  - Use standard autotools targets.

Modified:
  head/converters/osm2pgsql/Makefile

Modified: head/converters/osm2pgsql/Makefile
==============================================================================
--- head/converters/osm2pgsql/Makefile	Thu May  8 10:47:26 2014	(r353283)
+++ head/converters/osm2pgsql/Makefile	Thu May  8 10:52:14 2014	(r353284)
@@ -3,7 +3,7 @@
 
 PORTNAME=	osm2pgsql
 PORTVERSION=	0.84.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -19,13 +19,12 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 GH_COMMIT=	237b125
 
-USES=		libtool
-GNU_CONFIGURE=	yes
+USES=		gmake libtool lua pgsql tar:bzip2
 USE_AUTOTOOLS=	autoconf automake aclocal autoheader libtoolize
+AUTOMAKE_ARGS=	-a -c -f
 CONFIGURE_ARGS=	LUA="${LUA_CMD}" \
 		LUA_INCLUDE="-I${LUA_INCDIR}" \
 		LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}"
-USES=		gmake lua pgsql tar:bzip2
 USE_GNOME=	libxml2
 
 PLIST_FILES=	bin/nodecachefilereader \
@@ -39,9 +38,6 @@ PORTDATA=	*
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/m4/*.m4
 
-run-autotools:
-	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh
-
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}