geography/gdal*: Update to 3.4.1

Packaging changes:

  Drop patch to visibility define code in port/cpl_conv, because gdal
  builds on NetSBD 9 without it, it had a merge conflict, it is not
  explained in a comment or commit message, and it hasn't been filed
  upstream.

Upstream changes (see NEWS.md for more detail):

* [RFC 81](https://gdal.org/development/rfc/rfc81_coordinate_epoch.html):
  Support for coordinate epochs in geospatial formats.
  Implemented in FlatGeoBuf, GeoPackage, MEM, VRT
* New GDAL drivers:
  - [Zarr](https://gdal.org/drivers/raster/zarr.html):
    read/write support for ZarrV2 (and experimental V3), using 2D classic raster
    API or multidimensional API:
  - [STACIT](https://gdal.org/drivers/raster/stacit.html):
    Spatio-Temporal Asset Catalog Items as virtual mosaics
* Other improvements:
  - number of enhancements in file system operations of /vsigs/
  - NITF: additions to comply with NITF Version 2.1 Commercial Dataset
    Requirements Document (NCDRD)
  - ODBC and PGeo: multiple fixes and improvements
  - SAFE (Sentinel1): multiple improvements related to SLC/calibration (change
    subdataset naming)
  - multidimensional API: caching, and other improvements
* Code linting and security fixes
* Bump of shared lib major version
* Add support for PCRE2 (to replace deprecated PCRE) (#4822)
* MDB driver (Java based) mark as deprecated. Planned for removal for GDAL 3.5.
  ODBC driver is the preferred solution (with up-to-date MDBTools library on
  non-Windows platforms)
* Writing side of Tiger driver deprecated and will be removed in GDAL 3.5
* Remainder: DODS, JPEG2000(Jasper), JPEGLS, MG4LIDAR, FUJIBAS, IDA, INGR and
  vector driver ARCGEN, ArcObjects, CLOUDANT, COUCHDB, DB2, DODS, FME, GEOMEDIA,
  GTM, INGRES, MONGODB, REC, WALK are planned for removal in GDAL 3.5. As well
  as Perl bindings

6 files changed, 10 insertions, 36 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index fdc6f0e74c9..6718d260d5c 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.144 2021/12/08 16:02:06 adam Exp $
+# $NetBSD: Makefile,v 1.145 2022/01/18 16:25:20 gdt Exp $
 
-PKGREVISION= 1
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=	${DISTNAME:S/gdal/gdal-lib/}
 #PKGREVISION=	0
diff --git a/geography/gdal-lib/Makefile.common b/geography/gdal-lib/Makefile.common
index 7f602a66c36..f9eb984b566 100644
--- a/geography/gdal-lib/Makefile.common
+++ b/geography/gdal-lib/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.15 2021/11/08 14:44:26 gdt Exp $
+# $NetBSD: Makefile.common,v 1.16 2022/01/18 16:25:20 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
 # Accomodate testing unreleased versions.
-VERSION_BASE=	3.3.3
+VERSION_BASE=	3.4.1
 #VERSION_RC=	rc1
 VERSION=	${VERSION_BASE}${VERSION_RC}
 DISTNAME=	gdal-${VERSION}
diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST
index e517d7de4e0..badd1494a78 100644
--- a/geography/gdal-lib/PLIST
+++ b/geography/gdal-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2021/03/01 19:07:51 gdt Exp $
+@comment $NetBSD: PLIST,v 1.20 2022/01/18 16:25:20 gdt Exp $
 @pkgdir lib/gdalplugins
 bin/gdal-config
 bin/gdal_contour
@@ -27,9 +27,9 @@ bin/ogr2ogr
 bin/ogrinfo
 bin/ogrlineref
 bin/ogrtindex
-bin/testepsg
 include/cpl_atomic_ops.h
 include/cpl_auto_close.h
+include/cpl_compressor.h
 include/cpl_config.h
 include/cpl_config_extras.h
 include/cpl_conv.h
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 05aa6ee2b1c..d4db3fcf8d8 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.51 2021/11/08 14:44:26 gdt Exp $
+$NetBSD: distinfo,v 1.52 2022/01/18 16:25:20 gdt Exp $
 
-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
+BLAKE2s (gdal-3.4.1.tar.xz) = 311ed449eddfa90c494fad56e7faeb93689f10ccc133f603cae6a3225875c44a
+SHA512 (gdal-3.4.1.tar.xz) = a66362996f255cb75116693b4ee398337ec8b9699b5cd7fed90105f72832faa20750b77ebbc3e8d59ab72a23b35c4e4e78513cc803bd93e1b7846711ccfb5bff
+Size (gdal-3.4.1.tar.xz) = 13257288 bytes
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
-SHA1 (patch-port_cpl__conv.cpp) = bd77ae1b4cf1bed41be4b8189391156fdc68f57d
diff --git a/geography/gdal-lib/patches/patch-port_cpl__conv.cpp b/geography/gdal-lib/patches/patch-port_cpl__conv.cpp
deleted file mode 100644
index b9ca994a8f4..00000000000
--- a/geography/gdal-lib/patches/patch-port_cpl__conv.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-port_cpl__conv.cpp,v 1.4 2021/09/08 22:48:13 gdt Exp $
-
-Avoid visibility define that masks usage that is apparently beyond XOPEN or C99.
-
-Not yet sent upstream.
-
---- port/cpl_conv.cpp.orig	2020-01-08 11:49:05.000000000 +0000
-+++ port/cpl_conv.cpp
-@@ -38,14 +38,7 @@
- #define _XOPEN_SOURCE 600
- #endif
- #else
--#ifdef _XOPEN_SOURCE
--#undef _XOPEN_SOURCE
- #endif
--#define _XOPEN_SOURCE 700
--#endif
--
--// For atoll (at least for NetBSD)
--#define _ISOC99_SOURCE
- 
- #ifdef MSVC_USE_VLD
- #include <vld.h>
diff --git a/geography/py-gdal/Makefile b/geography/py-gdal/Makefile
index d832a68863f..051e0609aca 100644
--- a/geography/py-gdal/Makefile
+++ b/geography/py-gdal/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.41 2021/12/30 13:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.42 2022/01/18 16:25:20 gdt Exp $
 
-PKGREVISION= 1
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 #PKGREVISION=	0