From owner-svn-ports-all@FreeBSD.ORG Fri Oct 4 17:20:19 2013 Return-Path: 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 2342D8AD; Fri, 4 Oct 2013 17:20:19 +0000 (UTC) (envelope-from sunpoet@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 EC1CA2A5C; Fri, 4 Oct 2013 17:20:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r94HKIl1021616; Fri, 4 Oct 2013 17:20:18 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94HKIR4021615; Fri, 4 Oct 2013 17:20:18 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201310041720.r94HKIR4021615@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 4 Oct 2013 17:20:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329346 - head/graphics/gdal 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2013 17:20:19 -0000 Author: sunpoet Date: Fri Oct 4 17:20:18 2013 New Revision: 329346 URL: http://svnweb.freebsd.org/changeset/ports/329346 Log: - Convert to new OPTIONS helper - Support STAGEDIR Modified: head/graphics/gdal/Makefile Modified: head/graphics/gdal/Makefile ============================================================================== --- head/graphics/gdal/Makefile Fri Oct 4 17:19:41 2013 (r329345) +++ head/graphics/gdal/Makefile Fri Oct 4 17:20:18 2013 (r329346) @@ -60,8 +60,8 @@ HDF5_CONFIGURE_ON= --with-hdf5=${LOCALBA HDF5_LIB_DEPENDS= libhdf5.so.7:${PORTSDIR}/science/hdf5-18 ICONV_CONFIGURE_OFF= --with-libiconv-prefix=no ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} -ICONV_USES= iconv ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} +ICONV_USES= iconv JASPER_CONFIGURE_OFF= --with-jasper=no JASPER_CONFIGURE_ON= --with-jasper=${LOCALBASE} JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper @@ -76,6 +76,7 @@ LIBXML2_CONFIGURE_ON= --with-xml2=${LOCA LIBXML2_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 MYSQL_CONFIGURE_OFF= --with-mysql=no MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config +MYSQL_USE= MYSQL=yes NETCDF_CONFIGURE_OFF= --with-netcdf=no NETCDF_CONFIGURE_ON= --with-netcdf=${LOCALBASE} NETCDF_LIB_DEPENDS= libnetcdf.so.7:${PORTSDIR}/science/netcdf4 @@ -87,6 +88,7 @@ PCRE_CONFIGURE_ON= --with-pcre=${LOCALBA PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PGSQL_CONFIGURE_OFF= --with-pg=no PGSQL_CONFIGURE_ON= --with-pg=${LOCALBASE}/bin/pg_config +PGSQL_USE= PGSQL=yes PNG_CONFIGURE_OFF= --with-png=internal PNG_CONFIGURE_ON= --with-png=${LOCALBASE} PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png @@ -98,6 +100,7 @@ PROJ_CONFIGURE_ON= --with-static-proj4=$ PROJ_LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj SQLITE_CONFIGURE_OFF= --with-sqlite3=no SQLITE_CONFIGURE_ON= --with-sqlite3=${LOCALBASE} +SQLITE_USE= SQLITE=yes TIFF_CONFIGURE_OFF= --with-libtiff=internal TIFF_CONFIGURE_ON= --with-libtiff=${LOCALBASE} TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff @@ -110,26 +113,11 @@ XERCES_LIB_DEPENDS= libxerces-c.so:${POR SLAVEDIRS= graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure post-install: - ${TOUCH} ${PREFIX}/lib/gdalplugins/.keepme - ${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${DATADIR}/ + ${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme + ${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/ .include