From owner-svn-ports-all@freebsd.org Fri Jan 11 20:16:53 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F6D7149BB9A; Fri, 11 Jan 2019 20:16:53 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C321F84FF0; Fri, 11 Jan 2019 20:16:52 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9707C20B64; Fri, 11 Jan 2019 20:16:52 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0BKGqxA087779; Fri, 11 Jan 2019 20:16:52 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0BKGomT087770; Fri, 11 Jan 2019 20:16:50 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201901112016.x0BKGomT087770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 11 Jan 2019 20:16:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489995 - in head: graphics/R-cran-rgdal graphics/gdal graphics/gdal/files graphics/py-fiona/files math/R-cran-sf X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head: graphics/R-cran-rgdal graphics/gdal graphics/gdal/files graphics/py-fiona/files math/R-cran-sf X-SVN-Commit-Revision: 489995 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C321F84FF0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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, 11 Jan 2019 20:16:53 -0000 Author: sunpoet Date: Fri Jan 11 20:16:50 2019 New Revision: 489995 URL: https://svnweb.freebsd.org/changeset/ports/489995 Log: Update to 2.4.0 - Update MASTER_SITES - Add ZSTD option Changes: https://trac.osgeo.org/gdal/wiki/Release/2.3.0-News https://trac.osgeo.org/gdal/wiki/Release/2.3.1-News https://trac.osgeo.org/gdal/wiki/Release/2.3.2-News https://trac.osgeo.org/gdal/wiki/Release/2.3.3-News https://trac.osgeo.org/gdal/wiki/Release/2.4.0-News PR: 231629 Exp-run by: antoine Added: head/graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp (contents, props changed) head/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp (contents, props changed) head/graphics/py-fiona/files/ head/graphics/py-fiona/files/patch-setup.py (contents, props changed) Deleted: head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.cpp head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.h head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-opencad.h Modified: head/graphics/R-cran-rgdal/Makefile head/graphics/gdal/Makefile head/graphics/gdal/distinfo head/graphics/gdal/files/patch-apps_GNUmakefile head/graphics/gdal/files/patch-frmts-mrf-mrf_band.cpp head/graphics/gdal/pkg-plist head/math/R-cran-sf/Makefile Modified: head/graphics/R-cran-rgdal/Makefile ============================================================================== --- head/graphics/R-cran-rgdal/Makefile Fri Jan 11 20:15:34 2019 (r489994) +++ head/graphics/R-cran-rgdal/Makefile Fri Jan 11 20:16:50 2019 (r489995) @@ -18,6 +18,6 @@ CRAN_DEPENDS= R-cran-sp>=1.1.0:math/R-cran-sp BUILD_DEPENDS= ${CRAN_DEPENDS} RUN_DEPENDS= ${CRAN_DEPENDS} -USES= cran:auto-plist,compiles pkgconfig +USES= compiler:c++11-lang cran:auto-plist,compiles pkgconfig .include Modified: head/graphics/gdal/Makefile ============================================================================== --- head/graphics/gdal/Makefile Fri Jan 11 20:15:34 2019 (r489994) +++ head/graphics/gdal/Makefile Fri Jan 11 20:16:50 2019 (r489995) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 2.2.4 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ - ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org @@ -24,13 +22,15 @@ LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \ OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \ KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL \ - SPATIALITE SQLITE WEBP XERCES + SPATIALITE SQLITE WEBP XERCES ZSTD OPTIONS_DEFAULT=JASPER OPTIONS_RADIO= PDF OPTIONS_RADIO_PDF= PODOFO POPPLER OPTIONS_SUB= yes PCRE_DESC= Regular expression support for SQLite +USES= compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz + CFLAGS+= -fPIC CONFIGURE_ARGS= --datadir=${DATADIR} \ --enable-static=yes \ @@ -43,7 +43,7 @@ CONFIGURE_ARGS= --datadir=${DATADIR} \ --with-libtiff=yes \ --with-libz=/usr \ --with-png=yes \ - --with-static-proj4=no \ + --with-proj=yes \ --with-threads=yes \ --without-libtool \ ${ICONV_CONFIGURE_ARG} @@ -51,13 +51,29 @@ GNU_CONFIGURE= yes LDFLAGS+= ${ICONV_LIB} MAKE_JOBS_UNSAFE= yes MAKEFILE= GNUmakefile +USE_CXXSTD= c++11 USE_LDCONFIG= yes -USES= gmake iconv jpeg localbase tar:xz PLIST_SUB= PORTVERSION=${PORTVERSION} SLAVEDIRS= graphics/p5-Geo-GDAL graphics/py-gdal +HEADER_FILES= alg/gdalwarpkernel_opencl.h \ + alg/gvgcpfit.h \ + alg/internal_qhull_headers.h \ + alg/thinplatespline.h\ + gcore/gdalexif.h \ + gcore/gdaljp2metadatagenerator.h \ + gcore/gdalsse_priv.h \ + gnm/gnm_priv.h \ + port/cpl_aws.h \ + port/cpl_cpu_features.h \ + port/cpl_google_cloud.h \ + port/cpl_sha1.h \ + port/cpl_sha256.h \ + port/cpl_vsil_curl_priv.h \ + port/cpl_worker_thread_pool.h + ARMADILLO_CONFIGURE_WITH= armadillo ARMADILLO_LIB_DEPENDS= libarmadillo.so:math/armadillo CFITSIO_CONFIGURE_WITH= cfitsio @@ -114,6 +130,8 @@ WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp XERCES_CONFIGURE_WITH= xerces XERCES_LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 +ZSTD_CONFIGURE_WITH= zstd +ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd post-patch: @${REINPLACE_CMD} -e '/^#GDAL_SLIB_SONAME/ s|^#||' ${WRKSRC}/GDALmake.opt.in @@ -130,7 +148,7 @@ post-patch: @${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/ post-install: - cd ${WRKSRC}/gnm/ && ${INSTALL_DATA} gnm.h gnm_api.h gnm_priv.h gnmgraph.h ${STAGEDIR}${PREFIX}/include/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/ ${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/ ${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme ${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/ Modified: head/graphics/gdal/distinfo ============================================================================== --- head/graphics/gdal/distinfo Fri Jan 11 20:15:34 2019 (r489994) +++ head/graphics/gdal/distinfo Fri Jan 11 20:16:50 2019 (r489995) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521659854 -SHA256 (gdal-2.2.4.tar.xz) = 441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278 -SIZE (gdal-2.2.4.tar.xz) = 8255840 +TIMESTAMP = 1546772828 +SHA256 (gdal-2.4.0.tar.xz) = c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27 +SIZE (gdal-2.4.0.tar.xz) = 8874628 Modified: head/graphics/gdal/files/patch-apps_GNUmakefile ============================================================================== --- head/graphics/gdal/files/patch-apps_GNUmakefile Fri Jan 11 20:15:34 2019 (r489994) +++ head/graphics/gdal/files/patch-apps_GNUmakefile Fri Jan 11 20:16:50 2019 (r489995) @@ -1,11 +1,11 @@ ---- apps/GNUmakefile.orig 2016-10-24 11:00:31 UTC +--- apps/GNUmakefile.orig 2018-05-04 16:05:45 UTC +++ apps/GNUmakefile @@ -215,7 +215,7 @@ gdal-config-inst: gdal-config.in ../GDAL install: default - for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done -- $(INSTALL) gdal_utils.h $(DESTDIR)$(INST_INCLUDE) +- $(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE) - $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config + for f in $(BIN_LIST) ; do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(INST_BIN) ; done + $(BSD_INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE) Modified: head/graphics/gdal/files/patch-frmts-mrf-mrf_band.cpp ============================================================================== --- head/graphics/gdal/files/patch-frmts-mrf-mrf_band.cpp Fri Jan 11 20:15:34 2019 (r489994) +++ head/graphics/gdal/files/patch-frmts-mrf-mrf_band.cpp Fri Jan 11 20:16:50 2019 (r489995) @@ -1,11 +1,11 @@ ---- frmts/mrf/mrf_band.cpp.orig 2016-04-25 17:35:55 UTC +--- frmts/mrf/mrf_band.cpp.orig 2018-12-14 21:36:28 UTC +++ frmts/mrf/mrf_band.cpp -@@ -57,7 +57,7 @@ +@@ -49,7 +49,7 @@ #include #include -#include "../zlib/zlib.h" +#include - using std::vector; - using std::string; + CPL_CVSID("$Id: mrf_band.cpp 959843c9331689918199b9a8667b8196c8b38c2f 2018-05-04 15:50:28 -0700 Lucian Plesea $") + Added: head/graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp Fri Jan 11 20:16:50 2019 (r489995) @@ -0,0 +1,20 @@ +--- frmts/pdf/pdfdataset.cpp.orig 2018-12-14 21:37:15 UTC ++++ frmts/pdf/pdfdataset.cpp +@@ -3459,7 +3459,7 @@ void PDFDataset::FindLayersPoppler() + #endif + if( ocg != nullptr && ocg->getName() != nullptr ) + { +- const char* pszLayerName = (const char*)ocg->getName()->getCString(); ++ const char* pszLayerName = (const char*)ocg->getName()->c_str(); + AddLayer(pszLayerName); + oLayerOCGMapPoppler[pszLayerName] = ocg; + } +@@ -4787,7 +4787,7 @@ GDALDataset *PDFDataset::Open( GDALOpenI + GooString* poMetadata = poCatalogPoppler->readMetadata(); + if (poMetadata) + { +- const char* pszContent = poMetadata->getCString(); ++ const char* pszContent = poMetadata->c_str(); + if (pszContent != nullptr && + STARTS_WITH(pszContent, "getString(); + #endif +- return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast(gooString->getCString()), ++ return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast(gooString->c_str()), + static_cast(gooString->getLength()))); + } + else +@@ -1422,7 +1422,7 @@ char* GDALPDFStreamPoppler::GetBytes() + char* pszContent = (char*) VSIMalloc(m_nLength + 1); + if (pszContent) + { +- memcpy(pszContent, gstr->getCString(), m_nLength); ++ memcpy(pszContent, gstr->c_str(), m_nLength); + pszContent[m_nLength] = '\0'; + } + delete gstr; Modified: head/graphics/gdal/pkg-plist ============================================================================== --- head/graphics/gdal/pkg-plist Fri Jan 11 20:15:34 2019 (r489994) +++ head/graphics/gdal/pkg-plist Fri Jan 11 20:16:50 2019 (r489995) @@ -25,6 +25,7 @@ bin/ogrtindex bin/testepsg etc/bash_completion.d/gdal-bash-completion.sh include/cpl_atomic_ops.h +include/cpl_auto_close.h include/cpl_aws.h include/cpl_config.h include/cpl_config_extras.h @@ -35,6 +36,7 @@ include/cpl_error.h include/cpl_google_cloud.h include/cpl_hash_set.h include/cpl_http.h +include/cpl_json.h include/cpl_list.h include/cpl_minixml.h include/cpl_minizip_ioapi.h @@ -112,16 +114,19 @@ libdata/pkgconfig/gdal.pc %%DATADIR%%/GDALLogoColor.svg %%DATADIR%%/GDALLogoGS.svg %%DATADIR%%/GDALmake.opt +%%DATADIR%%/bag_template.xml %%DATADIR%%/compdcs.csv %%DATADIR%%/coordinate_axis.csv %%DATADIR%%/cubewerx_extra.wkt %%DATADIR%%/datum_shift.csv %%DATADIR%%/default.rsc %%DATADIR%%/ecw_cs.wkt +%%DATADIR%%/eedaconf.json %%DATADIR%%/ellipsoid.csv %%DATADIR%%/epsg.wkt %%DATADIR%%/esri_StatePlane_extra.wkt %%DATADIR%%/esri_Wisconsin_extra.wkt +%%DATADIR%%/esri_epsg.wkt %%DATADIR%%/esri_extra.wkt %%DATADIR%%/gcs.csv %%DATADIR%%/gcs.override.csv @@ -177,6 +182,7 @@ libdata/pkgconfig/gdal.pc %%DATADIR%%/pci_ellips.txt %%DATADIR%%/pcs.csv %%DATADIR%%/pcs.override.csv +%%DATADIR%%/pds4_template.xml %%DATADIR%%/plscenesconf.json %%DATADIR%%/prime_meridian.csv %%DATADIR%%/projop_wparm.csv Added: head/graphics/py-fiona/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/py-fiona/files/patch-setup.py Fri Jan 11 20:16:50 2019 (r489995) @@ -0,0 +1,37 @@ +Obtained from: https://github.com/Toblerity/Fiona/commit/99fa8c27e6f8f8d1dba428fe123878cf9bb5bba3 + +--- setup.py.orig 2018-07-17 18:09:40 UTC ++++ setup.py +@@ -181,6 +181,14 @@ ext_options = dict( + extra_link_args=extra_link_args, + ) + ++ext_options_cpp = ext_options.copy() ++# GDAL 2.3+ requires C++11 ++if sys.platform == "win32": ++ ext_options_cpp["extra_compile_args"] = ["/std:c++11"] ++else: ++ ext_options_cpp["extra_compile_args"] = ["-std=c++11"] ++ ++ + # Define the extension modules. + ext_modules = [] + +@@ -207,7 +215,7 @@ if source_is_repo and "clean" not in sys + + ext_modules = cythonize([ + Extension('fiona._geometry', ['fiona/_geometry.pyx'], **ext_options), +- Extension('fiona._transform', ['fiona/_transform.pyx'], **ext_options), ++ Extension('fiona._transform', ['fiona/_transform.pyx'], **ext_options_cpp), + Extension('fiona._crs', ['fiona/_crs.pyx'], **ext_options), + Extension('fiona._drivers', ['fiona/_drivers.pyx'], **ext_options), + Extension('fiona._err', ['fiona/_err.pyx'], **ext_options), +@@ -217,7 +225,7 @@ if source_is_repo and "clean" not in sys + # If there's no manifest template, as in an sdist, we just specify .c files. + elif "clean" not in sys.argv: + ext_modules = [ +- Extension('fiona._transform', ['fiona/_transform.cpp'], **ext_options), ++ Extension('fiona._transform', ['fiona/_transform.cpp'], **ext_options_cpp), + Extension('fiona._geometry', ['fiona/_geometry.c'], **ext_options), + Extension('fiona._crs', ['fiona/_crs.c'], **ext_options), + Extension('fiona._drivers', ['fiona/_drivers.c'], **ext_options), Modified: head/math/R-cran-sf/Makefile ============================================================================== --- head/math/R-cran-sf/Makefile Fri Jan 11 20:15:34 2019 (r489994) +++ head/math/R-cran-sf/Makefile Fri Jan 11 20:16:50 2019 (r489995) @@ -24,6 +24,6 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \ BUILD_DEPENDS= ${CRAN_DEPENDS} RUN_DEPENDS= ${CRAN_DEPENDS} -USES= cran:auto-plist,compiles +USES= compiler:c++11-lang cran:auto-plist,compiles .include