From nobody Mon Jan 17 08:15:50 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C27F01954001; Mon, 17 Jan 2022 08:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jcl8k4NFKz4YGl; Mon, 17 Jan 2022 08:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642407350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4TKDsevGxgiXrKtk4dKa/WOPutISA40JlCHPlmHur8=; b=lu9gcN6GJ9j79GbMcJvwFTUD1fr5F8m6EemyE/0lrXy1A90syDINgp8Z6nzh5TfAZF6lq4 H7qh+ZG6D9HvasaXdCFq+UCl0d1RbAodtoe92soWT3NPC7sy1p5HDwlfqfWw5kPwAjx1og 2rMZ8JtC0ELSjtjbHLfAKBzxAcz4opUBu3oGaKX7TLqH1GAfA9sIZLhE5ph89X+jDCAK5R VM7E/MdOH19fqKphpUu4x4CTiQG+Ec5cakSYT9XwPzueoEWYK5wJY6an7zOvJkoRYaEQ0r U4OsgvepjzoNGNCfAQasb1uWubho7+0UYuQCBtHi/TFWwFVB2WFW7eqR//dVmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77852243A; Mon, 17 Jan 2022 08:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20H8Fou8063004; Mon, 17 Jan 2022 08:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20H8Fohr063003; Mon, 17 Jan 2022 08:15:50 GMT (envelope-from git) Date: Mon, 17 Jan 2022 08:15:50 GMT Message-Id: <202201170815.20H8Fohr063003@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rainer Hurling Subject: git: 7b69cbfded3b - 2022Q1 - graphics/qgis: Change from Github to QGIS release archive List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 7b69cbfded3ba5224542e65a78ba26d6c8af457d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642407350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4TKDsevGxgiXrKtk4dKa/WOPutISA40JlCHPlmHur8=; b=HU/motgb52BHbMUhjwaNN0fdRRTlmEAIPmZQJzjLfeijF8StdZUEe2H0m1cBue6sgFgkFT qY7ZqwfmuH+kqVyuCLIuxIdbiksckf9D+7BtUjHGds0udFqflo4HF9lfdg0FXtLnLO6xzd a7jTVRRabU8ttTPdPEkT8L/jiA0SEBOnwoD2xsUYffUnXwmmQ8nu6EfcakAOord6GF/BIv BxxRfoyPeFMBStwn/KWxpipwz5j1qq00AhYRVkiL4RoHExtWTy4Jw8ZTWYuTxonr1RQGBK LDawg0WgixQG3PNavlzhJPhkPyTNIIaIjx0YhWfzcMXKyymoqVmyTzYidocgMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642407350; a=rsa-sha256; cv=none; b=uYrkHDViQSwsx3ikx4hEK2PiglalaFpQ6JPUs5M2Ru87rzuJRhehgEUPUlMbDUfX5rKo4j 9o0gydcvUXNCF0yWZcee9Djx1zKMEvfQO9U97Pwc3t0h/t8R5PZU9GfITx8XJySkhF/bQs nDWqTdinAJmmiKEiHM5NP6EWFXaYyFYHMTrfdaKPTpgTGu1ILqDxfrDWs7UVfiZp3UFbXB /upEXPK8d8FXkmnU46sWtvDGqHIvKo6FTR03lTjAqzyMSYW0w+qsBwSDJqj6+WKPsVf7fs Am1+96+j8uY2XpcY9fhCCAuDkwTLYniMQpbo+Ar+SOwNrnbKGP9MP+AnFtSu3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b69cbfded3ba5224542e65a78ba26d6c8af457d commit 7b69cbfded3ba5224542e65a78ba26d6c8af457d Author: Rainer Hurling AuthorDate: 2022-01-17 08:08:16 +0000 Commit: Rainer Hurling CommitDate: 2022-01-17 08:15:37 +0000 graphics/qgis: Change from Github to QGIS release archive While here, remove unneeded PATCH_SITES. Reported by: Daniel Engberg MFH: 2022Q1 (cherry picked from commit 4565ee62071d27c0b579d94a5f403ab5ca01774a) --- graphics/qgis/Makefile | 13 +++++-------- graphics/qgis/distinfo | 6 +++--- graphics/qgis/pkg-plist | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 1ce50abd6dad..c4d020ff309b 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,11 +1,10 @@ # Created by: Laurent Courty PORTNAME= qgis -DISTVERSIONPREFIX= final- -DISTVERSION= 3_22_3 +PORTVERSION= 3.22.3 +PORTREVISION= 1 CATEGORIES= graphics geography - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +MASTER_SITES= https://qgis.org/downloads/ MAINTAINER= rhurlin@FreeBSD.org COMMENT= Free and Open Source Geographic Information System @@ -106,9 +105,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features desktop-file-utils \ fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \ - shebangfix sqlite:3 -USE_GITHUB= yes -GH_PROJECT= ${PORTNAME:tu} + shebangfix sqlite:3 tar:bz2 USE_GL= gl USE_GNOME= libxml2 USE_LDCONFIG= yes @@ -138,7 +135,7 @@ CMAKE_OFF= WITH_QWTPOLAR CONFLICTS_INSTALL= qgis-ltr -PLIST_SUB= DISTVERSION=${PORTVERSION} +PLIST_SUB= PORTVERSION=${PORTVERSION} .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo index 87e6d4daa917..a0b5207d20f8 100644 --- a/graphics/qgis/distinfo +++ b/graphics/qgis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642337922 -SHA256 (qgis-QGIS-final-3_22_3_GH0.tar.gz) = 8e77db9728bc78de8b5a5a956acc61b35e25ced637cc264107fe78428426aa09 -SIZE (qgis-QGIS-final-3_22_3_GH0.tar.gz) = 160044670 +TIMESTAMP = 1642402647 +SHA256 (qgis-3.22.3.tar.bz2) = e7430c3d9cb5782257916834c7898f3d3a5fc7c359b12d5def7cdb437d757893 +SIZE (qgis-3.22.3.tar.bz2) = 136876983 diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist index b4563540f835..87c135a5ed8f 100644 --- a/graphics/qgis/pkg-plist +++ b/graphics/qgis/pkg-plist @@ -1661,23 +1661,23 @@ include/qgis/ui_qgsvectorlayerpropertiesbase.h include/qgis/util.h include/qgis/vector_tile.pb.h lib/libqgis_3d.so -lib/libqgis_3d.so.%%DISTVERSION%% +lib/libqgis_3d.so.%%PORTVERSION%% lib/libqgis_analysis.so -lib/libqgis_analysis.so.%%DISTVERSION%% +lib/libqgis_analysis.so.%%PORTVERSION%% lib/libqgis_app.so -lib/libqgis_app.so.%%DISTVERSION%% +lib/libqgis_app.so.%%PORTVERSION%% lib/libqgis_core.so -lib/libqgis_core.so.%%DISTVERSION%% +lib/libqgis_core.so.%%PORTVERSION%% lib/libqgis_gui.so -lib/libqgis_gui.so.%%DISTVERSION%% +lib/libqgis_gui.so.%%PORTVERSION%% lib/libqgis_native.so -lib/libqgis_native.so.%%DISTVERSION%% +lib/libqgis_native.so.%%PORTVERSION%% %%SERVER%%lib/libqgis_server.so -%%SERVER%%lib/libqgis_server.so.%%DISTVERSION%% +%%SERVER%%lib/libqgis_server.so.%%PORTVERSION%% %%GRASS%%lib/libqgisgrass7.so -%%GRASS%%lib/libqgisgrass7.so.%%DISTVERSION%% +%%GRASS%%lib/libqgisgrass7.so.%%PORTVERSION%% lib/libqgispython.so -lib/libqgispython.so.%%DISTVERSION%% +lib/libqgispython.so.%%PORTVERSION%% %%PYTHON_SITELIBDIR%%/PyQt5/uic/widget-plugins/qgis_customwidgets.py lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser7 @@ -1723,7 +1723,7 @@ lib/qgis/plugins/libtopolplugin.so %%SERVER%%lib/qgis/server/libwmts.so lib/qgis/untwine %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so -%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.%%DISTVERSION%% +%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.%%PORTVERSION%% %%SERVER%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlspatialite.so man/man1/qgis.1.gz share/applications/org.qgis.qgis.desktop