Index: graphics/gdal/Makefile =================================================================== --- graphics/gdal/Makefile (revision 551435) +++ graphics/gdal/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 3.1.0 -PORTREVISION= 6 +PORTVERSION= 3.1.3 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet Index: graphics/gdal/distinfo =================================================================== --- graphics/gdal/distinfo (revision 551435) +++ graphics/gdal/distinfo (working copy) @@ -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: graphics/gdal/files/patch-configure =================================================================== --- graphics/gdal/files/patch-configure (revision 551435) +++ 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: 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: graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp =================================================================== --- graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp (revision 551435) +++ graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp (working copy) @@ -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)); Index: graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp =================================================================== --- graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp (revision 551435) +++ 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: 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: graphics/p5-Geo-GDAL/Makefile =================================================================== --- graphics/p5-Geo-GDAL/Makefile (revision 551435) +++ graphics/p5-Geo-GDAL/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Geo-GDAL -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.3 CATEGORIES= graphics perl5 MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet Index: graphics/p5-Geo-GDAL/distinfo =================================================================== --- graphics/p5-Geo-GDAL/distinfo (revision 551435) +++ graphics/p5-Geo-GDAL/distinfo (working copy) @@ -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: graphics/py-gdal/Makefile =================================================================== --- graphics/py-gdal/Makefile (revision 551435) +++ graphics/py-gdal/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.3 CATEGORIES= graphics python MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet Index: graphics/py-gdal/distinfo =================================================================== --- graphics/py-gdal/distinfo (revision 551435) +++ graphics/py-gdal/distinfo (working copy) @@ -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