graphics/qgis-ltr: upgrade 3.4.7 -> 3.4.11

- Build with ports clang default version
- Add astro/gpsbabel as dependency
- Update several Python dependencies
- Add devel/py-geojson, devel/py-nbformat, math/py-networkx,
  graphics/py-pillow, graphics/py-scikit-image, and
  devel/py-shapely for Python extension
- Add -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW

PR:		240105
Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)

3 files changed, 45 insertions, 23 deletions

diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 0d52a209485f..9d2b0b566cb1 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	3_4_7
-PORTREVISION=	1
+DISTVERSION=	3_4_11
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
@@ -13,13 +12,14 @@ COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
+BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
+		gpsbabel>=1.5.4:astro/gpsbabel \
 		txt2tags:textproc/txt2tags \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
@@ -27,8 +27,8 @@ BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.3.0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
@@ -36,24 +36,30 @@ BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
 RUN_DEPENDS=	astyle:devel/astyle \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gdal>=2.4.1:graphics/py-gdal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.3.0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.2_2:graphics/py-scikit-image@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
@@ -101,7 +107,8 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-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
+		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
+		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
 CMAKE_ON=	BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL
 CMAKE_OFF=	WITH_GLOBE WITH_QWTPOLAR
@@ -130,6 +137,13 @@ SERVER_CMAKE_BOOL=	WITH_SERVER
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+# make describe needs them here, after bsd.port.pre.mk
+CPP=		clang-cpp${LLVM_DEFAULT}
+CC=		clang${LLVM_DEFAULT}
+CXX=		clang++${LLVM_DEFAULT}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|markupsafe ||g' \
 		${WRKSRC}/python/ext-libs/CMakeLists.txt
@@ -144,4 +158,4 @@ post-install:
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/qgis-ltr/distinfo b/graphics/qgis-ltr/distinfo
index f04bcab9db80..dabae391f969 100644
--- a/graphics/qgis-ltr/distinfo
+++ b/graphics/qgis-ltr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556614839
-SHA256 (qgis-QGIS-final-3_4_7_GH0.tar.gz) = d070da42e842e59ce9a338b40784b9bc4582f3d48a19255fa8aef967cca653ba
-SIZE (qgis-QGIS-final-3_4_7_GH0.tar.gz) = 91022939
+TIMESTAMP = 1566752734
+SHA256 (qgis-QGIS-final-3_4_11_GH0.tar.gz) = 839c279c6c97f9e61495666293bd0b70701ef77b7ef4eb8f43754719d0dd8fd2
+SIZE (qgis-QGIS-final-3_4_11_GH0.tar.gz) = 91011251
diff --git a/graphics/qgis-ltr/pkg-plist b/graphics/qgis-ltr/pkg-plist
index d4d3403189ea..2b5d5ae5b8d7 100644
--- a/graphics/qgis-ltr/pkg-plist
+++ b/graphics/qgis-ltr/pkg-plist
@@ -2349,14 +2349,11 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/i18n/qgis_da.qm
 %%DATADIR%%/i18n/qgis_de.qm
 %%DATADIR%%/i18n/qgis_el.qm
-%%DATADIR%%/i18n/qgis_eo.qm
 %%DATADIR%%/i18n/qgis_es.qm
-%%DATADIR%%/i18n/qgis_et.qm
 %%DATADIR%%/i18n/qgis_eu.qm
 %%DATADIR%%/i18n/qgis_fi.qm
 %%DATADIR%%/i18n/qgis_fr.qm
 %%DATADIR%%/i18n/qgis_gl.qm
-%%DATADIR%%/i18n/qgis_hi.qm
 %%DATADIR%%/i18n/qgis_hu.qm
 %%DATADIR%%/i18n/qgis_id.qm
 %%DATADIR%%/i18n/qgis_is.qm
@@ -2767,7 +2764,8 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.stats.txt
 %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.stats.zonal.txt
 %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.stream.extract.txt
-%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sun.txt
+%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sun.incidout.txt
+%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sun.insoltime.txt
 %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sunhours.txt
 %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sunmask.datetime.txt
 %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sunmask.position.txt
@@ -3754,6 +3752,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/python/qsci_apis/QScintilla2-2.7.2.api
 %%DATADIR%%/python/qsci_apis/pyqgis.pap
 %%DATADIR%%/resources/2to3migration.txt
+%%DATADIR%%/resources/compdcs.csv
 %%DATADIR%%/resources/cpt-city-qgis-min/README-qgis.txt
 %%DATADIR%%/resources/cpt-city-qgis-min/README.txt
 %%DATADIR%%/resources/cpt-city-qgis-min/VERSION-parent.xml
@@ -4955,6 +4954,9 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/resources/data/world_map.qml
 %%DATADIR%%/resources/data/world_map.shp
 %%DATADIR%%/resources/data/world_map.shx
+%%DATADIR%%/resources/datum_shift.csv
+%%DATADIR%%/resources/gcs.csv
+%%DATADIR%%/resources/geoccs.csv
 %%DATADIR%%/resources/metadata-ISO/LinkPropertyLookupTable.csv
 %%DATADIR%%/resources/metadata-ISO/country_code_ISO_3166.csv
 %%DATADIR%%/resources/metadata-ISO/language_codes_ISO_639.csv
@@ -4962,6 +4964,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/resources/metadata-ISO/md_scope_codes.csv
 %%DATADIR%%/resources/metadata-ISO/mime.csv
 %%DATADIR%%/resources/palettes/new_layer_colors.gpl
+%%DATADIR%%/resources/pcs.csv
 %%DATADIR%%/resources/qgis.db
 %%DATADIR%%/resources/qgis_global_settings.ini
 %%SERVER%%%%DATADIR%%/resources/server/schemaExtension.xsd
@@ -4977,9 +4980,13 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/resources/themes/Night Mapping/icons/eye.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/handle-horizontal.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/handle-vertical.svg
+%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked-disabled.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked.svg
+%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked-disabled.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked.svg
+%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked-disabled.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked.svg
+%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-unchecked-disabled.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-unchecked.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/separator-horizontal.svg
 %%DATADIR%%/resources/themes/Night Mapping/icons/separator-vertical.svg
@@ -4987,6 +4994,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/resources/themes/Night Mapping/qscintilla.ini
 %%DATADIR%%/resources/themes/Night Mapping/style.qss
 %%DATADIR%%/resources/themes/Night Mapping/variables.qss
+%%DATADIR%%/resources/vertcs.csv
 %%DATADIR%%/svg/accommodation/accommodation_alpinehut.svg
 %%DATADIR%%/svg/accommodation/accommodation_bed_and_breakfast.svg
 %%DATADIR%%/svg/accommodation/accommodation_camping.svg