git: 62329a89eaa5 - main - graphics/qgis: Update to 3.20.1

[Rainer Hurling]

The branch main has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=62329a89eaa534aa5bf12131f624be4edbd060a5

commit 62329a89eaa534aa5bf12131f624be4edbd060a5
Author:     Rainer Hurling <rhurlin at FreeBSD.org>
AuthorDate: 2021-08-04 10:27:30 +0000
Commit:     Rainer Hurling <rhurlin at FreeBSD.org>
CommitDate: 2021-08-04 10:27:30 +0000

    graphics/qgis: Update to 3.20.1
    
    - Various bug fixes, among others for PostgreSQL and Python
    - Use MDAL port instead of internal version
    
    Changelog: https://changelog.qgis.org/en/qgis/version/3.20
    
    Reported by:    Repology
---
 graphics/qgis/Makefile | 17 +++++++++--------
 graphics/qgis/distinfo |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index d1810f4017f0..de6adf2b6df9 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	3_20_0
-PORTREVISION=	3
+DISTVERSION=	3_20_1
 CATEGORIES=	graphics geography
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -46,6 +45,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libhdf5.so:science/hdf5 \
 		liblazperf.so:archivers/lazperf \
 		libnetcdf.so:science/netcdf \
+		libmdal.so:math/mdal \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
@@ -112,8 +112,8 @@ USE_GL=		gl
 USE_GNOME=	libxml2
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-USE_PYQT=	core gui location network qml quick quickwidgets qscintilla2 \
-		pysip sip sql svg webkit_run webkitwidgets_run xml
+USE_PYQT=	core gui location network positioning qml quick quickwidgets \
+		qscintilla2 pysip sip sql svg webkit_run webkitwidgets_run xml
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer doc gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
@@ -123,15 +123,16 @@ USE_QT=		3d buildtools_build core concurrent dbus declarative \
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
+		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
+		-DWITH_INTERNAL_MDAL:BOOL=false \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
-		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
-		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
+		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so
 CMAKE_ON=	BUILD_TESTING ENABLE_TESTS USE_OPENCL WITH_3D WITH_ASTYLE \
-		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_INTERNAL_MDAL \
-		WITH_POSTGRESQL WITH_PDAL
+		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_POSTGRESQL \
+		WITH_PDAL
 CMAKE_OFF=	WITH_GLOBE WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo
index 9ed3061f46d6..53406ae95eb9 100644
--- a/graphics/qgis/distinfo
+++ b/graphics/qgis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624111199
-SHA256 (qgis-QGIS-final-3_20_0_GH0.tar.gz) = b18b447e17cf1369f2f660d36e48401310121d5703afcfda5327c2f5fccc1f07
-SIZE (qgis-QGIS-final-3_20_0_GH0.tar.gz) = 154112618
+TIMESTAMP = 1628054620
+SHA256 (qgis-QGIS-final-3_20_1_GH0.tar.gz) = d6651d657071bf47c79c0faf018749ad2fc70e3d6faeeeb8cb11fcfd4baf57c6
+SIZE (qgis-QGIS-final-3_20_1_GH0.tar.gz) = 154230118