Update to gdal 2.4.1.

See https://trac.osgeo.org/gdal/wiki/Release/2.4.1-News
Partially convert to MODPY_PYTEST, except the do-test target is still
needed as tests need to be run from within the tests dir.

geo/gdal/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.74 2019/02/13 12:46:41 landry Exp $
+# $OpenBSD: Makefile,v 1.75 2019/03/26 06:39:00 landry Exp $
 
 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
 COMMENT-perl =	perl bindings for GDAL
 
-V =		2.4.0
+V =		2.4.1
 DISTNAME =	gdal-${V}
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 		gdalautotest-${V}${EXTRACT_SUFX}
@@ -15,7 +15,6 @@ FULLPKGNAME-python =	py-${DISTNAME}
 FULLPKGPATH-python =	geo/gdal,-python${FLAVOR_EXT:S/-/,/g}
 FULLPKGNAME-perl =	p5-Geo-GDAL-${V}
 FULLPKGPATH-perl =	geo/gdal,-perl
-REVISION-python = 0
 
 SHARED_LIBS =	gdal 34.0 #25.0
 CATEGORIES =	geo devel
@@ -81,8 +80,8 @@ WANTLIB-perl += pq pthread qhull spatialite sqlite3 ssl tiff xml2 webp z zstd
 
 BUILD_DEPENDS +=	${RUN_DEPENDS} math/py-numpy${MODPY_FLAVOR} devel/swig
 
-TEST_DEPENDS +=		devel/py-test${MODPY_FLAVOR} \
-			${FULLPKGNAME-python}:${FULLPKGPATH-python}
+MODPY_PYTEST =		Yes
+TEST_DEPENDS +=		${FULLPKGNAME-python}:${FULLPKGPATH-python}
 TEST_ENV =		GDAL_DOWNLOAD_TEST_DATA=1 GDAL_RUN_SLOW_TESTS=yes
 
 MODPY_SETUPTOOLS =	Yes
@@ -148,5 +147,7 @@ post-install:
 
 do-test:
 	cd ${WRKSRC}/autotest && env ${TEST_ENV} ${MODPY_BIN} -m pytest
+#	doesnt work, pytest needs to be run from within the tests dir
+#	${MODPY_TEST_TARGET}
 
 .include <bsd.port.mk>

geo/gdal/distinfo

@@ -1,4 +1,4 @@
-SHA256 (gdal-2.4.0.tar.gz) = pWjPPce7IDrhKkjh6ypCMCze1Jnvbsyvno8JGH2M51o=
-SHA256 (gdalautotest-2.4.0.tar.gz) = 6mImRbX3kcWwrO9SjqRvV00QRfHNBier2AAf+PdShpI=
-SIZE (gdal-2.4.0.tar.gz) = 14533664
-SIZE (gdalautotest-2.4.0.tar.gz) = 30187520
+SHA256 (gdal-2.4.1.tar.gz) = 8aEdGYIgW55MwQ4W8BalVZv8n6mp6mkBXpnM1qc46kw=
+SHA256 (gdalautotest-2.4.1.tar.gz) = znCAd5LzX2bw89+g4tQQcb+EXZtlzr2XJ5Ygz5CjBgM=
+SIZE (gdal-2.4.1.tar.gz) = 14546610
+SIZE (gdalautotest-2.4.1.tar.gz) = 30218240

geo/gdal/patches/patch-port_cpl_vsisimple_cpp

@@ -1,16 +0,0 @@
-$OpenBSD: patch-port_cpl_vsisimple_cpp,v 1.1 2018/12/28 08:53:59 landry Exp $
-
-https://github.com/OSGeo/gdal/issues/1163
-
-Index: port/cpl_vsisimple.cpp
---- port/cpl_vsisimple.cpp.orig
-+++ port/cpl_vsisimple.cpp
-@@ -1466,7 +1466,7 @@ GIntBig CPLGetUsablePhysicalRAM( void )
- #endif
- #if HAVE_GETRLIMIT
-     struct rlimit sLimit;
--    if( getrlimit( RLIMIT_AS, &sLimit) == 0 &&
-+    if( getrlimit( RLIMIT_DATA, &sLimit) == 0 &&
-         sLimit.rlim_cur != RLIM_INFINITY &&
-         static_cast<GIntBig>(sLimit.rlim_cur) < nRAM )
-     {