From owner-svn-ports-all@FreeBSD.ORG Sat Nov 23 15:55:09 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 ESMTPS id 88895E23; Sat, 23 Nov 2013 15:55:09 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 782B82E57; Sat, 23 Nov 2013 15:55:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rANFt9NG059348; Sat, 23 Nov 2013 15:55:09 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rANFt9fB059347; Sat, 23 Nov 2013 15:55:09 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201311231555.rANFt9fB059347@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 23 Nov 2013 15:55:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334681 - 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.16 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: Sat, 23 Nov 2013 15:55:09 -0000 Author: sunpoet Date: Sat Nov 23 15:55:08 2013 New Revision: 334681 URL: http://svnweb.freebsd.org/changeset/ports/334681 Log: - Add ARMADILLO, FREEXL and PODOFO options - Fix whitespace in r329304 - While I'm here, move SLAVEDIRS upward PR: ports/183469 Submitted by: lbartoletti Modified: head/graphics/gdal/Makefile Modified: head/graphics/gdal/Makefile ============================================================================== --- head/graphics/gdal/Makefile Sat Nov 23 15:52:43 2013 (r334680) +++ head/graphics/gdal/Makefile Sat Nov 23 15:55:08 2013 (r334681) @@ -14,9 +14,11 @@ COMMENT= Translator library for raster g LICENSE= MIT -OPTIONS_DEFINE= CFITSIO CURL ECW EXPAT GEOS GEOTIFF GIF GTA HDF5 ICONV JASPER \ - JPEG KML LIBXML2 MYSQL NETCDF ODBC PCRE PGSQL PNG POPPLER PROJ \ - SQLITE TIFF WEBP XERCES +OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GEOTIFF GIF GTA \ + HDF5 ICONV JASPER JPEG KML LIBXML2 MYSQL NETCDF ODBC PCRE \ + PGSQL PNG PROJ SQLITE TIFF WEBP XERCES +OPTIONS_RADIO= PDF +OPTIONS_RADIO_PDF= PODOFO POPPLER OPTIONS_DEFAULT=GEOTIFF GIF JASPER JPEG PNG TIFF PCRE_DESC= Regular expression support for SQLite @@ -31,6 +33,11 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USES= gmake +SLAVEDIRS= graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal + +ARMADILLO_CONFIGURE_OFF=--with-armadillo=no +ARMADILLO_CONFIGURE_ON= --with-armadillo=${LOCALBASE} +ARMADILLO_LIB_DEPENDS= libarmadillo.so:${PORTSDIR}/math/armadillo CFITSIO_CONFIGURE_OFF= --with-cfitsio=no CFITSIO_CONFIGURE_ON= --with-cfitsio=${LOCALBASE} CFITSIO_LIB_DEPENDS= libcfitsio.so:${PORTSDIR}/astro/cfitsio @@ -43,6 +50,9 @@ ECW_LIB_DEPENDS= libNCSEcw.so:${PORTSDIR EXPAT_CONFIGURE_OFF= --with-expat=no EXPAT_CONFIGURE_ON= --with-expat=${LOCALBASE} EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +FREEXL_CONFIGURE_OFF= --with-freexl=no +FREEXL_CONFIGURE_ON= --with-freexl=${LOCALBASE} +FREEXL_LIB_DEPENDS= libfreexl.so:${PORTSDIR}/textproc/freexl GEOS_CONFIGURE_OFF= --with-geos=no GEOS_CONFIGURE_ON= --with-geos=${LOCALBASE}/bin/geos-config GEOS_LIB_DEPENDS= libgeos.so:${PORTSDIR}/graphics/geos @@ -60,7 +70,7 @@ 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_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} +ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} ICONV_USES= iconv JASPER_CONFIGURE_OFF= --with-jasper=no JASPER_CONFIGURE_ON= --with-jasper=${LOCALBASE} @@ -92,6 +102,9 @@ PGSQL_USE= PGSQL=yes PNG_CONFIGURE_OFF= --with-png=internal PNG_CONFIGURE_ON= --with-png=${LOCALBASE} PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +PODOFO_CONFIGURE_OFF= --with-podofo=no +PODOFO_CONFIGURE_ON= --with-podofo=${LOCALBASE} +PODOFO_LIB_DEPENDS= libpodofo.so:${PORTSDIR}/graphics/podofo POPPLER_CONFIGURE_OFF= --with-poppler=no POPPLER_CONFIGURE_ON= --with-poppler=${LOCALBASE} POPPLER_LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler @@ -111,8 +124,6 @@ XERCES_CONFIGURE_OFF= --with-xerces=no XERCES_CONFIGURE_ON= --with-xerces=${LOCALBASE} XERCES_LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 -SLAVEDIRS= graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure