CVS commit: pkgsrc/geography

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Jul 11 16:08:52 UTC 2025

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile.common PLIST distinfo
        pkgsrc/geography/py-gdal: Makefile

Log Message:
geography/gdal*: Update to 3.11.2

packaging changes: make PLIST more resilient to testing RCs by using
variables that match what is produced.  (These changes are not
important for releases and do not affect the resulting package.)

Upstream NEWS: GDAL 3.11.2 is a bugfix release.
[there are 87 lines of descriptions of bugfixes!]


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/geography/gdal-lib/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/geography/gdal-lib/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r1.88 -r1.89 pkgsrc/geography/py-gdal/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gdal-lib/Makefile.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.36 pkgsrc/geography/gdal-lib/Makefile.common:1.37
--- pkgsrc/geography/gdal-lib/Makefile.common:1.36      Wed Jul  2 15:25:17 2025
+++ pkgsrc/geography/gdal-lib/Makefile.common   Fri Jul 11 16:08:51 2025
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.36 2025/07/02 15:25:17 gdt Exp $
+# $NetBSD: Makefile.common,v 1.37 2025/07/11 16:08:51 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
-VERSION_BASE=  3.11.1
+VERSION_BASE=  3.11.2
 PLIST_SUBST+=  VERSION_BASE=${VERSION_BASE}
 # Accomodate testing unreleased versions.
-#VERSION_RC=   rc1
+#VERSION_RC=   rc2
 #VERSION_BETA=
 VERSION=       ${VERSION_BASE}${VERSION_RC}${VERSION_BETA}
 DISTNAME=      gdal-${VERSION}
@@ -21,6 +21,8 @@ LICENSE=      mit
 
 WRKSRC=                ${WRKDIR}/gdal-${VERSION_BASE}${VERSION_BETA}
 
+PLIST_SUBST+=  VERSION_BASE=${VERSION_BASE}
+
 PATCHDIR=      ${.CURDIR}/../../geography/gdal-lib/patches
 DISTINFO_FILE= ${.CURDIR}/../../geography/gdal-lib/distinfo
 

Index: pkgsrc/geography/gdal-lib/PLIST
diff -u pkgsrc/geography/gdal-lib/PLIST:1.29 pkgsrc/geography/gdal-lib/PLIST:1.30
--- pkgsrc/geography/gdal-lib/PLIST:1.29        Fri May 23 10:02:39 2025
+++ pkgsrc/geography/gdal-lib/PLIST     Fri Jul 11 16:08:51 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2025/05/23 10:02:39 nia Exp $
+@comment $NetBSD: PLIST,v 1.30 2025/07/11 16:08:51 gdt Exp $
 bin/gdal
 bin/gdal-config
 bin/gdal_contour
@@ -111,7 +111,7 @@ lib/cmake/gdal/GDALConfigVersion.cmake
 lib/gdalplugins/drivers.ini
 lib/libgdal.so
 lib/libgdal.so.37
-lib/libgdal.so.37.${PKGVERSION}
+lib/libgdal.so.37.${VERSION_BASE}
 lib/pkgconfig/gdal.pc
 man/man1/gdal-config.1
 man/man1/gdal-convert.1

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.73 pkgsrc/geography/gdal-lib/distinfo:1.74
--- pkgsrc/geography/gdal-lib/distinfo:1.73     Wed Jul  2 15:25:17 2025
+++ pkgsrc/geography/gdal-lib/distinfo  Fri Jul 11 16:08:51 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.73 2025/07/02 15:25:17 gdt Exp $
+$NetBSD: distinfo,v 1.74 2025/07/11 16:08:51 gdt Exp $
 
-BLAKE2s (gdal-3.11.1.tar.xz) = 5bf90f87c895616903c721635d176fc70652d3eb33e8b31df22f5981e4e1a6bb
-SHA512 (gdal-3.11.1.tar.xz) = 8fb763b2fe29720b4d159b79b9ec4d6bca049829f97f906b74dd43269ff61d4f879277ee4fe14fcc7be723ff239e373f1843313652865a3645d5384cbc4cfb45
-Size (gdal-3.11.1.tar.xz) = 9308432 bytes
+BLAKE2s (gdal-3.11.2.tar.xz) = 8065235d94e78262a99ed71f40e9c691459294dbfd456ae99be1d86c11854633
+SHA512 (gdal-3.11.2.tar.xz) = 9c7f996df562d7c5aff65c6ec3adcbf0c053b627dde059e8d9c4f54be7ac97080c2b28e69d4700d082df11a248b491502f0738feb0e0ac94b85d68d3ec18213d
+Size (gdal-3.11.2.tar.xz) = 9313648 bytes
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
 SHA1 (patch-port_cpl__port.h) = 1a8e90085b4390edb4ec2b40b68f83093fbe164d

Index: pkgsrc/geography/py-gdal/Makefile
diff -u pkgsrc/geography/py-gdal/Makefile:1.88 pkgsrc/geography/py-gdal/Makefile:1.89
--- pkgsrc/geography/py-gdal/Makefile:1.88      Thu Jul  3 19:18:04 2025
+++ pkgsrc/geography/py-gdal/Makefile   Fri Jul 11 16:08:52 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2025/07/03 19:18:04 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2025/07/11 16:08:52 gdt Exp $
 
 PYTHON_VERSIONS_INCOMPATIBLE=  39 310
 
@@ -18,6 +18,7 @@ USE_CXX_FEATURES+=    c++17 charconv
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=75.8.2:../../devel/py-setuptools
 
 PYSETUPSUBDIR=         build/swig/python
+WHEEL_NAME=            gdal-${VERSION_BASE}
 
 # Upstream's distfile does not have a ready-to-use python module
 # source directory.  Creating it requires cmake, but apparently not