Index: head/graphics/R-cran-rgdal/Makefile =================================================================== --- head/graphics/R-cran-rgdal/Makefile (revision 489994) +++ head/graphics/R-cran-rgdal/Makefile (revision 489995) @@ -1,23 +1,23 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= rgdal DISTVERSION= 1.3-6 PORTREVISION= 1 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= tota@FreeBSD.org COMMENT= Bindings for the Geospatial Data Abstraction Library LICENSE= GPLv2+ LIB_DEPENDS= libgdal.so:graphics/gdal \ libproj.so:graphics/proj 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 Index: head/graphics/gdal/Makefile =================================================================== --- head/graphics/gdal/Makefile (revision 489994) +++ head/graphics/gdal/Makefile (revision 489995) @@ -1,139 +1,157 @@ # Created by: Randall Hopper # $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 COMMENT= Translator library for raster geospatial data formats LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \ libgif.so:graphics/giflib \ libjson-c.so:devel/json-c \ libpng.so:graphics/png \ libproj.so:graphics/proj \ libtiff.so:graphics/tiff 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 \ --with-geotiff=yes \ --with-gif=yes \ --with-gnm=yes \ --with-jpeg=yes \ --with-libjson-c=yes \ --with-liblzma=yes \ --with-libtiff=yes \ --with-libz=/usr \ --with-png=yes \ - --with-static-proj4=no \ + --with-proj=yes \ --with-threads=yes \ --without-libtool \ ${ICONV_CONFIGURE_ARG} 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 CFITSIO_LIB_DEPENDS= libcfitsio.so:astro/cfitsio CURL_CONFIGURE_OFF= --with-curl=no CURL_CONFIGURE_ON= --with-curl=${LOCALBASE}/bin/curl-config CURL_LIB_DEPENDS= libcurl.so:ftp/curl ECW_CONFIGURE_WITH= ecw ECW_LIB_DEPENDS= libNCSEcw.so:graphics/libecwj2 EXPAT_CONFIGURE_WITH= expat EXPAT_LIB_DEPENDS= libexpat.so:textproc/expat2 FREEXL_CONFIGURE_WITH= freexl FREEXL_LIB_DEPENDS= libfreexl.so:textproc/freexl GEOS_CONFIGURE_OFF= --with-geos=no GEOS_CONFIGURE_ON= --with-geos=${LOCALBASE}/bin/geos-config GEOS_LIB_DEPENDS= libgeos.so:graphics/geos GTA_CONFIGURE_WITH= gta GTA_LIB_DEPENDS= libgta.so:devel/libgta HDF5_CONFIGURE_WITH= hdf5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 JASPER_CONFIGURE_WITH= jasper JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper KML_CONFIGURE_WITH= libkml KML_LIB_DEPENDS= libkmlbase.so:science/libkml LIBXML2_CONFIGURE_OFF= --with-xml2=no LIBXML2_CONFIGURE_ON= --with-xml2=${LOCALBASE}/bin/xml2-config LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 MYSQL_CONFIGURE_OFF= --with-mysql=no MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config MYSQL_USES= mysql NETCDF_CONFIGURE_WITH= netcdf NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPENJPEG_CONFIGURE_WITH=openjpeg OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PGSQL_CONFIGURE_OFF= --with-pg=no PGSQL_CONFIGURE_ON= --with-pg=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql PODOFO_CONFIGURE_WITH= podofo PODOFO_LIB_DEPENDS= libpodofo.so:graphics/podofo POPPLER_CONFIGURE_WITH= poppler=${LOCALBASE} POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler SFCGAL_CONFIGURE_OFF= --with-sfcgal=no SFCGAL_CONFIGURE_ON= --with-sfcgal=${LOCALBASE}/bin/sfcgal-config SFCGAL_LIB_DEPENDS= libSFCGAL.so:databases/sfcgal SPATIALITE_CONFIGURE_WITH= spatialite SPATIALITE_LIB_DEPENDS= libspatialite.so:databases/spatialite SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES= sqlite 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 @${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|; s| LICENSE.TXT||' ${WRKSRC}/GNUmakefile @${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure # Clean up bundled libraries @${RM} -r ${WRKSRC}/frmts/gif/giflib/ @${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/ @${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/ @${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/ @${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/ @${RM} -r ${WRKSRC}/frmts/png/libpng/ @${RM} -r ${WRKSRC}/frmts/zlib/ @${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}/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION} .include Index: head/graphics/gdal/distinfo =================================================================== --- head/graphics/gdal/distinfo (revision 489994) +++ head/graphics/gdal/distinfo (revision 489995) @@ -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 Index: head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-opencad.h =================================================================== --- head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-opencad.h (revision 489994) +++ head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-opencad.h (nonexistent) @@ -1,17 +0,0 @@ -Obtained from: https://github.com/nextgis-borsch/lib_opencad/commit/f40ce46804f1612fbeb035d0be5a746105cfc17e - ---- ogr/ogrsf_frmts/cad/libopencad/opencad.h.orig 2017-04-28 16:07:33 UTC -+++ ogr/ogrsf_frmts/cad/libopencad/opencad.h -@@ -31,10 +31,10 @@ - #ifndef OPENCAD_H - #define OPENCAD_H - --#define OCAD_VERSION "0.3.2" -+#define OCAD_VERSION "0.3.3" - #define OCAD_VERSION_MAJOR 0 - #define OCAD_VERSION_MINOR 3 --#define OCAD_VERSION_REV 2 -+#define OCAD_VERSION_REV 3 - - #ifndef OCAD_COMPUTE_VERSION - #define OCAD_COMPUTE_VERSION(maj,min,rev) ((maj)*10000+(min)*100+rev) // maj - any, min < 99, rev < 99 Property changes on: head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-opencad.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.cpp =================================================================== --- head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.cpp (revision 489994) +++ head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.cpp (nonexistent) @@ -1,81 +0,0 @@ -Obtained from: https://github.com/nextgis-borsch/lib_opencad/commit/f40ce46804f1612fbeb035d0be5a746105cfc17e - ---- ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp.orig 2017-04-28 16:07:33 UTC -+++ ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp -@@ -310,14 +310,22 @@ CADVariant::CADVariant( const string& va - { - } - --CADVariant::CADVariant( time_t val ) : -+CADVariant::CADVariant( long julianday, long milliseconds ) : - type ( DataType::DATETIME ), - decimalVal ( 0 ), - xVal ( 0 ), - yVal ( 0 ), -- zVal ( 0 ), -- dateTimeVal ( val ) -+ zVal ( 0 ) - { -+ // unix -> julian return ( unixSecs / 86400.0 ) + 2440587.5; -+ // julian -> unix return (julian - 2440587.5) * 86400.0 -+ -+ double dfSeconds = double( milliseconds ) / 1000; -+ double dfUnix = 0; -+ if(julianday != 0) -+ dfUnix = ( double( julianday ) - 2440587.5 ) * 86400.0; -+ dateTimeVal = static_cast( dfUnix + dfSeconds ); -+ - char str_buff[256]; - strftime(str_buff, 255, "%Y-%m-%d %H:%M:%S", localtime(&dateTimeVal)); - stringVal = str_buff; -@@ -335,33 +343,6 @@ CADVariant::CADVariant( const CADHandle& - { - } - --CADVariant::CADVariant( const CADVariant& orig ) : -- type ( orig.type ), -- decimalVal ( orig.decimalVal ), -- xVal ( orig.xVal ), -- yVal ( orig.yVal ), -- zVal ( orig.zVal ), -- stringVal ( orig.stringVal ), -- handleVal ( orig.handleVal ), -- dateTimeVal ( orig.dateTimeVal ) --{ --} -- --CADVariant& CADVariant::operator=( const CADVariant& orig ) --{ -- if( this == & orig ) -- return * this; -- type = orig.type; -- stringVal = orig.stringVal; -- decimalVal = orig.decimalVal; -- xVal = orig.xVal; -- yVal = orig.yVal; -- zVal = orig.zVal; -- handleVal = orig.handleVal; -- dateTimeVal = orig.dateTimeVal; -- return * this; --} -- - long CADVariant::getDecimal() const - { - return decimalVal; -@@ -461,15 +442,7 @@ int CADHeader::addValue( short code, dou - - int CADHeader::addValue( short code, long julianday, long milliseconds ) - { -- // unix -> julian return ( unixSecs / 86400.0 ) + 2440587.5; -- // julian -> unix return (julian - 2440587.5) * 86400.0 -- -- double dfSeconds = double( milliseconds ) / 1000; -- double dfUnix = 0; -- if(julianday != 0) -- dfUnix = ( double( julianday ) - 2440587.5 ) * 86400.0; -- time_t fullSeconds = static_cast( dfUnix + dfSeconds ); -- return addValue( code, CADVariant( fullSeconds ) ); -+ return addValue( code, CADVariant( julianday, milliseconds ) ); - } - - int CADHeader::getGroupCode( short code ) Property changes on: head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.h =================================================================== --- head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.h (revision 489994) +++ head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.h (nonexistent) @@ -1,17 +0,0 @@ -Obtained from: https://github.com/nextgis-borsch/lib_opencad/commit/f40ce46804f1612fbeb035d0be5a746105cfc17e - ---- ogr/ogrsf_frmts/cad/libopencad/cadheader.h.orig 2017-04-28 16:07:33 UTC -+++ ogr/ogrsf_frmts/cad/libopencad/cadheader.h -@@ -79,10 +79,8 @@ public: - // cppcheck-suppress noExplicitConstructor - CADVariant( const std::string& val ); - // cppcheck-suppress noExplicitConstructor -- CADVariant( time_t val ); --public: -- CADVariant( const CADVariant& orig ); -- CADVariant& operator=( const CADVariant& orig ); -+ CADVariant( long julianday, long milliseconds ); -+ - public: - long getDecimal() const; - double getReal() const; Property changes on: head/graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gdal/files/patch-apps_GNUmakefile =================================================================== --- head/graphics/gdal/files/patch-apps_GNUmakefile (revision 489994) +++ head/graphics/gdal/files/patch-apps_GNUmakefile (revision 489995) @@ -1,13 +1,13 @@ ---- 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) + $(BSD_INSTALL_SCRIPT) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config Index: head/graphics/gdal/files/patch-frmts-mrf-mrf_band.cpp =================================================================== --- head/graphics/gdal/files/patch-frmts-mrf-mrf_band.cpp (revision 489994) +++ head/graphics/gdal/files/patch-frmts-mrf-mrf_band.cpp (revision 489995) @@ -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 $") + Index: head/graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp =================================================================== --- head/graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp (nonexistent) +++ head/graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp (revision 489995) @@ -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; Property changes on: head/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/gdal/pkg-plist =================================================================== --- head/graphics/gdal/pkg-plist (revision 489994) +++ head/graphics/gdal/pkg-plist (revision 489995) @@ -1,199 +1,205 @@ bin/gdal-config bin/gdal_contour bin/gdal_grid bin/gdal_rasterize bin/gdal_translate bin/gdaladdo bin/gdalbuildvrt bin/gdaldem bin/gdalenhance bin/gdalinfo bin/gdallocationinfo bin/gdalmanage bin/gdalserver bin/gdalsrsinfo bin/gdaltindex bin/gdaltransform bin/gdalwarp bin/gnmanalyse bin/gnmmanage bin/nearblack bin/ogr2ogr bin/ogrinfo bin/ogrlineref 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 include/cpl_conv.h include/cpl_cpu_features.h include/cpl_csv.h 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 include/cpl_minizip_unzip.h include/cpl_minizip_zip.h include/cpl_multiproc.h include/cpl_odbc.h include/cpl_port.h include/cpl_progress.h include/cpl_quad_tree.h include/cpl_sha1.h include/cpl_sha256.h include/cpl_spawn.h include/cpl_string.h include/cpl_time.h include/cpl_virtualmem.h include/cpl_vsi.h include/cpl_vsi_error.h include/cpl_vsi_virtual.h include/cpl_vsil_curl_priv.h include/cpl_worker_thread_pool.h include/cplkeywordparser.h include/gdal.h include/gdal_alg.h include/gdal_alg_priv.h include/gdal_csv.h include/gdal_frmts.h include/gdal_mdreader.h include/gdal_pam.h include/gdal_priv.h include/gdal_proxy.h include/gdal_rat.h include/gdal_simplesurf.h include/gdal_utils.h include/gdal_version.h include/gdal_vrt.h include/gdalexif.h include/gdalgeorefpamdataset.h include/gdalgrid.h include/gdalgrid_priv.h include/gdaljp2abstractdataset.h include/gdaljp2metadata.h include/gdaljp2metadatagenerator.h include/gdalpansharpen.h include/gdalsse_priv.h include/gdalwarper.h include/gdalwarpkernel_opencl.h include/gnm.h include/gnm_api.h include/gnm_priv.h include/gnmgraph.h include/gvgcpfit.h include/internal_qhull_headers.h include/memdataset.h include/ogr_api.h include/ogr_core.h include/ogr_feature.h include/ogr_featurestyle.h include/ogr_geocoding.h include/ogr_geometry.h include/ogr_p.h include/ogr_spatialref.h include/ogr_srs_api.h include/ogrsf_frmts.h include/rawdataset.h include/thinplatespline.h include/vrtdataset.h lib/gdalplugins/.keepme lib/libgdal.a lib/libgdal.so lib/libgdal.so.2 lib/libgdal.so.%%PORTVERSION%% libdata/pkgconfig/gdal.pc %%DATADIR%%/GDALLogoBW.svg %%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 %%DATADIR%%/gdal_datum.csv %%DATADIR%%/gdalicon.png %%DATADIR%%/gdalvrt.xsd %%DATADIR%%/geoccs.csv %%DATADIR%%/gml_registry.xml %%DATADIR%%/gmlasconf.xml %%DATADIR%%/gmlasconf.xsd %%DATADIR%%/gt_datum.csv %%DATADIR%%/gt_ellips.csv %%DATADIR%%/header.dxf %%DATADIR%%/inspire_cp_BasicPropertyUnit.gfs %%DATADIR%%/inspire_cp_CadastralBoundary.gfs %%DATADIR%%/inspire_cp_CadastralParcel.gfs %%DATADIR%%/inspire_cp_CadastralZoning.gfs %%DATADIR%%/jpfgdgml_AdmArea.gfs %%DATADIR%%/jpfgdgml_AdmBdry.gfs %%DATADIR%%/jpfgdgml_AdmPt.gfs %%DATADIR%%/jpfgdgml_BldA.gfs %%DATADIR%%/jpfgdgml_BldL.gfs %%DATADIR%%/jpfgdgml_Cntr.gfs %%DATADIR%%/jpfgdgml_CommBdry.gfs %%DATADIR%%/jpfgdgml_CommPt.gfs %%DATADIR%%/jpfgdgml_Cstline.gfs %%DATADIR%%/jpfgdgml_ElevPt.gfs %%DATADIR%%/jpfgdgml_GCP.gfs %%DATADIR%%/jpfgdgml_LeveeEdge.gfs %%DATADIR%%/jpfgdgml_RailCL.gfs %%DATADIR%%/jpfgdgml_RdASL.gfs %%DATADIR%%/jpfgdgml_RdArea.gfs %%DATADIR%%/jpfgdgml_RdCompt.gfs %%DATADIR%%/jpfgdgml_RdEdg.gfs %%DATADIR%%/jpfgdgml_RdMgtBdry.gfs %%DATADIR%%/jpfgdgml_RdSgmtA.gfs %%DATADIR%%/jpfgdgml_RvrMgtBdry.gfs %%DATADIR%%/jpfgdgml_SBAPt.gfs %%DATADIR%%/jpfgdgml_SBArea.gfs %%DATADIR%%/jpfgdgml_SBBdry.gfs %%DATADIR%%/jpfgdgml_WA.gfs %%DATADIR%%/jpfgdgml_WL.gfs %%DATADIR%%/jpfgdgml_WStrA.gfs %%DATADIR%%/jpfgdgml_WStrL.gfs %%DATADIR%%/netcdf_config.xsd %%DATADIR%%/nitf_spec.xml %%DATADIR%%/nitf_spec.xsd %%DATADIR%%/ogrvrt.xsd %%DATADIR%%/osmconf.ini %%DATADIR%%/ozi_datum.csv %%DATADIR%%/ozi_ellips.csv %%DATADIR%%/pci_datum.txt %%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 %%DATADIR%%/ruian_vf_ob_v1.gfs %%DATADIR%%/ruian_vf_st_uvoh_v1.gfs %%DATADIR%%/ruian_vf_st_v1.gfs %%DATADIR%%/ruian_vf_v1.gfs %%DATADIR%%/s57agencies.csv %%DATADIR%%/s57attributes.csv %%DATADIR%%/s57expectedinput.csv %%DATADIR%%/s57objectclasses.csv %%DATADIR%%/seed_2d.dgn %%DATADIR%%/seed_3d.dgn %%DATADIR%%/stateplane.csv %%DATADIR%%/trailer.dxf %%DATADIR%%/unit_of_measure.csv %%DATADIR%%/vdv452.xml %%DATADIR%%/vdv452.xsd %%DATADIR%%/vertcs.csv %%DATADIR%%/vertcs.override.csv Index: head/graphics/py-fiona/files/patch-setup.py =================================================================== --- head/graphics/py-fiona/files/patch-setup.py (nonexistent) +++ head/graphics/py-fiona/files/patch-setup.py (revision 489995) @@ -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), Property changes on: head/graphics/py-fiona/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/R-cran-sf/Makefile =================================================================== --- head/math/R-cran-sf/Makefile (revision 489994) +++ head/math/R-cran-sf/Makefile (revision 489995) @@ -1,29 +1,29 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= sf DISTVERSION= 0.7-1 PORTREVISION= 1 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= tota@FreeBSD.org COMMENT= Simple Features for R LICENSE= GPLv2 MIT LICENSE_COMB= dual CRAN_DEPENDS= R-cran-classInt>=0.2.1:devel/R-cran-classInt \ R-cran-DBI>=0.8:databases/R-cran-DBI \ R-cran-magrittr>0:devel/R-cran-magrittr \ R-cran-Rcpp>0:devel/R-cran-Rcpp \ R-cran-units>=0.6.0:math/R-cran-units LIB_DEPENDS= libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libproj.so:graphics/proj BUILD_DEPENDS= ${CRAN_DEPENDS} RUN_DEPENDS= ${CRAN_DEPENDS} -USES= cran:auto-plist,compiles +USES= compiler:c++11-lang cran:auto-plist,compiles .include