From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 17 01:15:51 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 A17676F;
 Thu, 17 Oct 2013 01:15:51 +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 75AD2273C;
 Thu, 17 Oct 2013 01:15:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H1Fpr9010753;
 Thu, 17 Oct 2013 01:15:51 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H1FpaF010752;
 Thu, 17 Oct 2013 01:15:51 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201310170115.r9H1FpaF010752@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 17 Oct 2013 01:15:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330586 - head/astro/osmium
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:15:51 -0000

Author: amdmi3
Date: Thu Oct 17 01:15:50 2013
New Revision: 330586
URL: http://svnweb.freebsd.org/changeset/ports/330586

Log:
  - Support staging
  - Use new LIB_DEPENDS syntax

Modified:
  head/astro/osmium/Makefile

Modified: head/astro/osmium/Makefile
==============================================================================
--- head/astro/osmium/Makefile	Thu Oct 17 01:15:05 2013	(r330585)
+++ head/astro/osmium/Makefile	Thu Oct 17 01:15:50 2013	(r330586)
@@ -12,12 +12,12 @@ COMMENT=	C++/Javascript framework for wo
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
-		boost_regex:${PORTSDIR}/devel/boost-libs \
-		sqlite3:${PORTSDIR}/databases/sqlite3 \
-		expat:${PORTSDIR}/textproc/expat2 \
-		geos:${PORTSDIR}/graphics/geos \
-		protobuf:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
+		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
+		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libgeos.so:${PORTSDIR}/graphics/geos \
+		libprotobuf.so:${PORTSDIR}/devel/protobuf
 BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
 RUN_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
 
@@ -29,7 +29,6 @@ GH_COMMIT=	1a5bb26
 CXXFLAGS+=	-I${LOCALBASE}/include \
 		-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	JAVASCRIPT DOXYGEN DOCS
@@ -39,9 +38,9 @@ JAVASCRIPT_DESC=Enable javascript suppor
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJAVASCRIPT}
-LIB_DEPENDS+=	v8:${PORTSDIR}/lang/v8 \
-		shp:${PORTSDIR}/devel/shapelib \
-		icuuc:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libv8.so:${PORTSDIR}/lang/v8 \
+		libshp.so:${PORTSDIR}/devel/shapelib \
+		libicuuc.so:${PORTSDIR}/devel/icu
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
@@ -61,15 +60,12 @@ regression-test:
 
 do-install:
 	cd ${WRKSRC}/include && ${COPYTREE_SHARE} '${PORTNAME} ${PORTNAME}.hpp' \
-		${PREFIX}/include/
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${MKDIR} ${DOCSDIR}
+		${STAGEDIR}${PREFIX}/include/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .if ${PORT_OPTIONS:MDOXYGEN}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR}/
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
 .endif
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/THANKS \
-		${WRKSRC}/NOTES_FOR_DEVELOPERS ${DOCSDIR}/
-.endif
+		${WRKSRC}/NOTES_FOR_DEVELOPERS ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>