From nobody Fri Mar 15 20:45:20 2024 X-Original-To: dev-commits-ports-main@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 4TxGTs0LLkz5Ct3F; Fri, 15 Mar 2024 20:45:21 +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 4TxGTr5M6pz4C8c; Fri, 15 Mar 2024 20:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710535520; 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=/ntDFnZzapPClI9CcZsw3quCfAje1nw7+lSDEbsbk2A=; b=rPXQsspX9DDDCPV1M3U6J1uSE6NWbkOAWkOtUrxbhFKAf6iQPaX0G3uDrQLAHqALAMzu9P c7pc0HlaLmMyW6cakdFPeFjwyTXVNwkHlldX6hU8VKjhtHkk+dk60tbGdnqiSWGSLkK/Of cS+k3Kh7RISObqzcI0Ga+gHbAW/GzQ9h8/9p+h1/dyxSVpIRmfdOll32XEM7aQ1uwnhEhE 3t1GW+nGul4pTu3vJVN0KWR0qBWmx0wtGNLxUw1usj+CqCjx4HsjHwb9yUuJJyZcUq+ZOA XlQnBnQOis/TJyyD9I466gZTmgYzvfrKRvrewuGeNDpu/diXXdLBvsLLnMKTJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710535520; a=rsa-sha256; cv=none; b=ZgdWNWJlBFOsdTNfG+HvklknJzh7GGWU0aqkLh15I5oWtlxRoaPTGP5IZN7mDNdOM1M26g kPY0NvxbojYdRUfd+yPXMdwUScifWVX/BU78tp7ZAxOhrfqXiQ6zEun9RQfs/2+8RZ0Bwf qlvYnMQR8sq+w90Ks2kimuWebNOmWqBn2WNbA+8NgcA06t7fi1e7ELaCHcQUm42vFw3stx lG4ynU6wTmjaKKfrJrrs2Z50y4EqKPNEmIpx4Vx0P0rKI0yNeJgQ+L6iCNSxrDChhgLDkx JdRg4emTTvuj7rDQSPDIExd+lJk0fxx5ZgNIZ8QZXSBidjyi3NZFE+5a3gp8/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710535520; 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=/ntDFnZzapPClI9CcZsw3quCfAje1nw7+lSDEbsbk2A=; b=IKqpab80ZpCQ7WZKH0xm8JEz4YMbAqBQFsN1/rRWEOClsUzJ2wVwCRPyew9GNNM5/DwodZ gr293jOXez/tcf1OALL7DI74f+12gGT6Ze62XLD1tnkP3tIR8H/sR3s6Y6x4uUS2PFymIk oGMzoZSvoex9tl/LOIXFI8ZYAofQ31vT71G70fXvzEoayQOjzlYWCiW1AS8kFfDeF+nLLp GEJnhtnQHHoSNAWR0gGzuDyO1YUOEWxHotnpBtyWRH0E/pFv/ZAyMbPUcEwRysbJmBetQ6 9rlKVGVjAc6TEHFdLqXtVNIWBu5sJTTiqK5CTdweWbNVMr7ga0A7WxMx3xCdNQ== 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 4TxGTr4zGLzQr1; Fri, 15 Mar 2024 20:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42FKjKCP087443; Fri, 15 Mar 2024 20:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FKjKmn087440; Fri, 15 Mar 2024 20:45:20 GMT (envelope-from git) Date: Fri, 15 Mar 2024 20:45:20 GMT Message-Id: <202403152045.42FKjKmn087440@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc?= Bartoletti Subject: git: dcf72144b330 - main - graphics/qgis*: Use GRASS8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcf72144b330cb4c54c7760382a58f1217944413 Auto-Submitted: auto-generated The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=dcf72144b330cb4c54c7760382a58f1217944413 commit dcf72144b330cb4c54c7760382a58f1217944413 Author: Loïc Bartoletti AuthorDate: 2024-03-11 20:32:33 +0000 Commit: Loïc Bartoletti CommitDate: 2024-03-15 20:45:11 +0000 graphics/qgis*: Use GRASS8 Approved by: rhurlin (via mail) --- graphics/qgis-ltr/Makefile | 22 ++++++---------------- graphics/qgis-ltr/pkg-plist | 30 ++++++++++-------------------- graphics/qgis/Makefile | 23 ++++++----------------- graphics/qgis/pkg-plist | 30 ++++++++++-------------------- 4 files changed, 32 insertions(+), 73 deletions(-) diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index 724e998cdde4..157c1ee004b0 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -1,5 +1,6 @@ PORTNAME= qgis DISTVERSION= 3.34.4 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ PKGNAMESUFFIX= -ltr @@ -149,22 +150,17 @@ CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS .endif -OPTIONS_DEFINE= SERVER -OPTIONS_DEFAULT= SERVER GRASS8 -OPTIONS_RADIO= GRASS -OPTIONS_RADIO_GRASS= GRASS7 GRASS8 +OPTIONS_DEFINE= SERVER GRASS +OPTIONS_DEFAULT= SERVER GRASS NO_OPTIONS_SORT= yes OPTIONS_SUB= yes GRASS_DESC= Add GRASS GIS to processing tools SERVER_DESC= Enable QGIS server -GRASS7_BUILD_DEPENDS= grass7:databases/grass7 -GRASS7_RUN_DEPENDS= ${GRASS7_BUILD_DEPENDS} -GRASS7_CMAKE_BOOL= WITH_GRASS7 -GRASS8_BUILD_DEPENDS= grass8:databases/grass8 -GRASS8_RUN_DEPENDS= ${GRASS8_BUILD_DEPENDS} -GRASS8_CMAKE_BOOL= WITH_GRASS8 +GRASS_BUILD_DEPENDS= grass8:databases/grass8 +GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} +GRASS_CMAKE_BOOL= WITH_GRASS8 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE @@ -187,12 +183,6 @@ post-patch: pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 -.if ${PORT_OPTIONS:MGRASS7} || ${PORT_OPTIONS:MGRASS8} -PLIST_SUB+= GRASS="" NO_GRASS="@comment " -.else -PLIST_SUB+= GRASS="@comment " NO_GRASS="" -.endif - post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak diff --git a/graphics/qgis-ltr/pkg-plist b/graphics/qgis-ltr/pkg-plist index db77019a93b3..a1ed32824d2c 100644 --- a/graphics/qgis-ltr/pkg-plist +++ b/graphics/qgis-ltr/pkg-plist @@ -2365,24 +2365,17 @@ lib/libqgis_native.so lib/libqgis_native.so.%%DISTVERSION%% %%SERVER%%lib/libqgis_server.so %%SERVER%%lib/libqgis_server.so.%%DISTVERSION%% -%%GRASS7%%lib/libqgisgrass7.so -%%GRASS8%%lib/libqgisgrass8.so -%%GRASS7%%lib/libqgisgrass7.so.%%DISTVERSION%% -%%GRASS8%%lib/libqgisgrass8.so.%%DISTVERSION%% +%%GRASS%%lib/libqgisgrass8.so +%%GRASS%%lib/libqgisgrass8.so.%%DISTVERSION%% lib/libqgispython.so lib/libqgispython.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PyQt5/uic/widget-plugins/qgis_customwidgets.py lib/qgis/crssync -%%GRASS7%%lib/qgis/grass/bin/qgis.g.browser7 -%%GRASS8%%lib/qgis/grass/bin/qgis.g.browser8 -%%GRASS7%%lib/qgis/grass/modules/qgis.d.rast7 -%%GRASS8%%lib/qgis/grass/modules/qgis.d.rast8 -%%GRASS7%%lib/qgis/grass/modules/qgis.g.info7 -%%GRASS8%%lib/qgis/grass/modules/qgis.g.info8 -%%GRASS7%%lib/qgis/grass/modules/qgis.r.in7 -%%GRASS8%%lib/qgis/grass/modules/qgis.r.in8 -%%GRASS7%%lib/qgis/grass/modules/qgis.v.in7 -%%GRASS8%%lib/qgis/grass/modules/qgis.v.in8 +%%GRASS%%lib/qgis/grass/bin/qgis.g.browser8 +%%GRASS%%lib/qgis/grass/modules/qgis.d.rast8 +%%GRASS%%lib/qgis/grass/modules/qgis.g.info8 +%%GRASS%%lib/qgis/grass/modules/qgis.r.in8 +%%GRASS%%lib/qgis/grass/modules/qgis.v.in8 lib/qgis/pdal_wrench lib/qgis/plugins/libauthmethod_apiheader.so lib/qgis/plugins/libauthmethod_awss3.so @@ -2394,18 +2387,15 @@ lib/qgis/plugins/libauthmethod_oauth2.so lib/qgis/plugins/libauthmethod_pkcs12.so lib/qgis/plugins/libauthmethod_pkipaths.so lib/qgis/plugins/libplugin_geometrychecker.so -%%GRASS7%%lib/qgis/plugins/libplugin_grass7.so -%%GRASS8%%lib/qgis/plugins/libplugin_grass8.so +%%GRASS%%lib/qgis/plugins/libplugin_grass8.so lib/qgis/plugins/libplugin_offlineediting.so lib/qgis/plugins/libplugin_topology.so lib/qgis/plugins/libprovider_arcgisfeatureserver.so lib/qgis/plugins/libprovider_arcgismapserver.so lib/qgis/plugins/libprovider_delimitedtext.so lib/qgis/plugins/libprovider_gpx.so -%%GRASS7%%lib/qgis/plugins/libprovider_grass7.so -%%GRASS8%%lib/qgis/plugins/libprovider_grass8.so -%%GRASS7%%lib/qgis/plugins/libprovider_grassraster7.so -%%GRASS8%%lib/qgis/plugins/libprovider_grassraster8.so +%%GRASS%%lib/qgis/plugins/libprovider_grass8.so +%%GRASS%%lib/qgis/plugins/libprovider_grassraster8.so lib/qgis/plugins/libprovider_mdal.so lib/qgis/plugins/libprovider_mssql.so lib/qgis/plugins/libprovider_pdal.so diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index d1f4a63c6e54..6ecfa05bbff2 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,6 +1,6 @@ PORTNAME= qgis DISTVERSION= 3.36.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ @@ -146,22 +146,17 @@ CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS .endif -OPTIONS_DEFINE= SERVER -OPTIONS_DEFAULT= SERVER GRASS8 -OPTIONS_RADIO= GRASS -OPTIONS_RADIO_GRASS= GRASS7 GRASS8 +OPTIONS_DEFINE= SERVER GRASS +OPTIONS_DEFAULT= SERVER GRASS NO_OPTIONS_SORT= yes OPTIONS_SUB= yes GRASS_DESC= Add GRASS GIS to processing tools SERVER_DESC= Enable QGIS server -GRASS7_BUILD_DEPENDS= grass7:databases/grass7 -GRASS7_RUN_DEPENDS= ${GRASS7_BUILD_DEPENDS} -GRASS7_CMAKE_BOOL= WITH_GRASS7 -GRASS8_BUILD_DEPENDS= grass8:databases/grass8 -GRASS8_RUN_DEPENDS= ${GRASS8_BUILD_DEPENDS} -GRASS8_CMAKE_BOOL= WITH_GRASS8 +GRASS_BUILD_DEPENDS= grass8:databases/grass8 +GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} +GRASS_CMAKE_BOOL= WITH_GRASS8 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE @@ -184,12 +179,6 @@ post-patch: pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 -.if ${PORT_OPTIONS:MGRASS7} || ${PORT_OPTIONS:MGRASS8} -PLIST_SUB+= GRASS="" NO_GRASS="@comment " -.else -PLIST_SUB+= GRASS="@comment " NO_GRASS="" -.endif - post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist index 60d4865bd948..23f61a4b814b 100644 --- a/graphics/qgis/pkg-plist +++ b/graphics/qgis/pkg-plist @@ -2400,24 +2400,17 @@ lib/libqgis_native.so lib/libqgis_native.so.%%DISTVERSION%% %%SERVER%%lib/libqgis_server.so %%SERVER%%lib/libqgis_server.so.%%DISTVERSION%% -%%GRASS7%%lib/libqgisgrass7.so -%%GRASS8%%lib/libqgisgrass8.so -%%GRASS7%%lib/libqgisgrass7.so.%%DISTVERSION%% -%%GRASS8%%lib/libqgisgrass8.so.%%DISTVERSION%% +%%GRASS%%lib/libqgisgrass8.so +%%GRASS%%lib/libqgisgrass8.so.%%DISTVERSION%% lib/libqgispython.so lib/libqgispython.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PyQt5/uic/widget-plugins/qgis_customwidgets.py lib/qgis/crssync -%%GRASS7%%lib/qgis/grass/bin/qgis.g.browser7 -%%GRASS8%%lib/qgis/grass/bin/qgis.g.browser8 -%%GRASS7%%lib/qgis/grass/modules/qgis.d.rast7 -%%GRASS8%%lib/qgis/grass/modules/qgis.d.rast8 -%%GRASS7%%lib/qgis/grass/modules/qgis.g.info7 -%%GRASS8%%lib/qgis/grass/modules/qgis.g.info8 -%%GRASS7%%lib/qgis/grass/modules/qgis.r.in7 -%%GRASS8%%lib/qgis/grass/modules/qgis.r.in8 -%%GRASS7%%lib/qgis/grass/modules/qgis.v.in7 -%%GRASS8%%lib/qgis/grass/modules/qgis.v.in8 +%%GRASS%%lib/qgis/grass/bin/qgis.g.browser8 +%%GRASS%%lib/qgis/grass/modules/qgis.d.rast8 +%%GRASS%%lib/qgis/grass/modules/qgis.g.info8 +%%GRASS%%lib/qgis/grass/modules/qgis.r.in8 +%%GRASS%%lib/qgis/grass/modules/qgis.v.in8 lib/qgis/pdal_wrench lib/qgis/plugins/libauthmethod_apiheader.so lib/qgis/plugins/libauthmethod_awss3.so @@ -2429,18 +2422,15 @@ lib/qgis/plugins/libauthmethod_oauth2.so lib/qgis/plugins/libauthmethod_pkcs12.so lib/qgis/plugins/libauthmethod_pkipaths.so lib/qgis/plugins/libplugin_geometrychecker.so -%%GRASS7%%lib/qgis/plugins/libplugin_grass7.so -%%GRASS8%%lib/qgis/plugins/libplugin_grass8.so +%%GRASS%%lib/qgis/plugins/libplugin_grass8.so lib/qgis/plugins/libplugin_offlineediting.so lib/qgis/plugins/libplugin_topology.so lib/qgis/plugins/libprovider_arcgisfeatureserver.so lib/qgis/plugins/libprovider_arcgismapserver.so lib/qgis/plugins/libprovider_delimitedtext.so lib/qgis/plugins/libprovider_gpx.so -%%GRASS7%%lib/qgis/plugins/libprovider_grass7.so -%%GRASS8%%lib/qgis/plugins/libprovider_grass8.so -%%GRASS7%%lib/qgis/plugins/libprovider_grassraster7.so -%%GRASS8%%lib/qgis/plugins/libprovider_grassraster8.so +%%GRASS%%lib/qgis/plugins/libprovider_grass8.so +%%GRASS%%lib/qgis/plugins/libprovider_grassraster8.so lib/qgis/plugins/libprovider_mdal.so lib/qgis/plugins/libprovider_mssql.so lib/qgis/plugins/libprovider_pdal.so