Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jan 2023 13:06:42 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9e2785e50008 - main - graphics/gdal: Update to 3.6.2
Message-ID:  <202301301306.30UD6giG054065@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e2785e50008f9e9a4d48305a7ec79c833c81bf5

commit 9e2785e50008f9e9a4d48305a7ec79c833c81bf5
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-01-30 12:29:12 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-01-30 12:59:15 +0000

    graphics/gdal: Update to 3.6.2
    
    - Remove SLAVEDIRS
    - Update WWW and clean up pkg-descr
    
    Changes:        https://github.com/OSGeo/gdal/releases
                    https://github.com/OSGeo/gdal/blob/release/3.6/NEWS.md
---
 graphics/gdal/Makefile                             | 179 +++++++++++----------
 graphics/gdal/distinfo                             |   6 +-
 graphics/gdal/files/patch-GDALmake.opt.in          |  11 --
 graphics/gdal/files/patch-GNUmakefile              |  30 ----
 graphics/gdal/files/patch-apps-GNUmakefile         |  13 --
 graphics/gdal/files/patch-configure                |  57 -------
 graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp  |  20 ---
 .../gdal/files/patch-frmts_exr_openexr__headers.h  |  18 ---
 graphics/gdal/pkg-descr                            |   2 -
 graphics/gdal/pkg-plist                            |  93 ++++++++++-
 10 files changed, 189 insertions(+), 240 deletions(-)

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index c93b6ddf2ac7..34e7ff917a96 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	gdal
-PORTVERSION=	3.5.3
-PORTREVISION=	2
+PORTVERSION=	3.6.2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
-WWW=		https://gdal.org/
+WWW=		https://gdal.org/ \
+		https://github.com/OSGeo/gdal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
@@ -20,43 +20,72 @@ LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
+		libshp.so:devel/shapelib \
 		libtiff.so:graphics/tiff
 
-USES=		compiler:c++17-lang cpe gmake iconv jpeg localbase pkgconfig ssl tar:xz
+USES=		cmake compiler:c++17-lang cpe iconv jpeg localbase pkgconfig ssl tar:xz
 
-CFLAGS+=	-fPIC
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
-		--enable-static=yes \
-		--with-cpp14 \
-		--with-crypto=yes \
-		--with-geotiff=yes \
-		--with-gif=yes \
-		--with-gnm=yes \
-		--with-jpeg=yes \
-		--with-libjson-c=yes \
-		--with-liblzma=yes \
-		--with-libtiff=yes \
-		--with-libz=/usr \
-		--with-msg=no \
-		--with-pcidsk=internal \
-		--with-pcraster=internal \
-		--with-png=yes \
-		--with-proj=yes \
-		--with-qhull=yes \
-		--with-threads=yes \
-		--without-jpeg12 \
-		--without-libtool \
-		${ICONV_CONFIGURE_ARG}
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${WRKSRC} ${ICONV_LIB}
-MAKEFILE=	GNUmakefile
+CMAKE_OFF=	BUILD_CSHARP_BINDINGS \
+		BUILD_DOCS \
+		BUILD_JAVA_BINDINGS \
+		BUILD_PYTHON_BINDINGS \
+		BUILD_TESTING \
+		CLANG_TIDY_ENABLED \
+		CSHARP_MONO \
+		GDAL_BUILD_OPTIONAL_DRIVERS \
+		GDAL_SET_INSTALL_RELATIVE_RPATH \
+		GDAL_USE_INTERNAL_LIBS \
+		GDAL_USE_GEOTIFF_INTERNAL \
+		GDAL_USE_GIF_INTERNAL \
+		GDAL_USE_JPEG12_INTERNAL \
+		GDAL_USE_JPEG_INTERNAL \
+		GDAL_USE_JSONC_INTERNAL \
+		GDAL_USE_LERC_INTERNAL \
+		GDAL_USE_LIBCSF_INTERNAL \
+		GDAL_USE_OPENCAD \
+		GDAL_USE_OPENCAD_INTERNAL \
+		GDAL_USE_PNG_INTERNAL \
+		GDAL_USE_POSTGRESQL \
+		GDAL_USE_PUBLICDECOMPWT \
+		GDAL_USE_QHULL_INTERNAL \
+		GDAL_USE_SHAPELIB_INTERNAL \
+		GDAL_USE_TIFF_INTERNAL \
+		GDAL_USE_ZLIB_INTERNAL \
+		HDFS_ENABLED \
+		OGR_BUILD_OPTIONAL_DRIVERS \
+		SWIG_REGENERATE_PYTHON
+CMAKE_ON=	BUILD_APPS \
+		BUILD_SHARED_LIBS \
+		BUILD_STATIC_LIBS \
+		ENABLE_GNM \
+		ENABLE_IPO \
+		ENABLE_PAM \
+		GDAL_ENABLE_PLUGINS \
+		GDAL_HIDE_INTERNAL_SYMBOLS \
+		GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE \
+		GDAL_SPLIT_EXPORTED_LIBS \
+		GDAL_USE_EXTERNAL_LIBS \
+		GDAL_USE_GEOTIFF \
+		GDAL_USE_GIF \
+		GDAL_USE_ICONV \
+		GDAL_USE_JPEG \
+		GDAL_USE_JPEG12 \
+		GDAL_USE_JSONC \
+		GDAL_USE_LIBCSF \
+		GDAL_USE_LIBLZMA \
+		GDAL_USE_OPENSSL \
+		GDAL_USE_PNG \
+		GDAL_USE_QHULL \
+		GDAL_USE_SHAPELIB \
+		GDAL_USE_TIFF \
+		GDAL_USE_ZLIB \
+		OGR_SQLITE_ALLOW_LOAD_EXTENSIONS \
+		USE_CCACHE
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-SLAVEDIRS=	graphics/py-gdal
-
 CPE_VENDOR=	osgeo
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
@@ -91,89 +120,78 @@ 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_CMAKE_BOOL=	GDAL_USE_ARMADILLO
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
-BRUNSLI_CONFIGURE_WITH=	brunsli
+BRUNSLI_CMAKE_BOOL=	GDAL_USE_BRUNSLI
 BRUNSLI_LIB_DEPENDS=	libbrunslidec-c.so:graphics/brunsli
-CFITSIO_CONFIGURE_WITH=	cfitsio
+CFITSIO_CMAKE_BOOL=	GDAL_USE_CFITSIO
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
-CRYPTOPP_CONFIGURE_OFF=	--with-cryptopp=no
-CRYPTOPP_CONFIGURE_ON=	--with-cryptopp=${LOCALBASE}
+CRYPTOPP_CMAKE_BOOL=	GDAL_USE_CRYPTOPP
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
-CURL_CONFIGURE_OFF=	--with-curl=no
-CURL_CONFIGURE_ON=	--with-curl=${LOCALBASE}/bin/curl-config
+CURL_CMAKE_BOOL=	GDAL_USE_CURL
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-DEFLATE_CONFIGURE_WITH=	libdeflate
+DEFLATE_CMAKE_BOOL=	GDAL_USE_DEFLATE
 DEFLATE_LIB_DEPENDS=	libdeflate.so:archivers/libdeflate
-ECW_CONFIGURE_WITH=	ecw
+ECW_CMAKE_BOOL=		GDAL_USE_ECW
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
-EXPAT_CONFIGURE_WITH=	expat
+EXPAT_CMAKE_BOOL=	GDAL_USE_EXPAT
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
-EXR_CONFIGURE_WITH=	exr
+EXR_CFLAGS=		-DInt64=uint64_t
+EXR_CMAKE_BOOL=		GDAL_USE_EXR
 EXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
-EXR_CFLAGS=		-DInt64=uint64_t
-FREEXL_CONFIGURE_WITH=	freexl
+FREEXL_CMAKE_BOOL=	GDAL_USE_FREEXL
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
-GEOS_CONFIGURE_OFF=	--with-geos=no
-GEOS_CONFIGURE_ON=	--with-geos=${LOCALBASE}/bin/geos-config
+GEOS_CMAKE_BOOL=	GDAL_USE_GEOS
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
-GTA_CONFIGURE_WITH=	gta
+GTA_CMAKE_BOOL=		GDAL_USE_GTA
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
-HDF5_CONFIGURE_WITH=	hdf5
+HDF5_CMAKE_BOOL=	GDAL_USE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
-HEIF_CONFIGURE_WITH=	heif
+HEIF_CMAKE_BOOL=	GDAL_USE_HEIF
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
-KML_CONFIGURE_WITH=	libkml
+KML_CMAKE_BOOL=		GDAL_USE_KML
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
-LERC_CONFIGURE_OFF=	--with-lerc=no
-LERC_CONFIGURE_ON=	--with-lerc=${LOCALBASE}
+LERC_CMAKE_BOOL=	GDAL_USE_LERC
 LERC_LIB_DEPENDS=	libLerc.so:graphics/lerc
-LIBXML2_CONFIGURE_OFF=	--with-xml2=no
-LIBXML2_CONFIGURE_ON=	--with-xml2=yes
+LIBXML2_CMAKE_BOOL=	GDAL_USE_LIBXML2
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
-LZ4_CONFIGURE_OFF=	--with-lz4=no
-LZ4_CONFIGURE_ON=	--with-lz4=yes
+LZ4_CMAKE_BOOL=		GDAL_USE_LZ4
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
-MYSQL_CONFIGURE_OFF=	--with-mysql=no
-MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
+MYSQL_CMAKE_BOOL=	GDAL_USE_MYSQL
 MYSQL_USES=		mysql
-NETCDF_CONFIGURE_WITH=	netcdf
+NETCDF_CMAKE_BOOL=	GDAL_USE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
-ODBC_CONFIGURE_WITH=	odbc
+ODBC_CMAKE_BOOL=	GDAL_USE_ODBC
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
-OPENJPEG_CONFIGURE_WITH=openjpeg
+OPENJPEG_CMAKE_BOOL=	GDAL_USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
-PCRE_CONFIGURE_WITH=	pcre
+PCRE_CMAKE_BOOL=	GDAL_USE_PCRE
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
-PCRE2_CONFIGURE_WITH=	pcre2
+PCRE2_CMAKE_BOOL=	GDAL_USE_PCRE2
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
-PGSQL_CONFIGURE_WITH=	pg
+PGSQL_CMAKE_BOOL=	GDAL_USE_PGSQL
 PGSQL_USES=		pgsql
-PODOFO_CONFIGURE_WITH=	podofo
+PODOFO_CMAKE_BOOL=	GDAL_USE_PODOFO
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
-POPPLER_CONFIGURE_WITH=	poppler=${LOCALBASE}
+POPPLER_CMAKE_BOOL=	GDAL_USE_POPPLER
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
-RASTERLITE2_CONFIGURE_OFF=	--with-rasterlite2=no
-RASTERLITE2_CONFIGURE_ON=	--with-rasterlite2=${LOCALBASE}
+RASTERLITE2_CMAKE_BOOL=	GDAL_USE_RASTERLITE2
 RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2
-SFCGAL_CONFIGURE_OFF=	--with-sfcgal=no
-SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
+SFCGAL_CMAKE_BOOL=	GDAL_USE_SFCGAL
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
-SPATIALITE_CONFIGURE_WITH=	spatialite
+SPATIALITE_CMAKE_BOOL=	GDAL_USE_SPATIALITE
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
-SQLITE_CONFIGURE_WITH=	sqlite3
+SQLITE_CMAKE_BOOL=	GDAL_USE_SQLITE3
 SQLITE_USES=		sqlite
-TILEDB_CONFIGURE_OFF=	--with-tiledb=no
-TILEDB_CONFIGURE_ON=	--with-tiledb=${LOCALBASE}
+TILEDB_CMAKE_BOOL=	GDAL_USE_TILEDB
 TILEDB_LIB_DEPENDS=	libtiledb.so:databases/tiledb
-WEBP_CONFIGURE_WITH=	webp
+WEBP_CMAKE_BOOL=	GDAL_USE_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
-XERCES_CONFIGURE_WITH=	xerces
+XERCES_CMAKE_BOOL=	GDAL_USE_XERCES
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
-ZSTD_CONFIGURE_WITH=	zstd
+ZSTD_CMAKE_BOOL=	GDAL_USE_ZSTD
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
@@ -193,8 +211,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
-	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
+#	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index bc42044d75fb..495e48035055 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669057589
-SHA256 (gdal-3.5.3.tar.xz) = d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
-SIZE (gdal-3.5.3.tar.xz) = 9504740
+TIMESTAMP = 1674589586
+SHA256 (gdal-3.6.2.tar.xz) = 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681
+SIZE (gdal-3.6.2.tar.xz) = 8635724
diff --git a/graphics/gdal/files/patch-GDALmake.opt.in b/graphics/gdal/files/patch-GDALmake.opt.in
deleted file mode 100644
index 7db235d0d961..000000000000
--- a/graphics/gdal/files/patch-GDALmake.opt.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- GDALmake.opt.in.orig	2021-04-27 09:10:56 UTC
-+++ GDALmake.opt.in
-@@ -141,7 +141,7 @@ GDAL_VERSION_REV   =    @GDAL_VERSION_REV@
- GDAL_LIB	= 	$(GDAL_ROOT)/libgdal.a
- GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
--#GDAL_SLIB_SONAME = -Wl,-soname,libgdal.$(SO_EXT).@GDAL_VERSION_MAJOR@
-+GDAL_SLIB_SONAME = -Wl,-soname,libgdal.$(SO_EXT).@GDAL_VERSION_MAJOR@
- 
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
diff --git a/graphics/gdal/files/patch-GNUmakefile b/graphics/gdal/files/patch-GNUmakefile
deleted file mode 100644
index f8e8de1e84da..000000000000
--- a/graphics/gdal/files/patch-GNUmakefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- GNUmakefile.orig	2021-04-27 09:10:56 UTC
-+++ GNUmakefile
-@@ -201,10 +201,10 @@ install-static-lib: static-lib gdal.pc
- 	(cd alg; $(MAKE) install)
- 	(cd ogr; $(MAKE) install)
- 	(cd gnm; $(MAKE) install)
--	for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
-+	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
- 	$(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
--	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
--	$(INSTALL_DATA) gdal.pc $(DESTDIR)$(INST_LIB)/pkgconfig/gdal.pc
-+	$(INSTALL_DIR) $(DESTDIR)$(INST_PREFIX)/libdata/pkgconfig
-+	$(INSTALL_DATA) gdal.pc $(DESTDIR)$(INST_PREFIX)/libdata/pkgconfig/gdal.pc
- 
- install-actions: install-lib
- 	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
-@@ -236,10 +236,10 @@ endif
- ifdef INST_BASH_COMPLETION
- 	(cd scripts; $(MAKE) install)
- endif
--	for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
-+	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
- 	$(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
--	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
--	$(INSTALL_DATA) gdal.pc $(DESTDIR)$(INST_LIB)/pkgconfig/gdal.pc
-+	$(INSTALL_DIR) $(DESTDIR)$(INST_PREFIX)/libdata/pkgconfig
-+	$(INSTALL_DATA) gdal.pc $(DESTDIR)$(INST_PREFIX)/libdata/pkgconfig/gdal.pc
- 
- ifeq ($(HAVE_LIBTOOL),yes)
- 
diff --git a/graphics/gdal/files/patch-apps-GNUmakefile b/graphics/gdal/files/patch-apps-GNUmakefile
deleted file mode 100644
index 7e2e9d8726f8..000000000000
--- a/graphics/gdal/files/patch-apps-GNUmakefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- apps/GNUmakefile.orig	2020-09-01 08:36:31 UTC
-+++ apps/GNUmakefile
-@@ -232,7 +232,7 @@ gdal-config-inst:	gdal-config.in ../GDALmake.opt ./GNU
- 
- 
- install: default
--	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
--	$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
--	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
-+	for f in $(BIN_LIST) ; do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(INST_BIN) ; done
-+	$(BSD_INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
-+	$(BSD_INSTALL_SCRIPT) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
- 
diff --git a/graphics/gdal/files/patch-configure b/graphics/gdal/files/patch-configure
deleted file mode 100644
index 8d4eede12444..000000000000
--- a/graphics/gdal/files/patch-configure
+++ /dev/null
@@ -1,57 +0,0 @@
-% sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure
-
---- configure.orig	2021-06-28 10:57:58 UTC
-+++ configure
-@@ -36537,9 +36537,9 @@ $as_echo "$LIBKML_VERSION" >&6; }
-             libkml_include_dir2="$libkml_prefix/include/kml"
-             libkml_include_dir3="$libkml_prefix/include/kml/third_party/boost_1_34_1"
-             if test "$libkml_prefix" = "/usr"; then
--                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
-+                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
-             else
--                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
-+                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
-             fi
-             run_libkml_test="yes"
-         elif test "$libkml_requested" = "yes"; then
-@@ -42246,13 +42246,13 @@ fi
-     # Test that the package found is for the right architecture
-     saved_LIBS="$LIBS"
-     LIBS="$EXR_LIBS"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImfTiledInputReadTile in -lIlmImf" >&5
--$as_echo_n "checking for ImfTiledInputReadTile in -lIlmImf... " >&6; }
--if ${ac_cv_lib_IlmImf_ImfTiledInputReadTile+:} false; then :
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImfTiledInputReadTile in -lOpenEXR" >&5
-+$as_echo_n "checking for ImfTiledInputReadTile in -lOpenEXR... " >&6; }
-+if ${ac_cv_lib_OpenEXR_ImfTiledInputReadTile+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lIlmImf  $LIBS"
-+LIBS="-lOpenEXR  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -42272,17 +42272,17 @@ return ImfTiledInputReadTile ();
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_IlmImf_ImfTiledInputReadTile=yes
-+  ac_cv_lib_OpenEXR_ImfTiledInputReadTile=yes
- else
--  ac_cv_lib_IlmImf_ImfTiledInputReadTile=no
-+  ac_cv_lib_OpenEXR_ImfTiledInputReadTile=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_IlmImf_ImfTiledInputReadTile" >&5
--$as_echo "$ac_cv_lib_IlmImf_ImfTiledInputReadTile" >&6; }
--if test "x$ac_cv_lib_IlmImf_ImfTiledInputReadTile" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenEXR_ImfTiledInputReadTile" >&5
-+$as_echo "$ac_cv_lib_OpenEXR_ImfTiledInputReadTile" >&6; }
-+if test "x$ac_cv_lib_OpenEXR_ImfTiledInputReadTile" = xyes; then :
-   HAVE_EXR=yes
- else
-   HAVE_EXR=no
diff --git a/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp b/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp
deleted file mode 100644
index c567af323cd9..000000000000
--- a/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- frmts/pdf/pdfobject.cpp.orig	2021-04-27 09:12:27 UTC
-+++ frmts/pdf/pdfobject.cpp
-@@ -1082,7 +1082,7 @@ const CPLString& GDALPDFObjectPoppler::GetString()
-         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
-                                                       static_cast<int>(gooString->getLength())));
- #else
--        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-+        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
-                                                       static_cast<int>(gooString->getLength())));
- #endif
-     }
-@@ -1442,7 +1442,7 @@ static char* GooStringToCharStart(GooString& gstr)
- #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-             const char* srcStr = gstr.c_str();
- #else
--            const char* srcStr = gstr.getCString();
-+            const char* srcStr = gstr.c_str();
- #endif
-             memcpy(pszContent, srcStr, nLength);
-             pszContent[nLength] = '\0';
diff --git a/graphics/gdal/files/patch-frmts_exr_openexr__headers.h b/graphics/gdal/files/patch-frmts_exr_openexr__headers.h
deleted file mode 100644
index f2dc5df43d6c..000000000000
--- a/graphics/gdal/files/patch-frmts_exr_openexr__headers.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- frmts/exr/openexr_headers.h.orig	2021-03-05 04:40:24 UTC
-+++ frmts/exr/openexr_headers.h
-@@ -35,6 +35,7 @@
- #pragma GCC system_header
- #endif
- 
-+#include "ImathInt64.h"
- #include "ImathMatrix.h"
- #include "ImfChannelList.h"
- #include "ImfFloatAttribute.h"
-@@ -42,6 +43,7 @@
- #include "ImfMatrixAttribute.h"
- #include "ImfMultiPartInputFile.h"
- #include "ImfMultiPartOutputFile.h"
-+#include "ImfOutputPart.h"
- #include "ImfPartType.h"
- #include "ImfPreviewImage.h"
- #include "ImfRgbaFile.h"
diff --git a/graphics/gdal/pkg-descr b/graphics/gdal/pkg-descr
index d0f2ebe11b31..46380bc70787 100644
--- a/graphics/gdal/pkg-descr
+++ b/graphics/gdal/pkg-descr
@@ -11,5 +11,3 @@ Mapinfo mid/mif and TAB, GeoTIFF, Erdas Imagine, ESRI .BIL, .aux labelled
 raw, DTED, SDTS DEM, JPEG, PNG and Arc/Info Binary/ASCII Grid.
 
 A full list of supported data formats is available on the official website.
-
-See also: https://github.com/OSGeo/gdal
diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist
index 07999676a2ab..6124b1fef040 100644
--- a/graphics/gdal/pkg-plist
+++ b/graphics/gdal/pkg-plist
@@ -46,7 +46,6 @@ include/cpl_minizip_ioapi.h
 include/cpl_minizip_unzip.h
 include/cpl_minizip_zip.h
 include/cpl_multiproc.h
-include/cpl_odbc.h
 include/cpl_port.h
 include/cpl_progress.h
 include/cpl_quad_tree.h
@@ -102,6 +101,7 @@ include/ogr_featurestyle.h
 include/ogr_geocoding.h
 include/ogr_geometry.h
 include/ogr_p.h
+include/ogr_recordbatch.h
 include/ogr_spatialref.h
 include/ogr_srs_api.h
 include/ogr_swq.h
@@ -109,16 +109,57 @@ include/ogrsf_frmts.h
 include/rawdataset.h
 include/thinplatespline.h
 include/vrtdataset.h
+lib/cmake/gdal/GDAL-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/gdal/GDAL-targets.cmake
+lib/cmake/gdal/GDALConfig.cmake
+lib/cmake/gdal/GDALConfigVersion.cmake
 lib/gdalplugins/drivers.ini
-lib/libgdal.a
 lib/libgdal.so
-lib/libgdal.so.3
-lib/libgdal.so.%%PORTVERSION%%
+lib/libgdal.so.32
+lib/libgdal.so.32.%%PORTVERSION%%
 libdata/pkgconfig/gdal.pc
+share/bash-completion/completions/gdal-config
+share/bash-completion/completions/gdal2tiles.py
+share/bash-completion/completions/gdal2xyz.py
+share/bash-completion/completions/gdal_calc.py
+share/bash-completion/completions/gdal_contour
+share/bash-completion/completions/gdal_create
+share/bash-completion/completions/gdal_edit.py
+share/bash-completion/completions/gdal_fillnodata.py
+share/bash-completion/completions/gdal_grid
+share/bash-completion/completions/gdal_merge.py
+share/bash-completion/completions/gdal_polygonize.py
+share/bash-completion/completions/gdal_proximity.py
+share/bash-completion/completions/gdal_rasterize
+share/bash-completion/completions/gdal_retile.py
+share/bash-completion/completions/gdal_sieve.py
+share/bash-completion/completions/gdal_translate
+share/bash-completion/completions/gdal_viewshed
+share/bash-completion/completions/gdaladdo
+share/bash-completion/completions/gdalbuildvrt
+share/bash-completion/completions/gdalchksum.py
+share/bash-completion/completions/gdalcompare.py
+share/bash-completion/completions/gdaldem
+share/bash-completion/completions/gdalenhance
+share/bash-completion/completions/gdalident.py
+share/bash-completion/completions/gdalimport.py
+share/bash-completion/completions/gdalinfo
+share/bash-completion/completions/gdallocationinfo
+share/bash-completion/completions/gdalmanage
+share/bash-completion/completions/gdalmove.py
+share/bash-completion/completions/gdalsrsinfo
+share/bash-completion/completions/gdaltindex
+share/bash-completion/completions/gdaltransform
+share/bash-completion/completions/gdalwarp
+share/bash-completion/completions/ogr2ogr
+share/bash-completion/completions/ogrinfo
+share/bash-completion/completions/ogrlineref
+share/bash-completion/completions/ogrmerge.py
+share/bash-completion/completions/ogrtindex
 %%DATADIR%%/GDALLogoBW.svg
 %%DATADIR%%/GDALLogoColor.svg
 %%DATADIR%%/GDALLogoGS.svg
-%%DATADIR%%/GDALmake.opt
+%%DATADIR%%/LICENSE.TXT
 %%DATADIR%%/bag_template.xml
 %%DATADIR%%/cubewerx_extra.wkt
 %%DATADIR%%/default.rsc
@@ -261,3 +302,45 @@ libdata/pkgconfig/gdal.pc
 %%DATADIR%%/vdv452.xml
 %%DATADIR%%/vdv452.xsd
 %%DATADIR%%/vicar.json
+share/man/man1/gdal-config.1.gz
+share/man/man1/gdal2tiles.1.gz
+share/man/man1/gdal_calc.1.gz
+share/man/man1/gdal_contour.1.gz
+share/man/man1/gdal_create.1.gz
+share/man/man1/gdal_edit.1.gz
+share/man/man1/gdal_fillnodata.1.gz
+share/man/man1/gdal_grid.1.gz
+share/man/man1/gdal_merge.1.gz
+share/man/man1/gdal_pansharpen.1.gz
+share/man/man1/gdal_polygonize.1.gz
+share/man/man1/gdal_proximity.1.gz
+share/man/man1/gdal_rasterize.1.gz
+share/man/man1/gdal_retile.1.gz
+share/man/man1/gdal_sieve.1.gz
+share/man/man1/gdal_translate.1.gz
+share/man/man1/gdal_viewshed.1.gz
+share/man/man1/gdaladdo.1.gz
+share/man/man1/gdalbuildvrt.1.gz
+share/man/man1/gdalcompare.1.gz
+share/man/man1/gdaldem.1.gz
+share/man/man1/gdalinfo.1.gz
+share/man/man1/gdallocationinfo.1.gz
+share/man/man1/gdalmanage.1.gz
+share/man/man1/gdalmdiminfo.1.gz
+share/man/man1/gdalmdimtranslate.1.gz
+share/man/man1/gdalmove.1.gz
+share/man/man1/gdalsrsinfo.1.gz
+share/man/man1/gdaltindex.1.gz
+share/man/man1/gdaltransform.1.gz
+share/man/man1/gdalwarp.1.gz
+share/man/man1/gnmanalyse.1.gz
+share/man/man1/gnmmanage.1.gz
+share/man/man1/nearblack.1.gz
+share/man/man1/ogr2ogr.1.gz
+share/man/man1/ogr_layer_algebra.1.gz
+share/man/man1/ogrinfo.1.gz
+share/man/man1/ogrlineref.1.gz
+share/man/man1/ogrmerge.1.gz
+share/man/man1/ogrtindex.1.gz
+share/man/man1/pct2rgb.1.gz
+share/man/man1/rgb2pct.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301301306.30UD6giG054065>