geography/gdal-lib: Update to 2.4.3

(Also update py-gdal as it shares the distfile.)

Note that the upgrade to 3.0.x is pending evaluation of impact on
depending packages.

Upstream changes: basically bugfixes.

5 files changed, 9 insertions, 26 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 9d62d693fb8..fb82237c59b 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.117 2019/08/22 12:23:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.118 2019/11/04 17:33:18 gdt Exp $
 
-PKGREVISION=	6
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=	${DISTNAME:S/gdal/gdal-lib/}
 
diff --git a/geography/gdal-lib/Makefile.common b/geography/gdal-lib/Makefile.common
index 992a9151b85..c8174fb354d 100644
--- a/geography/gdal-lib/Makefile.common
+++ b/geography/gdal-lib/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2019/07/16 21:24:47 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2019/11/04 17:33:18 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
-VERSION=	2.4.1
+VERSION=	2.4.3
 DISTNAME=	gdal-${VERSION}
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PKGVERSION_NOREV}/
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 357206b81c1..6cb1ad0162b 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.39 2019/03/22 15:31:11 gdt Exp $
+$NetBSD: distinfo,v 1.40 2019/11/04 17:33:18 gdt Exp $
 
-SHA1 (gdal-2.4.1.tar.gz) = cb5dec7fe1a6b6cae44f520724ef3e8ac290d8bd
-RMD160 (gdal-2.4.1.tar.gz) = cb46f21e808f67110f3198cb827822342b94a50c
-SHA512 (gdal-2.4.1.tar.gz) = b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-Size (gdal-2.4.1.tar.gz) = 14546610 bytes
+SHA1 (gdal-2.4.3.tar.gz) = 82e9b40b78a3272377ca5bff0c2403020e517601
+RMD160 (gdal-2.4.3.tar.gz) = bacc4c800924c210cc75c7b4f623a80eefee3fac
+SHA512 (gdal-2.4.3.tar.gz) = e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
+Size (gdal-2.4.3.tar.gz) = 14726748 bytes
 SHA1 (patch-apps_gdalserver.cpp) = 4a2b8bac29582c8fc02920840ee498026d87acca
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
-SHA1 (patch-ogr_ogrlinestring.cpp) = f42faff9f40bcc554a6a8ffdab7d1ad79a03680a
 SHA1 (patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile) = 6a5061b6dd8c3a4fa1ad7c10ddc0b815b41a637d
 SHA1 (patch-port_cpl__conv.cpp) = e0c9d2dac25bc6f69f0af13a2c86ab5f0f521445
diff --git a/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp b/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp
deleted file mode 100644
index 44f5ca0afe0..00000000000
--- a/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ogr_ogrlinestring.cpp,v 1.2 2019/03/22 15:31:11 gdt Exp $
-
-Include required header for std::fabs.  From upstream.
-
---- ogr/ogrlinestring.cpp.orig	2019-03-15 12:35:19.000000000 +0000
-+++ ogr/ogrlinestring.cpp
-@@ -31,6 +31,7 @@
- #include "ogr_geos.h"
- #include "ogr_p.h"
- 
-+#include <cmath>
- #include <cstdlib>
- #include <algorithm>
- #include <limits>
diff --git a/geography/py-gdal/Makefile b/geography/py-gdal/Makefile
index c5982c20d9c..9e38718d556 100644
--- a/geography/py-gdal/Makefile
+++ b/geography/py-gdal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2019/08/22 12:23:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/04 17:33:18 gdt Exp $
 
 #PKGREVISION=	0
-PKGREVISION= 3
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}