Index: head/graphics/qgis/Makefile =================================================================== --- head/graphics/qgis/Makefile +++ head/graphics/qgis/Makefile @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_16_0 -PORTREVISION= 2 +DISTVERSION= 3_16_1 CATEGORIES= graphics geography MAINTAINER= rhurlin@FreeBSD.org @@ -52,7 +51,8 @@ libspatialite.so:databases/spatialite \ libsz.so:science/szip \ libxerces-c.so:textproc/xerces-c3 \ - libzip.so:archivers/libzip + libzip.so:archivers/libzip \ + libzstd.so:archivers/zstd RUN_DEPENDS= astyle:devel/astyle \ opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \ @@ -145,6 +145,8 @@ GRASS_CMAKE_BOOL= WITH_GRASS7 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE + +SUB_FILES= pkg-message PLIST_SUB= DISTVERSION=${PORTVERSION} Index: head/graphics/qgis/distinfo =================================================================== --- head/graphics/qgis/distinfo +++ head/graphics/qgis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603630554 -SHA256 (qgis-QGIS-final-3_16_0_GH0.tar.gz) = 7f52b02d2eeab467e1c672c7b86a5d03baca2982e7b8811f908690b1266a1493 -SIZE (qgis-QGIS-final-3_16_0_GH0.tar.gz) = 133786548 +TIMESTAMP = 1606230996 +SHA256 (qgis-QGIS-final-3_16_1_GH0.tar.gz) = bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e +SIZE (qgis-QGIS-final-3_16_1_GH0.tar.gz) = 134902729 Index: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py =================================================================== --- head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py +++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py @@ -1,20 +1,27 @@ ---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2020-03-27 05:50:09 UTC +--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-12-07 13:18:21 UTC +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py -@@ -79,7 +79,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): +@@ -79,13 +79,13 @@ class SagaAlgorithmProvider(QgsProcessingProvider): def canBeActivated(self): version = SagaUtils.getInstalledVersion(True) - if version is not None and (version.startswith(REQUIRED_VERSION) or version.startswith(BETA_SUPPORT_VERSION)): -+ if version is not None and version >= REQUIRED_VERSION: ++ if version is not None and (version.startswith(REQUIRED_VERSION) or version >= BETA_SUPPORT_VERSION): return True return False + def warningMessage(self): + version = SagaUtils.getInstalledVersion(True) +- if version is not None and version.startswith(BETA_SUPPORT_VERSION): ++ if version is not None and version >= BETA_SUPPORT_VERSION: + return self.tr('SAGA version {} is not officially supported - algorithms may encounter issues').format(version) + return '' + @@ -96,7 +96,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): self.tr('Processing'), Qgis.Critical) return - if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION): -+ if version < REQUIRED_VERSION: ++ if not version.startswith(REQUIRED_VERSION) and not version >= BETA_SUPPORT_VERSION: QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), self.tr('Processing'), Qgis.Critical) Index: head/graphics/qgis/files/pkg-message.in =================================================================== --- head/graphics/qgis/files/pkg-message.in +++ head/graphics/qgis/files/pkg-message.in @@ -0,0 +1,18 @@ +[ +{ type: install + message: <