Index: head/graphics/gdal/Makefile =================================================================== --- head/graphics/gdal/Makefile (revision 552247) +++ head/graphics/gdal/Makefile (revision 552248) @@ -1,164 +1,163 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 3.1.0 -PORTREVISION= 7 +PORTVERSION= 3.1.3 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Translator library for raster geospatial data formats LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.TXT BUILD_DEPENDS= libgeotiff>=1.5.0:graphics/libgeotiff \ proj>=6:graphics/proj LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \ libgif.so:graphics/giflib \ libjson-c.so:devel/json-c \ libpng.so:graphics/png \ libproj.so:graphics/proj \ libqhull.so.7:math/qhull \ 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 ZSTD OPTIONS_RADIO= PDF OPTIONS_RADIO_PDF= PODOFO POPPLER OPTIONS_DEFAULT=JASPER 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=${PREFIX}/share \ --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-proj=yes \ --with-qhull=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 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=yes 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_WITH= pg 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 @${REINPLACE_CMD} -e 's|getCString()|c_str()|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp # Clean up bundled libraries @${RM} -r ${WRKSRC}/alg/internal_libqhull/ @${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: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/ ${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/ ${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 552247) +++ head/graphics/gdal/distinfo (revision 552248) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588929131 -SHA256 (gdal-3.1.0.tar.xz) = e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda -SIZE (gdal-3.1.0.tar.xz) = 12076312 +TIMESTAMP = 1599924233 +SHA256 (gdal-3.1.3.tar.xz) = 161cf55371a143826f1d76ce566db1f0a666496eeb4371aed78b1642f219d51d +SIZE (gdal-3.1.3.tar.xz) = 12087908 Index: head/graphics/gdal/files/patch-configure =================================================================== --- head/graphics/gdal/files/patch-configure (revision 552247) +++ head/graphics/gdal/files/patch-configure (nonexistent) @@ -1,23 +0,0 @@ -From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Mon, 3 Aug 2020 14:52:25 +0200 -Subject: [PATCH] Unix build: fix detection of minor version number of Poppler - with the new YY.MM.X numbering scheme (fixes #2823) (#2825) - -Authored-by: @chris2553 - -https://github.com/OSGeo/gdal/commit/2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6.patch - ---- configure 2020-08-17 13:00:41.028145000 -0600 -+++ configure 2020-08-17 13:00:54.784398000 -0600 -@@ -40695,8 +40683,8 @@ - fi - if test "$POPPLER_VERSION" != ""; then - HAVE_POPPLER=yes -- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'` -- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'` -+ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` -+ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` - POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` - fi - else Property changes on: head/graphics/gdal/files/patch-configure ___________________________________________________________________ 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 552247) +++ head/graphics/gdal/files/patch-apps_GNUmakefile (nonexistent) @@ -1,13 +0,0 @@ ---- 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_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 - Property changes on: head/graphics/gdal/files/patch-apps_GNUmakefile ___________________________________________________________________ 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-frmts-jpeg2000-jpeg2000dataset.cpp =================================================================== --- head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp (revision 552247) +++ head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp (nonexistent) @@ -1,22 +0,0 @@ -Obtained from: https://github.com/OSGeo/gdal/commit/ab72c4893e6d14d488dfed25745d79f11bee45b9 - ---- frmts/jpeg2000/jpeg2000dataset.cpp.orig 2020-05-04 09:21:31 UTC -+++ frmts/jpeg2000/jpeg2000dataset.cpp -@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage() - /* the JP2 boxes match the ones of the code stream */ - if (nBands != 0) - { -- if (nBands != jas_image_numcmpts( psImage )) -+ if (nBands != static_cast(jas_image_numcmpts( psImage ))) - { - CPLError(CE_Failure, CPLE_AppDefined, - "The number of components indicated in the IHDR box (%d) mismatch " -@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poO - - { - int iFormat; -- char *pszFormatName = nullptr; -+ const char *pszFormatName = nullptr; - - if (!Identify(poOpenInfo)) - return nullptr; Property changes on: head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.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-apps-GNUmakefile =================================================================== --- head/graphics/gdal/files/patch-apps-GNUmakefile (nonexistent) +++ head/graphics/gdal/files/patch-apps-GNUmakefile (revision 552248) @@ -0,0 +1,13 @@ +--- apps/GNUmakefile.orig 2020-09-01 08:36:31 UTC ++++ apps/GNUmakefile +@@ -232,7 +232,7 @@ gdal-config-inst: gdal-config.in ../GDALmake.opt ./GNU + + + install: default +- for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done +- $(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 + Property changes on: head/graphics/gdal/files/patch-apps-GNUmakefile ___________________________________________________________________ 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/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp =================================================================== --- head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp (revision 552247) +++ head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp (revision 552248) @@ -1,28 +1,11 @@ -Obtained from: https://github.com/OSGeo/gdal/commit/e236eeaed1be45a4af457565085e3db1f2fc489f - ---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2020-05-04 09:21:31 UTC +--- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2020-09-01 08:39:25 UTC +++ frmts/jpeg2000/jpeg2000_vsil_io.cpp -@@ -94,13 +94,23 @@ typedef struct { - * File stream object. - \******************************************************************************/ - -+// PRIjas_seqent macro is defined since Jasper 2.0.17 -+ -+#ifndef PRIjas_seqent - static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt) -+#else -+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt) -+#endif - { - jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); - return static_cast(VSIFReadL(buf, 1, cnt, fileobj->fp)); - } - -+#ifndef PRIjas_seqent +@@ -109,7 +109,7 @@ static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, c + #ifndef PRIjas_seqent static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt) -+#else + #else +-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt) +static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt) -+#endif + #endif { jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); - return static_cast(VSIFWriteL(buf, 1, cnt, fileobj->fp));