geography/gdal: Update to 3.3.3

Upstream changes: bug fixes

5 files changed, 10 insertions, 34 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index e2795b3f2bb..49f3ff2afab 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.142 2021/10/21 00:28:05 gdt Exp $
+# $NetBSD: Makefile,v 1.143 2021/11/08 14:44:26 gdt Exp $
 
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=	${DISTNAME:S/gdal/gdal-lib/}
-PKGREVISION=	2
+#PKGREVISION=	0
 
 COMMENT=	Translator library for raster geospatial data formats
 
diff --git a/geography/gdal-lib/Makefile.common b/geography/gdal-lib/Makefile.common
index 2b6f1ee1978..7f602a66c36 100644
--- a/geography/gdal-lib/Makefile.common
+++ b/geography/gdal-lib/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.14 2021/09/08 22:48:13 gdt Exp $
+# $NetBSD: Makefile.common,v 1.15 2021/11/08 14:44:26 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
 # Accomodate testing unreleased versions.
-VERSION_BASE=	3.3.2
+VERSION_BASE=	3.3.3
 #VERSION_RC=	rc1
 VERSION=	${VERSION_BASE}${VERSION_RC}
 DISTNAME=	gdal-${VERSION}
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 7917573a652..05aa6ee2b1c 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.50 2021/10/26 10:45:09 nia Exp $
+$NetBSD: distinfo,v 1.51 2021/11/08 14:44:26 gdt Exp $
 
-BLAKE2s (gdal-3.3.2.tar.xz) = adab576231bb50cd95ab7d801236f32513cd08de051de3fccea029679b031892
-SHA512 (gdal-3.3.2.tar.xz) = 24599095a9185b3ca5170609cbcf682756c9d5f4c43343034f89c1cbb237bc943702c167731c926eaacfb0d5385dede21e5c5c4c27bc6c3b3b8ee18d9e8ceee5
-Size (gdal-3.3.2.tar.xz) = 12940900 bytes
+BLAKE2s (gdal-3.3.3.tar.xz) = 550ab58c940e43d2e7c6703359fe8394b56657e0fcd4f7852ef03fe0d290bbe5
+SHA512 (gdal-3.3.3.tar.xz) = ef67df029a6051f05872cec58d6f5822a64fa5b130de65acf5c5544856eb92e074574abb840ac540cc8473998e80038fd5e760e3737167e4f507fd3a1df30031
+Size (gdal-3.3.3.tar.xz) = 12946356 bytes
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
-SHA1 (patch-gcore_gdalopeninfo.cpp) = 1650dd183a97e8b14004349974e08be136363c03
 SHA1 (patch-port_cpl__conv.cpp) = bd77ae1b4cf1bed41be4b8189391156fdc68f57d
diff --git a/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp b/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp
deleted file mode 100644
index 11d9aba9d58..00000000000
--- a/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-gcore_gdalopeninfo.cpp,v 1.1 2021/09/08 22:48:13 gdt Exp $
-
-Upstream code assumes that fopen(dir, 'r') will fail, when POSIX requires
-it to succeed.  Extend the "only on FreeBSD" conditional to all systems.
-
-Fixed differently upstream post 3.3.2 after discussion.
-
---- gcore/gdalopeninfo.cpp.orig	2021-09-01 09:48:45.000000000 +0000
-+++ gcore/gdalopeninfo.cpp
-@@ -213,12 +213,8 @@ retry:  // TODO(schwehr): Stop using got
- 
- #endif  // HAVE_READLINK
- 
--#ifdef __FreeBSD__
--    /* FreeBSD 8 oddity: fopen(a_directory, "rb") returns non NULL */
-+    /* fopen(dir, "r") is required to succeed, per POSIX */
-     bool bPotentialDirectory = (eAccess == GA_ReadOnly);
--#else
--    bool bPotentialDirectory = false;
--#endif  // __FreeBDS__
- 
-     /* Check if the filename might be a directory of a special virtual file system */
-     if( STARTS_WITH(pszFilename, "/vsizip/") ||
diff --git a/geography/py-gdal/Makefile b/geography/py-gdal/Makefile
index 193f452b199..0188e963935 100644
--- a/geography/py-gdal/Makefile
+++ b/geography/py-gdal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2021/10/21 00:28:05 gdt Exp $
+# $NetBSD: Makefile,v 1.39 2021/11/08 14:44:26 gdt Exp $
 
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
+#PKGREVISION=	0
 
 COMMENT=	Translator library for raster geospatial data formats, Python binding