From nobody Mon Jan 17 16:24:15 2022 X-Original-To: dev-commits-ports-branches@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 C737A196F20E; Mon, 17 Jan 2022 16:24:16 +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 4Jcy0J2qnCz3GG2; Mon, 17 Jan 2022 16:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642436656; 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=pO9kILK+TlDzFiM5B49hmgn7RdRaSSn25hF2/7jUNQk=; b=b1y/7cIILD8vEt73W32/hdvi/1NjNL4n5x3u2wvG+3vjG/nz+WBl8Pvk9TNfguTstxF/Jg AJN+cxbLcbtaUEVFehLU/XynKget/EXQpKJRodqaXEoe7yq/nERhTRCYVhccekD/t4uBee ld9FpMzHTR6teAWdwDml7rHWbitp2IX333y5fKXM+1roawAFcXJ6COSEgxnXFmlr7C+IPC XCaVxZbGBRXXkhyk/joMR0mouwfSH40Y6wK1CXEPVpzRxBrwqlszycHtp/KCKW65X667T+ IiXLr5Iru+tHXzlO/sGQEEx1vxTbG7Eiph24mHY758doeJTWgeo7rmIo6vz64A== 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 E828110FDB; Mon, 17 Jan 2022 16:24:15 +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 20HGOFsE019446; Mon, 17 Jan 2022 16:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HGOFIf019445; Mon, 17 Jan 2022 16:24:15 GMT (envelope-from git) Date: Mon, 17 Jan 2022 16:24:15 GMT Message-Id: <202201171624.20HGOFIf019445@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: f4493a6fc7e6 - 2022Q1 - graphics/qgis: Change back from PORTVERSION to DISTVERSION List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: f4493a6fc7e6a9703c53e9eaed9629251395cd8a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642436656; 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=pO9kILK+TlDzFiM5B49hmgn7RdRaSSn25hF2/7jUNQk=; b=x2N14SMb7h9vHj4C7crkEsKpyvKlTOP5IhRW2vrhp1ZH6HlK9wDIu09XNR0aYG2rlZaeMR Knfzc6rnELiCGHqdx3JGhHDIgzsLKTWr27KjvETQGLDOjEV4D8/9eDdcEQ59K4jf7d+vpB PLTa8V9fV4XoWzOskZQTlRdHIafB1aej6BII06vsc2161sqMd09VfkvlKubPkpWjPtO6Hd 5tc8u6Fk5auumGZ3lWa61aLttElc+Kx5+HNWzfsaYAwFEgBl1Fq92till/R9Gj2K6SkcEr DhQURSvUbTj0MhRyp5+nPzXbZWhCh6lE9c4JoQiSwq7q1CS/j8Y4CVus5UClAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642436656; a=rsa-sha256; cv=none; b=CKgGlxGbvUlZCSF+pubjdl+wOTlHMf0NXkvYs2SBjYqnk7bkIlpMbT9k5fQajukkLAQJER l4OuLJ4HeGdAuJdlkAXcRMIb5VFYD6TQ/ZXy0SZqBWmTEF3Qatw3NpQM95H2HsiLcn0pLO PNWVpp4i/31reTpsh3TRC4qyrtogy+tpOcS87haH0iDyWUtHZ5+4tCvsgmrCG+ET2UK2Zu Wp/nTcoBPKY5OvfMxxUEw7GF8N7846URlZd2QiVTmbsdhnD3fSLMBJARuZHupfsqvuieEZ G465Aq+BKwGpb/k7mgQQza8jgf6pK5OY43BYYoLhcjutf8i9GBMssaXhGcWcbg== 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=f4493a6fc7e6a9703c53e9eaed9629251395cd8a commit f4493a6fc7e6a9703c53e9eaed9629251395cd8a Author: Rainer Hurling AuthorDate: 2022-01-17 16:17:47 +0000 Commit: Rainer Hurling CommitDate: 2022-01-17 16:24:11 +0000 graphics/qgis: Change back from PORTVERSION to DISTVERSION Reported by: diizzy@ (cherry picked from commit 3068373166f11345e86bde59bc3f59c19a71abd5) --- graphics/qgis/Makefile | 4 ++-- graphics/qgis/pkg-plist | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index c4d020ff309b..b451a8079fc7 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,7 +1,7 @@ # Created by: Laurent Courty PORTNAME= qgis -PORTVERSION= 3.22.3 +DISTVERSION= 3.22.3 PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ @@ -135,7 +135,7 @@ CMAKE_OFF= WITH_QWTPOLAR CONFLICTS_INSTALL= qgis-ltr -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= DISTVERSION=${PORTVERSION} .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist index 87c135a5ed8f..b4563540f835 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.%%PORTVERSION%% +lib/libqgis_3d.so.%%DISTVERSION%% lib/libqgis_analysis.so -lib/libqgis_analysis.so.%%PORTVERSION%% +lib/libqgis_analysis.so.%%DISTVERSION%% lib/libqgis_app.so -lib/libqgis_app.so.%%PORTVERSION%% +lib/libqgis_app.so.%%DISTVERSION%% lib/libqgis_core.so -lib/libqgis_core.so.%%PORTVERSION%% +lib/libqgis_core.so.%%DISTVERSION%% lib/libqgis_gui.so -lib/libqgis_gui.so.%%PORTVERSION%% +lib/libqgis_gui.so.%%DISTVERSION%% lib/libqgis_native.so -lib/libqgis_native.so.%%PORTVERSION%% +lib/libqgis_native.so.%%DISTVERSION%% %%SERVER%%lib/libqgis_server.so -%%SERVER%%lib/libqgis_server.so.%%PORTVERSION%% +%%SERVER%%lib/libqgis_server.so.%%DISTVERSION%% %%GRASS%%lib/libqgisgrass7.so -%%GRASS%%lib/libqgisgrass7.so.%%PORTVERSION%% +%%GRASS%%lib/libqgisgrass7.so.%%DISTVERSION%% lib/libqgispython.so -lib/libqgispython.so.%%PORTVERSION%% +lib/libqgispython.so.%%DISTVERSION%% %%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.%%PORTVERSION%% +%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.%%DISTVERSION%% %%SERVER%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlspatialite.so man/man1/qgis.1.gz share/applications/org.qgis.qgis.desktop