3 files changed, 87 insertions, 32 deletions

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 4d8e2b60b346..260f837176cf 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,7 +1,7 @@
 # Created by: Randall Hopper
 
 PORTNAME=	gdal
-PORTVERSION=	3.4.3
+PORTVERSION=	3.5.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
@@ -22,25 +22,6 @@ LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libqhull_r.so:math/qhull \
 		libtiff.so:graphics/tiff
 
-OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CHARLS CRYPTOPP CURL DEFLATE DODS ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF JASPER KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
-OPTIONS_RADIO=	PDF
-OPTIONS_RADIO_PDF=	PODOFO POPPLER
-OPTIONS_DEFAULT=CURL EXPAT FREEXL GEOS JASPER LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
-		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
-OPTIONS_SUB=	yes
-BRUNSLI_DESC=	Brunsli support via libbrunsli library
-CHARLS_DESC=	JPEG-Lossless support via charls
-CRYPTOPP_DESC=	Cryptopp support
-DEFLATE_DESC=	Faster deflate support via libdeflate library
-DODS_DESC=	DODS/OPeNDAP support
-EXR_DESC=	EXR support via OpenEXR library
-HEIF_DESC=	HEIF support via libheif library
-LERC_DESC=	LERC (Limited Error Raster Compression) support
-PCRE_DESC=	Regular expression support for SQLite
-PCRE2_DESC=	Regular expression support for SQLite
-RASTERLITE2_DESC=	RasterLite2 support
-TILEDB_DESC=	TileDB support
-
 USES=		compiler:c++17-lang cpe gmake iconv jpeg localbase pkgconfig ssl tar:xz
 
 CFLAGS+=	-fPIC
@@ -74,7 +55,7 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-SLAVEDIRS=	graphics/p5-Geo-GDAL graphics/py-gdal
+SLAVEDIRS=	graphics/py-gdal
 
 CPE_VENDOR=	osgeo
 
@@ -94,6 +75,23 @@ HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
+OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
+OPTIONS_RADIO=	PDF
+OPTIONS_RADIO_PDF=	PODOFO POPPLER
+OPTIONS_DEFAULT=CURL EXPAT FREEXL GEOS LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
+		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
+OPTIONS_SUB=	yes
+BRUNSLI_DESC=	Brunsli support via libbrunsli library
+CRYPTOPP_DESC=	Cryptopp support
+DEFLATE_DESC=	Faster deflate support via libdeflate library
+EXR_DESC=	EXR support via OpenEXR library
+HEIF_DESC=	HEIF support via libheif library
+LERC_DESC=	LERC (Limited Error Raster Compression) support
+PCRE_DESC=	Regular expression support for SQLite
+PCRE2_DESC=	Regular expression support for SQLite
+RASTERLITE2_DESC=	RasterLite2 support
+TILEDB_DESC=	TileDB support
+
 ARMADILLO_CONFIGURE_OFF=--with-armadillo=no
 ARMADILLO_CONFIGURE_ON=	--with-armadillo=${LOCALBASE}
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
@@ -101,8 +99,6 @@ BRUNSLI_CONFIGURE_WITH=	brunsli
 BRUNSLI_LIB_DEPENDS=	libbrunslidec-c.so:graphics/brunsli
 CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
-CHARLS_CONFIGURE_WITH=	charls
-CHARLS_LIB_DEPENDS=	libcharls.so:graphics/charls
 CRYPTOPP_CONFIGURE_OFF=	--with-cryptopp=no
 CRYPTOPP_CONFIGURE_ON=	--with-cryptopp=${LOCALBASE}
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
@@ -111,9 +107,6 @@ CURL_CONFIGURE_ON=	--with-curl=${LOCALBASE}/bin/curl-config
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DEFLATE_CONFIGURE_WITH=	libdeflate
 DEFLATE_LIB_DEPENDS=	libdeflate.so:archivers/libdeflate
-DODS_CONFIGURE_OFF=	--with-dods-root=no
-DODS_CONFIGURE_ON=	--with-dods-root=${LOCALBASE}
-DODS_LIB_DEPENDS=	libdap.so:devel/libdap
 ECW_CONFIGURE_WITH=	ecw
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CONFIGURE_WITH=	expat
@@ -133,8 +126,6 @@ HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HEIF_CONFIGURE_WITH=	heif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
-JASPER_CONFIGURE_WITH=	jasper
-JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 KML_CONFIGURE_WITH=	libkml
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LERC_CONFIGURE_OFF=	--with-lerc=no
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index 8e288f9e7dad..0c705d36a91b 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652122597
-SHA256 (gdal-3.4.3.tar.xz) = 02a27b35899e1c4c3bcb6007da900128ddd7e8ab7cd6ccfecf338a301eadad5a
-SIZE (gdal-3.4.3.tar.xz) = 13275504
+TIMESTAMP = 1653151052
+SHA256 (gdal-3.5.0.tar.xz) = d49121e5348a51659807be4fb866aa840f8dbec4d1acba6d17fdefa72125bfc9
+SIZE (gdal-3.5.0.tar.xz) = 8826500
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 1313d3a88215..07999676a2ab 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -76,6 +76,7 @@ include/gdal_simplesurf.h
 include/gdal_utils.h
 include/gdal_version.h
 include/gdal_vrt.h
+include/gdalcachedpixelaccessor.h
 include/gdalexif.h
 include/gdalgeorefpamdataset.h
 include/gdalgrid.h
@@ -108,7 +109,7 @@ include/ogrsf_frmts.h
 include/rawdataset.h
 include/thinplatespline.h
 include/vrtdataset.h
-@dir lib/gdalplugins
+lib/gdalplugins/drivers.ini
 lib/libgdal.a
 lib/libgdal.so
 lib/libgdal.so.3
@@ -131,6 +132,69 @@ libdata/pkgconfig/gdal.pc
 %%DATADIR%%/gml_registry.xml
 %%DATADIR%%/gmlasconf.xml
 %%DATADIR%%/gmlasconf.xsd
+%%DATADIR%%/grib2_center.csv
+%%DATADIR%%/grib2_process.csv
+%%DATADIR%%/grib2_subcenter.csv
+%%DATADIR%%/grib2_table_4_2_0_0.csv
+%%DATADIR%%/grib2_table_4_2_0_1.csv
+%%DATADIR%%/grib2_table_4_2_0_13.csv
+%%DATADIR%%/grib2_table_4_2_0_14.csv
+%%DATADIR%%/grib2_table_4_2_0_15.csv
+%%DATADIR%%/grib2_table_4_2_0_16.csv
+%%DATADIR%%/grib2_table_4_2_0_17.csv
+%%DATADIR%%/grib2_table_4_2_0_18.csv
+%%DATADIR%%/grib2_table_4_2_0_19.csv
+%%DATADIR%%/grib2_table_4_2_0_190.csv
+%%DATADIR%%/grib2_table_4_2_0_191.csv
+%%DATADIR%%/grib2_table_4_2_0_2.csv
+%%DATADIR%%/grib2_table_4_2_0_20.csv
+%%DATADIR%%/grib2_table_4_2_0_3.csv
+%%DATADIR%%/grib2_table_4_2_0_4.csv
+%%DATADIR%%/grib2_table_4_2_0_5.csv
+%%DATADIR%%/grib2_table_4_2_0_6.csv
+%%DATADIR%%/grib2_table_4_2_0_7.csv
+%%DATADIR%%/grib2_table_4_2_10_0.csv
+%%DATADIR%%/grib2_table_4_2_10_1.csv
+%%DATADIR%%/grib2_table_4_2_10_191.csv
+%%DATADIR%%/grib2_table_4_2_10_2.csv
+%%DATADIR%%/grib2_table_4_2_10_3.csv
+%%DATADIR%%/grib2_table_4_2_10_4.csv
+%%DATADIR%%/grib2_table_4_2_1_0.csv
+%%DATADIR%%/grib2_table_4_2_1_1.csv
+%%DATADIR%%/grib2_table_4_2_1_2.csv
+%%DATADIR%%/grib2_table_4_2_20_0.csv
+%%DATADIR%%/grib2_table_4_2_20_1.csv
+%%DATADIR%%/grib2_table_4_2_20_2.csv
+%%DATADIR%%/grib2_table_4_2_2_0.csv
+%%DATADIR%%/grib2_table_4_2_2_3.csv
+%%DATADIR%%/grib2_table_4_2_2_4.csv
+%%DATADIR%%/grib2_table_4_2_2_5.csv
+%%DATADIR%%/grib2_table_4_2_3_0.csv
+%%DATADIR%%/grib2_table_4_2_3_1.csv
+%%DATADIR%%/grib2_table_4_2_3_2.csv
+%%DATADIR%%/grib2_table_4_2_3_3.csv
+%%DATADIR%%/grib2_table_4_2_3_4.csv
+%%DATADIR%%/grib2_table_4_2_3_5.csv
+%%DATADIR%%/grib2_table_4_2_3_6.csv
+%%DATADIR%%/grib2_table_4_2_4_0.csv
+%%DATADIR%%/grib2_table_4_2_4_1.csv
+%%DATADIR%%/grib2_table_4_2_4_10.csv
+%%DATADIR%%/grib2_table_4_2_4_2.csv
+%%DATADIR%%/grib2_table_4_2_4_3.csv
+%%DATADIR%%/grib2_table_4_2_4_4.csv
+%%DATADIR%%/grib2_table_4_2_4_5.csv
+%%DATADIR%%/grib2_table_4_2_4_6.csv
+%%DATADIR%%/grib2_table_4_2_4_7.csv
+%%DATADIR%%/grib2_table_4_2_4_8.csv
+%%DATADIR%%/grib2_table_4_2_4_9.csv
+%%DATADIR%%/grib2_table_4_2_local_Canada.csv
+%%DATADIR%%/grib2_table_4_2_local_HPC.csv
+%%DATADIR%%/grib2_table_4_2_local_MRMS.csv
+%%DATADIR%%/grib2_table_4_2_local_NCEP.csv
+%%DATADIR%%/grib2_table_4_2_local_NDFD.csv
+%%DATADIR%%/grib2_table_4_2_local_index.csv
+%%DATADIR%%/grib2_table_4_5.csv
+%%DATADIR%%/grib2_table_versions.csv
 %%DATADIR%%/gt_datum.csv
 %%DATADIR%%/gt_ellips.csv
 %%DATADIR%%/header.dxf