From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 17 01:16:43 2013
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 ESMTP id 3A02117A;
 Thu, 17 Oct 2013 01:16:43 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 280DF2747;
 Thu, 17 Oct 2013 01:16:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H1GhKK011080;
 Thu, 17 Oct 2013 01:16:43 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H1GhDe011079;
 Thu, 17 Oct 2013 01:16:43 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201310170116.r9H1GhDe011079@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 17 Oct 2013 01:16:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330587 - 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.14
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, 17 Oct 2013 01:16:43 -0000

Author: amdmi3
Date: Thu Oct 17 01:16:42 2013
New Revision: 330587
URL: http://svnweb.freebsd.org/changeset/ports/330587

Log:
  - Support staging
  - Use new LIB_DEPENDS syntax
  - Convert USE_GMAKE to USES

Deleted:
  head/converters/osm2pgsql/pkg-plist
Modified:
  head/converters/osm2pgsql/Makefile

Modified: head/converters/osm2pgsql/Makefile
==============================================================================
--- head/converters/osm2pgsql/Makefile	Thu Oct 17 01:15:50 2013	(r330586)
+++ head/converters/osm2pgsql/Makefile	Thu Oct 17 01:16:42 2013	(r330587)
@@ -10,26 +10,25 @@ MASTER_SITES=	http://mirror.amdmi3.ru/di
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert OSM XML data to PostgreSQL database
 
-LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
-		geos:${PORTSDIR}/graphics/geos \
-		protobuf-c:${PORTSDIR}/devel/protobuf-c
-
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
+		libgeos.so:${PORTSDIR}/graphics/geos \
+		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf automake libtool aclocal autoheader libtoolize
-USE_GMAKE=	yes
+USES=		gmake
 USE_PGSQL=	yes
 USE_GNOME=	libxml2
 
-PORTDOCS=	ChangeLog README AUTHORS TODO
+PLIST_FILES=	bin/nodecachefilereader \
+		bin/osm2pgsql \
+		man/man1/osm2pgsql.1.gz
 
-MAN1=		osm2pgsql.1
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PORTDOCS=	ChangeLog README AUTHORS TODO
+PORTDATA=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/m4/*.m4
@@ -37,12 +36,10 @@ post-patch:
 run-autotools:
 	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>