From owner-svn-ports-all@FreeBSD.ORG Fri Aug 22 08:43:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45AB9AE2; Fri, 22 Aug 2014 08:43:36 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 173C335ED; Fri, 22 Aug 2014 08:43:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7M8hZB3009397; Fri, 22 Aug 2014 08:43:35 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7M8hZcl009396; Fri, 22 Aug 2014 08:43:35 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201408220843.s7M8hZcl009396@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 22 Aug 2014 08:43:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365616 - 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.18-1 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, 22 Aug 2014 08:43:36 -0000 Author: sunpoet Date: Fri Aug 22 08:43:35 2014 New Revision: 365616 URL: http://svnweb.freebsd.org/changeset/ports/365616 QAT: https://qat.redports.org/buildarchive/r365616/ Log: - Add JSON_C option - Fix build with devel/json-c 0.12 Obtained from: http://trac.osgeo.org/gdal/changeset/27267 Modified: head/graphics/gdal/Makefile Modified: head/graphics/gdal/Makefile ============================================================================== --- head/graphics/gdal/Makefile Fri Aug 22 08:27:52 2014 (r365615) +++ head/graphics/gdal/Makefile Fri Aug 22 08:43:35 2014 (r365616) @@ -15,8 +15,8 @@ COMMENT= Translator library for raster g LICENSE= MIT 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 + HDF5 ICONV JASPER JPEG JSON_C 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 @@ -82,6 +82,9 @@ JASPER_LIB_DEPENDS= libjasper.so:${PORTS JPEG_CONFIGURE_OFF= --with-jpeg=internal JPEG_CONFIGURE_ON= --with-jpeg=${LOCALBASE} JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JSON_C_CONFIGURE_OFF= --with-libjson-c=internal +JSON_C_CONFIGURE_ON= --with-libjson-c=${LOCALBASE} +JSON_C_LIB_DEPENDS= libjson-c.so:${PORTSDIR}/devel/json-c KML_CONFIGURE_OFF= --with-libkml=no KML_CONFIGURE_ON= --with-libkml=${LOCALBASE} KML_LIB_DEPENDS= libkmlbase.so:${PORTSDIR}/science/libkml @@ -129,8 +132,17 @@ XERCES_CONFIGURE_ON= --with-xerces=${LOC XERCES_LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure +# patch for json-c 0.12 + @${REINPLACE_CMD} -e 's|json_tokener_errors\[jstok->err\]|json_tokener_error_desc(jstok->err)|' \ + ${WRKSRC}/frmts/mbtiles/mbtilesdataset.cpp \ + ${WRKSRC}/ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp \ + ${WRKSRC}/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp \ + ${WRKSRC}/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp \ + ${WRKSRC}/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp \ + ${WRKSRC}/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp \ + ${WRKSRC}/ogr/ogrsf_frmts/gme/ogrgmejson.cpp post-install: ${INSTALL_LIB} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/