From owner-svn-ports-all@freebsd.org Tue Feb 9 14:53:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FAFCAA34FC; Tue, 9 Feb 2016 14:53:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 40CC714BB; Tue, 9 Feb 2016 14:53:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u19EraML053233; Tue, 9 Feb 2016 14:53:36 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u19EraVp053232; Tue, 9 Feb 2016 14:53:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602091453.u19EraVp053232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 9 Feb 2016 14:53:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408570 - head/math/pdal 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2016 14:53:37 -0000 Author: amdmi3 Date: Tue Feb 9 14:53:36 2016 New Revision: 408570 URL: https://svnweb.freebsd.org/changeset/ports/408570 Log: - Fix USES - Add missing options descriptions - Switch to options helpers Approved by: portmgr blanket Modified: head/math/pdal/Makefile Modified: head/math/pdal/Makefile ============================================================================== --- head/math/pdal/Makefile Tue Feb 9 14:51:59 2016 (r408569) +++ head/math/pdal/Makefile Tue Feb 9 14:53:36 2016 (r408570) @@ -3,16 +3,15 @@ PORTNAME= pdal PORTVERSION= 0.9.8 -PORTREVISION= 1 CATEGORIES= math databases graphics MAINTAINER= coder@tuxfamily.org COMMENT= Library for translating and manipulating point cloud data LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cmake compiler -compiler_ARGS= c++11-lang +USES= cmake compiler:c++11-lang USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} @@ -20,43 +19,24 @@ GH_PROJECT= ${GH_ACCOUNT} OPTIONS_DEFINE= GDAL GEOTIFF LIBXML2 EMBED_BOOST OPTIONS_DEFAULT= GDAL GEOTIFF LIBXML2 +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MGDAL} -CMAKE_ARGS+= -DWITH_GDAL:BOOL=TRUE -LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal -PLIST_SUB+= GDAL="" -.else -CMAKE_ARGS+= -DWITH_GDAL:BOOL=FALSE -PLIST_SUB+= GDAL="@comment " -.endif - -.if ${PORT_OPTIONS:MGEOTIFF} -CMAKE_ARGS+= -DWITH_GEOTIFF:BOOL=TRUE -LIB_DEPENDS+= libgeotiff.so:${PORTSDIR}/graphics/libgeotiff -PLIST_SUB+= GEOTIFF="" -.else -CMAKE_ARGS+= -DWITH_GEOTIFF:BOOL=FALSE -PLIST_SUB+= GEOTIFF="@comment " -.endif - -.if ${PORT_OPTIONS:MLIBXML2} -CMAKE_ARGS+= -DWITH_LIBXML2:BOOL=TRUE -LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 -PLIST_SUB+= LIBXML2="" -.else -CMAKE_ARGS+= -DWITH_LIBXML2:BOOL=FALSE -PLIST_SUB+= LIBXML2="@comment " -.endif - -.if ${PORT_OPTIONS:MEMBED_BOOST} -CMAKE_ARGS+= -DPDAL_EMBED_BOOST:BOOL=TRUE -PLIST_SUB+= EMBED_BOOST="" -.else -CMAKE_ARGS+= -DPDAL_EMBED_BOOST:BOOL=FALSE -LIB_DEPENDS+= libboost_thread.so:${PORTSDIR}/devel/boost-libs -PLIST_SUB+= EMBED_BOOST="@comment " -.endif +GDAL_DESC= Enable GDAL support +GDAL_CMAKE_ON= -DWITH_GDAL:BOOL=TRUE +GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal +GDAL_CMAKE_OFF= -DWITH_GDAL:BOOL=FALSE + +GEOTIFF_CMAKE_ON= -DWITH_GEOTIFF:BOOL=TRUE +GEOTIFF_LIB_DEPENDS= libgeotiff.so:${PORTSDIR}/graphics/libgeotiff +GEOTIFF_CMAKE_OFF= -DWITH_GEOTIFF:BOOL=FALSE + +LIBXML2_CMAKE_ON= -DWITH_LIBXML2:BOOL=TRUE +LIBXML2_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 +LIBXML2_CMAKE_OFF= -DWITH_LIBXML2:BOOL=FALSE + +EMBED_BOOST_DESC= Use embedded rather than system boost +EMBED_BOOST_CMAKE_ON= -DPDAL_EMBED_BOOST:BOOL=TRUE +EMBED_BOOST_CMAKE_OFF= -DPDAL_EMBED_BOOST:BOOL=FALSE +EMBED_BOOST_LIB_DEPENDS_OFF= libboost_thread.so:${PORTSDIR}/devel/boost-libs .include