CVS commit: pkgsrc/geography/qgis

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec  2 15:44:27 UTC 2022

Modified Files:
        pkgsrc/geography/qgis: Makefile distinfo

Log Message:
qgis: update to 3.28.1nb1.

Switch to sip6, latest py-qt5*.

This adds support for python 3.11.


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/geography/qgis/distinfo

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

Modified files:

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.160 pkgsrc/geography/qgis/Makefile:1.161
--- pkgsrc/geography/qgis/Makefile:1.160        Wed Nov 30 21:12:28 2022
+++ pkgsrc/geography/qgis/Makefile      Fri Dec  2 15:44:27 2022
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.160 2022/11/30 21:12:28 gdt Exp $
+# $NetBSD: Makefile,v 1.161 2022/12/02 15:44:27 wiz Exp $
 
 # This is intentionally 3.28 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
 # versions.
 DISTNAME=      qgis-3.28.1
+PKGREVISION=   1
 CATEGORIES=    geography
 MASTER_SITES=  https://qgis.org/downloads/
 EXTRACT_SUFX=  .tar.bz2
@@ -30,6 +31,11 @@ USE_TOOLS+=          gmake
 PLIST_SRC=             PLIST
 
 DEPENDS+=              qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl
+TOOL_DEPENDS+=         ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
+TOOL_DEPENDS+=         ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
+DEPENDS+=              ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
+DEPENDS+=              ${PYPKGPREFIX}-qt5-qscintilla-[0-9]*:../../x11/py-qt5-qscintilla
+
 # This is needed to find qca2.
 CMAKE_PREFIX_PATH+=    ${QTDIR}
 
@@ -57,12 +63,9 @@ SUBST_SED.pyqt+=             -e '/^SET/s,pyrcc5,&-$
 SUBST_SED.pyqt+=               -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},'
 
 CMAKE_ARGS+=           -DWITH_BINDINGS:BOOL=TRUE
-CMAKE_ARGS+=           -DSIP_BINARY_PATH:PATH=${BUILDLINK_PREFIX.py-sip}/bin
 CMAKE_ARGS+=           -DWITH_INTERNAL_MARKUPSAFE=FALSE
 
-.include "../../lang/python/application.mk"
 PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # py-gdal
-PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
 
 DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
@@ -85,6 +88,7 @@ CMAKE_ARG_PATH=       ..
 pre-configure:
        ${MKDIR} ${WRKSRC}/build
 
+.include "../../lang/python/pyversion.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 ##.include "../../devel/qjson/buildlink3.mk"
@@ -103,9 +107,6 @@ pre-configure:
 .include "../../geography/spatialindex/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"
 .include "../../security/qt5-qtkeychain/buildlink3.mk"
-.include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-.include "../../x11/py-qt5-qscintilla/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qwt6-qt5/buildlink3.mk"

Index: pkgsrc/geography/qgis/distinfo
diff -u pkgsrc/geography/qgis/distinfo:1.47 pkgsrc/geography/qgis/distinfo:1.48
--- pkgsrc/geography/qgis/distinfo:1.47 Wed Nov 30 19:40:12 2022
+++ pkgsrc/geography/qgis/distinfo      Fri Dec  2 15:44:27 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2022/11/30 19:40:12 wiz Exp $
+$NetBSD: distinfo,v 1.48 2022/12/02 15:44:27 wiz Exp $
 
 BLAKE2s (qgis-3.28.1.tar.bz2) = 9ad72cb4a2f66403b6326c027c39c05a365379c58ae56f3401558ef9842dcba6
 SHA512 (qgis-3.28.1.tar.bz2) = f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514