qgis: Update along 4.0 branch to after 4.0.2

[Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat May 9 19:56:22 2026 -0400
Changeset:	27671bc67aca20338ad541972c09840d788e446f

Modified Files:
	qgis/Makefile
	qgis/PLIST
	qgis/TODO
	qgis/distinfo

Log Message:
qgis: Update along 4.0 branch to after 4.0.2

Rototill TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=27671bc67aca20338ad541972c09840d788e446f

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

diffstat:
 qgis/Makefile | 16 ++++++++++------
 qgis/PLIST    | 28 ++++++++++++++++++----------
 qgis/TODO     | 21 +++++++--------------
 qgis/distinfo |  6 +++---
 4 files changed, 38 insertions(+), 33 deletions(-)

diffs:
diff --git a/qgis/Makefile b/qgis/Makefile
index bb1c75037f..8f669c15ee 100644
--- a/qgis/Makefile
+++ b/qgis/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.267 2026/02/06 10:04:56 wiz Exp $
 
 # This package tracks the qgis 4.0 stable branch
-DISTNAME=	qgis-4.0.0.0
+DISTNAME=	qgis-4.0.2.18
 CATEGORIES=	geography
 #MASTER_SITES=	https://qgis.org/downloads/
 MASTER_SITES=	${MASTER_SITE_GITHUB:=qgis/}
 GITHUB_PROJECT=	QGIS
-GITHUB_TAG=	f2317a9ab1b8b0ab95c88d0cb0a2e53530812076
+GITHUB_TAG=	9e5d52a1edb67d45ae558a6aeb30f0aba56d9f1a
 DIST_SUBDIR=	qgis-snapshot
 
 MAINTAINER=	gdt%NetBSD.org@localhost
@@ -31,7 +31,7 @@ BUILDLINK_TRANSFORM+=	rm:-I${PREFIX}/include/minizip
 TOOL_DEPENDS+=		${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
 TOOL_DEPENDS+=		${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
 
-# \todo Grasp/fix.
+# \todo Grasp/fix.  Perhaps qca2-qt6 does not need an ossl plugin because it is built in?
 #DEPENDS+=		qca2-qt6-ossl-[0-9]*:../../security/qca2-qt6-ossl
 DEPENDS+=		${PYPKGPREFIX}-qt6-[0-9]*:../../x11/py-qt6
 DEPENDS+=		${PYPKGPREFIX}-qt6-qscintilla-[0-9]*:../../x11/py-qt6-qscintilla
@@ -42,9 +42,9 @@ CMAKE_PREFIX_PATH+=	${QTDIR}
 # This could be used if we want to build pdf doc, which is currently false
 #TOOL_DEPENDS+=	txt2tags-[0-9]*:../../wip/txt2tags
 
+# Disable building of QGIS.app.  \todo Consider building it.
 # \todo Adapt to upstream rototill of mac bundle in 4.0. This is
 # likely just one file now.
-# Disable building of QGIS.app.  \todo Consider building it.
 SUBST_CLASSES+=		xapple
 SUBST_STAGE.xapple=	pre-configure
 SUBST_MESSAGE.xapple=	Disabling APPLE App in cmake scripts
@@ -86,10 +86,14 @@ CMAKE_CONFIGURE_ARGS+=		-DWITH_BINDINGS:BOOL=TRUE
 CMAKE_CONFIGURE_ARGS+=		-DWITH_INTERNAL_MARKUPSAFE=FALSE
 CMAKE_CONFIGURE_ARGS+=		-DWITH_INTERNAL_NLOHMANN_JSON=OFF
 
-# \todo Find/package qwt and re-enable.
+# \todo One of
+#    - find/package qwt6-qt6 and re-enable
+#    - decide that it's built in to qt6
+#    - decide that it's not necesary
 # We patch cmake to look only in QWT_DIR, so provide it.
 #CMAKE_CONFIGURE_ARGS+=		-DQWT_DIR=${QWT_DIR}
 
+# \todo Move to options.mk as default off; it seems unusual to want it.
 CMAKE_CONFIGURE_ARGS+=		-DWITH_QTWEBENGINE=FALSE
 # DEPENDS+= ../../www/qt6-qtwebengine
 
@@ -113,7 +117,7 @@ DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-owslib-[0-9]*:../../geography/py-owslib
 
 .include "../../lang/python/pyversion.mk"
-ooPYTHON_VERSIONS_INCOMPATIBLE=	310
+PYTHON_VERSIONS_INCOMPATIBLE=	310
 
 .include "../../mk/pgsql.buildlink3.mk"
 
diff --git a/qgis/PLIST b/qgis/PLIST
index 6009ae3bb8..60cbbc669b 100644
--- a/qgis/PLIST
+++ b/qgis/PLIST
@@ -1970,7 +1970,7 @@ include/qgis/qgsvectorlayerjoininfo.h
 include/qgis/qgsvectorlayerlabeling.h
 include/qgis/qgsvectorlayerlabelprovider.h
 include/qgis/qgsvectorlayerlegendwidget.h
-include/qgis/qgsvectorlayerplotdatagatherer.cpp
+include/qgis/qgsvectorlayerplotdatagatherer.h
 include/qgis/qgsvectorlayerprofilegenerator.h
 include/qgis/qgsvectorlayerproperties.h
 include/qgis/qgsvectorlayerref.h
@@ -2591,21 +2591,21 @@ include/qgis/ui_widget_vectorfield.h
 include/qgis/util.h
 include/qgis/vector_tile.pb.h
 lib/libqgis_3d.so
-lib/libqgis_3d.so.4.0.0
+lib/libqgis_3d.so.4.0.2
 lib/libqgis_analysis.so
-lib/libqgis_analysis.so.4.0.0
+lib/libqgis_analysis.so.4.0.2
 lib/libqgis_app.so
-lib/libqgis_app.so.4.0.0
+lib/libqgis_app.so.4.0.2
 lib/libqgis_core.so
-lib/libqgis_core.so.4.0.0
+lib/libqgis_core.so.4.0.2
 lib/libqgis_gui.so
-lib/libqgis_gui.so.4.0.0
+lib/libqgis_gui.so.4.0.2
 lib/libqgis_native.so
-lib/libqgis_native.so.4.0.0
+lib/libqgis_native.so.4.0.2
 lib/libqgis_server.so
-lib/libqgis_server.so.4.0.0
+lib/libqgis_server.so.4.0.2
 lib/libqgispython.so
-lib/libqgispython.so.4.0.0
+lib/libqgispython.so.4.0.2
 lib/qgis/crssync
 lib/qgis/pdal_wrench
 lib/qgis/plugins/libauthmethod_apiheader.so
@@ -2808,9 +2808,12 @@ share/qgis/i18n/qgis_ca.qm
 share/qgis/i18n/qgis_cs.qm
 share/qgis/i18n/qgis_da.qm
 share/qgis/i18n/qgis_de.qm
+share/qgis/i18n/qgis_el.qm
 share/qgis/i18n/qgis_en_US.qm
 share/qgis/i18n/qgis_es.qm
+share/qgis/i18n/qgis_et.qm
 share/qgis/i18n/qgis_eu.qm
+share/qgis/i18n/qgis_fa.qm
 share/qgis/i18n/qgis_fi.qm
 share/qgis/i18n/qgis_fr.qm
 share/qgis/i18n/qgis_gl.qm
@@ -2819,7 +2822,9 @@ share/qgis/i18n/qgis_is.qm
 share/qgis/i18n/qgis_it.qm
 share/qgis/i18n/qgis_ja.qm
 share/qgis/i18n/qgis_ko.qm
+share/qgis/i18n/qgis_ky.qm
 share/qgis/i18n/qgis_lt.qm
+share/qgis/i18n/qgis_lv.qm
 share/qgis/i18n/qgis_nb.qm
 share/qgis/i18n/qgis_nl.qm
 share/qgis/i18n/qgis_pl.qm
@@ -2836,6 +2841,7 @@ share/qgis/i18n/qgis_uk.qm
 share/qgis/i18n/qgis_vi.qm
 share/qgis/i18n/qgis_zh-Hans.qm
 share/qgis/i18n/qgis_zh-Hant.qm
+share/qgis/i18n/qgis_zh_TW.qm
 share/qgis/images/icons/qbrowser-icon.png
 share/qgis/images/icons/qgis-full.png
 share/qgis/images/icons/qgis-icon-16x16.png
@@ -3388,7 +3394,7 @@ share/qgis/python/pyplugin_installer/qgsplugininstallerrepositorybase.ui
 share/qgis/python/pyplugin_installer/qgsplugininstallerrepositorydialog.py
 share/qgis/python/pyplugin_installer/unzip.py
 share/qgis/python/pyplugin_installer/version_compare.py
-share/qgis/python/pyproject.toml
+share/qgis/python/qgis-4.0.2.dist-info/METADATA
 share/qgis/python/qgis/PyQt/Qsci.py
 share/qgis/python/qgis/PyQt/Qt.py
 share/qgis/python/qgis/PyQt/QtCore.py
@@ -3396,11 +3402,13 @@ share/qgis/python/qgis/PyQt/QtGui.py
 share/qgis/python/qgis/PyQt/QtMultimedia.py
 share/qgis/python/qgis/PyQt/QtNetwork.py
 share/qgis/python/qgis/PyQt/QtPrintSupport.py
+share/qgis/python/qgis/PyQt/QtQuick.py
 share/qgis/python/qgis/PyQt/QtQuickWidgets.py
 share/qgis/python/qgis/PyQt/QtSerialPort.py
 share/qgis/python/qgis/PyQt/QtSql.py
 share/qgis/python/qgis/PyQt/QtSvg.py
 share/qgis/python/qgis/PyQt/QtTest.py
+share/qgis/python/qgis/PyQt/QtWebChannel.py
 share/qgis/python/qgis/PyQt/QtWebEngineCore.py
 share/qgis/python/qgis/PyQt/QtWebEngineQuick.py
 share/qgis/python/qgis/PyQt/QtWebEngineWidgets.py
diff --git a/qgis/TODO b/qgis/TODO
index c3193fa1c4..94a30ad608 100644
--- a/qgis/TODO
+++ b/qgis/TODO
@@ -1,21 +1,14 @@
+This file omits most of the \todo markings in Makefile as acceptable
+in pkgsrc.
+
 # normal TODO
 
   - Write COMMIT_MSG.
   - Go over cmake configure output and check dependencies.
-  - Grasp/fix lack of secret storage access.
-  - Create a default-off option to qtwebengine.  It's at best beastly,
-    and didn't build for me on NetBSD 10 amd64.  It's not clear what
-    having it in qgis gains.
-
-# \todo in makefile
+  - Grasp/fix lack of secret storage access -- error at startup.
+  - Redo apple bundle exclusion.
 
-This section omits things that were \todo in geography/qgis, or aren't
-reasons the upgrade isn't ready.  (e.g., BSD make) 
+# Makefile TODO
 
   - Grasp qca2-qt6-ossl and package or decide it isn't needed.
-  - Redo apple bundle exclusion.
-  - Leave note about making apple bundle an option.
-  - Package/add laz-perf.
-  - Recheck precompiled headers exclusion.
-  - Recheck having to set bindings on.
-  - Package qwt-qt6 and and re-add QWT_DIR patch and cmake arg.
+  - Grasp qwt-qt6 and package or decide it isn't needed.
diff --git a/qgis/distinfo b/qgis/distinfo
index 4e3c1e1829..027907779c 100644
--- a/qgis/distinfo
+++ b/qgis/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.87 2026/02/02 10:54:45 gdt Exp $
 
-BLAKE2s (qgis-snapshot/qgis-4.0.0.0-f2317a9ab1b8b0ab95c88d0cb0a2e53530812076.tar.gz) = 05201874185ee3756108a8a757e03357ccdece6bdaca2f1d1ba0382ca0064db6
-SHA512 (qgis-snapshot/qgis-4.0.0.0-f2317a9ab1b8b0ab95c88d0cb0a2e53530812076.tar.gz) = ca7eb3c1491dc53e169ccee349f6c27dc666c5e80c59a89e276a4e03b0b9297ed31c6ae76be4375555944d38af295bc68b079cffc618085022160eaf7f5d3659
-Size (qgis-snapshot/qgis-4.0.0.0-f2317a9ab1b8b0ab95c88d0cb0a2e53530812076.tar.gz) = 224829487 bytes
+BLAKE2s (qgis-snapshot/qgis-4.0.2.18-9e5d52a1edb67d45ae558a6aeb30f0aba56d9f1a.tar.gz) = 9fe8defff4d22ee9d07919f2f2b936cfa5d9a9fe4a7ed114041db658f019f6ba
+SHA512 (qgis-snapshot/qgis-4.0.2.18-9e5d52a1edb67d45ae558a6aeb30f0aba56d9f1a.tar.gz) = b6e7bcea8f580d69b4461f86e5d80124166a31851697a2bab91d960bfcea77f7529d06f746e981137633b81e4655c39fbeb4d77079d2d7718348a74031ec4564
+Size (qgis-snapshot/qgis-4.0.2.18-9e5d52a1edb67d45ae558a6aeb30f0aba56d9f1a.tar.gz) = 221603950 bytes
 SHA1 (patch-cmake_FindQwt.cmake) = 245463bc44fb4f2cb4aa61a8b86931e95e4ac820
 SHA1 (patch-external_nmea_tok.c) = 94b9ce398787170250fc5fbd8835d7d7fa1cd013
 SHA1 (patch-src_crssync_CMakeLists.txt) = 7269ba6dce3ca41f5d63d36ffc02ffc6d0cea5d8