Index: graphics/gdal/Makefile =================================================================== --- graphics/gdal/Makefile (revision 488871) +++ graphics/gdal/Makefile (working copy) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 2.2.4 -PORTREVISION= 1 +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 @@ -22,16 +20,10 @@ 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 -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-lib gmake iconv jpeg localbase pkgconfig ssl tar:xz +USE_CXXSTD= c++11 +USE_LDCONFIG= yes -CFLAGS+= -fPIC CONFIGURE_ARGS= --datadir=${DATADIR} \ --enable-static=yes \ --with-geotiff=yes \ @@ -48,16 +40,40 @@ --without-libtool \ ${ICONV_CONFIGURE_ARG} GNU_CONFIGURE= yes +CFLAGS+= -fPIC LDFLAGS+= ${ICONV_LIB} MAKE_JOBS_UNSAFE= yes MAKEFILE= GNUmakefile -USE_LDCONFIG= yes -USES= gmake iconv jpeg localbase tar:xz +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 ZSTD +OPTIONS_DEFAULT=JASPER +OPTIONS_RADIO= PDF +OPTIONS_RADIO_PDF= PODOFO POPPLER +OPTIONS_SUB= yes +PCRE_DESC= Regular expression support for SQLite + 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_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 @@ @${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}/ Index: graphics/gdal/distinfo =================================================================== --- graphics/gdal/distinfo (revision 488871) +++ graphics/gdal/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521659854 -SHA256 (gdal-2.2.4.tar.xz) = 441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278 -SIZE (gdal-2.2.4.tar.xz) = 8255840 +TIMESTAMP = 1546347714 +SHA256 (gdal-2.4.0.tar.xz) = c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27 +SIZE (gdal-2.4.0.tar.xz) = 8874628 Index: graphics/gdal/files/patch-apps_GNUmakefile =================================================================== --- graphics/gdal/files/patch-apps_GNUmakefile (revision 488871) +++ graphics/gdal/files/patch-apps_GNUmakefile (working copy) @@ -1,4 +1,4 @@ ---- 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 @@ -5,7 +5,7 @@ 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) Index: graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp =================================================================== --- graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp (nonexistent) +++ graphics/gdal/files/patch-frmts-pdf-pdfdataset.cpp (working copy) @@ -0,0 +1,20 @@ +--- frmts/pdf/pdfdataset.cpp.orig 2018-12-14 22:37:15.000000000 +0100 ++++ frmts/pdf/pdfdataset.cpp 2019-01-01 18:27:35.072882000 +0100 +@@ -3459,7 +3459,7 @@ + #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 @@ + 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* 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: graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ 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: graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.cpp =================================================================== --- graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.cpp (revision 488871) +++ 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: 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: graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.h =================================================================== --- graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-cadheader.h (revision 488871) +++ 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: 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: graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-opencad.h =================================================================== --- graphics/gdal/files/patch-ogr-ogrsf_frmts-cad-libopencad-opencad.h (revision 488871) +++ 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: 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: graphics/gdal/pkg-plist =================================================================== --- graphics/gdal/pkg-plist (revision 488871) +++ graphics/gdal/pkg-plist (working copy) @@ -25,6 +25,7 @@ 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_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,6 +114,7 @@ %%DATADIR%%/GDALLogoColor.svg %%DATADIR%%/GDALLogoGS.svg %%DATADIR%%/GDALmake.opt +%%DATADIR%%/bag_template.xml %%DATADIR%%/compdcs.csv %%DATADIR%%/coordinate_axis.csv %%DATADIR%%/cubewerx_extra.wkt @@ -118,10 +121,12 @@ %%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 @@ %%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 Index: graphics/p5-Geo-GDAL/Makefile =================================================================== --- graphics/p5-Geo-GDAL/Makefile (revision 488871) +++ graphics/p5-Geo-GDAL/Makefile (working copy) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= Geo-GDAL -PORTVERSION= 2.2.4 +PORTVERSION= 2.4.0 CATEGORIES= graphics perl5 MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ - ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ LOCAL/sunpoet PKGNAMEPREFIX= p5- DISTNAME= gdal-${PORTVERSION} @@ -19,15 +18,19 @@ BUILD_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny LIB_DEPENDS= libgdal.so:graphics/gdal -USES= perl5 tar:xz +USES= compiler:c++11-lib perl5 tar:xz +USE_CXXSTD= c++11 WRKSRC_SUBDIR= swig/perl post-patch: @${LN} -s ${LOCALBASE}/bin/gdal-config ${WRKSRC}/../../apps/gdal-config @${REINPLACE_CMD} -e 's| INSTALL_BASE=.*||; s| install| pure_install|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|(const char \*)""|(char \*)""|' ${WRKSRC}/gdal_wrap.cpp ${WRKSRC}/ogr_wrap.cpp +# GDALmake.opt is not available until configure phase +post-configure: + @${SED} -e '/^GDAL_ROOT/d' ${LOCALBASE}/share/gdal/GDALmake.opt > ${WRKSRC}/../../GDALmake.opt + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/GDAL/Const/Const.so ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/*/*.so Index: graphics/p5-Geo-GDAL/distinfo =================================================================== --- graphics/p5-Geo-GDAL/distinfo (revision 488871) +++ graphics/p5-Geo-GDAL/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521659854 -SHA256 (gdal-2.2.4.tar.xz) = 441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278 -SIZE (gdal-2.2.4.tar.xz) = 8255840 +TIMESTAMP = 1546353726 +SHA256 (gdal-2.4.0.tar.xz) = c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27 +SIZE (gdal-2.4.0.tar.xz) = 8874628 Index: graphics/py-gdal/Makefile =================================================================== --- graphics/py-gdal/Makefile (revision 488871) +++ graphics/py-gdal/Makefile (working copy) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 2.2.4 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= graphics python MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ - ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ LOCAL/sunpoet PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,9 +19,10 @@ OPTIONS_DEFINE= NUMPY NUMPY_DESC= Enable array support via NumPy +USES= compiler:c++11-lib python shebangfix tar:xz USE_PYTHON= autoplist concurrent distutils -USES= python shebangfix tar:xz +USE_CXXSTD= c++11 WRKSRC_SUBDIR= swig/python SHEBANG_FILES= scripts/*.py @@ -33,7 +32,6 @@ NUMPY_USES= fortran post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.py ${STAGEDIR}${PREFIX}/bin/ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/osgeo/*.so .include Index: graphics/py-gdal/distinfo =================================================================== --- graphics/py-gdal/distinfo (revision 488871) +++ graphics/py-gdal/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521659854 -SHA256 (gdal-2.2.4.tar.xz) = 441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278 -SIZE (gdal-2.2.4.tar.xz) = 8255840 +TIMESTAMP = 1546353451 +SHA256 (gdal-2.4.0.tar.xz) = c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27 +SIZE (gdal-2.4.0.tar.xz) = 8874628 Index: graphics/py-gdal/pkg-plist =================================================================== --- graphics/py-gdal/pkg-plist (revision 488871) +++ graphics/py-gdal/pkg-plist (nonexistent) @@ -1,25 +0,0 @@ -bin/epsg_tr.py -bin/esri2wkt.py -bin/gcps2vec.py -bin/gcps2wld.py -bin/gdal2tiles.py -bin/gdal2xyz.py -bin/gdal_auth.py -bin/gdal_calc.py -bin/gdal_edit.py -bin/gdal_fillnodata.py -bin/gdal_merge.py -bin/gdal_pansharpen.py -bin/gdal_polygonize.py -bin/gdal_proximity.py -bin/gdal_retile.py -bin/gdal_sieve.py -bin/gdalchksum.py -bin/gdalcompare.py -bin/gdalident.py -bin/gdalimport.py -bin/gdalmove.py -bin/mkgraticule.py -bin/ogrmerge.py -bin/pct2rgb.py -bin/rgb2pct.py Property changes on: graphics/py-gdal/pkg-plist ___________________________________________________________________ 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