Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Sep 2020 11:51:51 +0000 (UTC)
From:      Rainer Hurling <rhurlin@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549683 - head/graphics/qgis
Message-ID:  <202009231151.08NBppuO053772@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rhurlin
Date: Wed Sep 23 11:51:50 2020
New Revision: 549683
URL: https://svnweb.freebsd.org/changeset/ports/549683

Log:
  graphics/qgis: Update to 3.14.16
  
  This is a minor update for QGIS from version 3.14.15. It fixes several problems and brings some new features[1].
  
  [1] https://github.com/qgis/QGIS/compare/final-3_14_15...final-3_14_16
  
  Changes in the port:
  - Update distversion number
  - Remove portrevision
  - Remove patch files needed for 3.14.15
  - Move LIB_DEPENDS before RUN_DEPENDS
  - Reorder entries in USES section
  - Update distinfo
  
  Approved by:	arrowd (mentor)
  Relnotes:	https://qgis.org/en/site/forusers/visualchangelog314/index.html
  Differential Revision:	https://reviews.freebsd.org/D26527

Modified:
  head/graphics/qgis/Makefile
  head/graphics/qgis/distinfo

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Wed Sep 23 11:47:21 2020	(r549682)
+++ head/graphics/qgis/Makefile	Wed Sep 23 11:51:50 2020	(r549683)
@@ -3,15 +3,9 @@
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	3_14_15
-PORTREVISION=	1
+DISTVERSION=	3_14_16
 CATEGORIES=	graphics geography
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	33192f38bc7d.patch:-p1 \
-		12203f0ce527.patch:-p1 \
-		6e9d42d70099.patch:-p1
-
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
@@ -38,6 +32,24 @@ BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
+		libexpat.so:textproc/expat2 \
+		libgdal.so:graphics/gdal \
+		libgeos.so:graphics/geos \
+		libgsl.so:math/gsl \
+		libhdf5.so:science/hdf5 \
+		libnetcdf.so:science/netcdf \
+		libproj.so:graphics/proj \
+		libprotobuf-lite.so:devel/protobuf \
+		libqjson-qt5.so:devel/qjson \
+		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+		libqt5keychain.so:security/qtkeychain \
+		libqwt6.so:x11-toolkits/qwt6 \
+		libspatialindex.so:devel/spatialindex \
+		libspatialite.so:databases/spatialite \
+		libsz.so:science/szip \
+		libxerces-c.so:textproc/xerces-c3 \
+		libzip.so:archivers/libzip
 RUN_DEPENDS=	astyle:devel/astyle \
 		${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
@@ -76,29 +88,14 @@ RUN_DEPENDS=	astyle:devel/astyle \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
-LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
-		libexpat.so:textproc/expat2 \
-		libgdal.so:graphics/gdal \
-		libgeos.so:graphics/geos \
-		libgsl.so:math/gsl \
-		libhdf5.so:science/hdf5 \
-		libnetcdf.so:science/netcdf \
-		libproj.so:graphics/proj \
-		libprotobuf-lite.so:devel/protobuf \
-		libqjson-qt5.so:devel/qjson \
-		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
-		libqt5keychain.so:security/qtkeychain \
-		libqwt6.so:x11-toolkits/qwt6 \
-		libspatialindex.so:devel/spatialindex \
-		libspatialite.so:databases/spatialite \
-		libsz.so:science/szip \
-		libxerces-c.so:textproc/xerces-c3 \
-		libzip.so:archivers/libzip
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features cpe desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.6+ qca qt:5 \
 		shebangfix sqlite:3
+USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_PROJECT=	${PORTNAME:tu}
 USE_GNOME=	libxml2
 USE_GL=		gl
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
@@ -108,13 +105,13 @@ USE_QT=		3d buildtools_build core concurrent dbus decl
 		webengine widgets webkit xml
 USE_PYQT=	core gui network qml quickwidgets qscintilla2 \
 		sip sql svg webkit_run webkitwidgets_run xml
-USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	qgis-ltr
 
-USE_GITHUB=	yes
-GH_PROJECT=	${PORTNAME:tu}
+INSTALLS_ICONS=	yes
 
+SHEBANG_FILES=	src/plugins/grass/scripts/*.py
+
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
@@ -133,8 +130,6 @@ CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
-SHEBANG_FILES=	src/plugins/grass/scripts/*.py
-
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
@@ -149,8 +144,6 @@ SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
-
-INSTALLS_ICONS=	yes
 
 .include <bsd.port.pre.mk>
 

Modified: head/graphics/qgis/distinfo
==============================================================================
--- head/graphics/qgis/distinfo	Wed Sep 23 11:47:21 2020	(r549682)
+++ head/graphics/qgis/distinfo	Wed Sep 23 11:51:50 2020	(r549683)
@@ -1,9 +1,3 @@
-TIMESTAMP = 1597911962
-SHA256 (qgis-QGIS-final-3_14_15_GH0.tar.gz) = 6f50f055f56f54b592c4d7ea5dc20a2e11c02ce888b4279b92af5f8bb1b3e26d
-SIZE (qgis-QGIS-final-3_14_15_GH0.tar.gz) = 129856895
-SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b
-SIZE (33192f38bc7d.patch) = 12604
-SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235
-SIZE (12203f0ce527.patch) = 2452
-SHA256 (6e9d42d70099.patch) = 44c3ecc27c839492d9eae2d352e0ea9f37c11a419fb3f8862350b1e52cb359a6
-SIZE (6e9d42d70099.patch) = 1513
+TIMESTAMP = 1600802833
+SHA256 (qgis-QGIS-final-3_14_16_GH0.tar.gz) = b2115bd47b3dec96d46701809d6bc39d757ec46e8973d61ee378033b84189ced
+SIZE (qgis-QGIS-final-3_14_16_GH0.tar.gz) = 129949190



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009231151.08NBppuO053772>