From nobody Mon Oct 30 17:09:35 2023 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 4SK0B74xx7z4yB0m; Mon, 30 Oct 2023 17:09:35 +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 4SK0B74L1Xz3V10; Mon, 30 Oct 2023 17:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698685775; 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=3KETS1tm7BxpZmB473lUp2Kz8FPLa2iNuJYVe6QnjoQ=; b=GVm6zcqK2YUqQlakAg0Zr1IOBb28rhrTVTDjIJxXUmb5ps0imAxBfSZRR2GTqJ2WTjRZUK /pNMFWnJ/wGxahe1lJBVWSTmB0bX2oY3CM/vYb//9ScyR8JSm6f9dLTnSYq9TAeFKtnfRi Xnxd6iekyjxdolKT0QNMb56NMvoN+N19odKiu7Hgv1JJ2A5CHuKtvVUAKFwm4cLOx8dNm5 xGXzlWL65a8eXfjDakZ93NaZjQE5dpp9u6YbzVx5YyaMhgMT5nPBHq/Ni8sY9VqTMDT6qv dUsY58N7vzgRPHRGvbiu6sOfPHSvpL94wRRrfSgkRdTKI4WiJMyZZpmkbjiIow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698685775; 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=3KETS1tm7BxpZmB473lUp2Kz8FPLa2iNuJYVe6QnjoQ=; b=dWKtO6LfsL0ZPOdau44k+5spX9x1+/buQffGGpVKcS5s7QHjOCNev+PetDTtGUcf52g6Mi ago/JswDqjUy8qo4I4apdY4/nIpEjUY3/IBgMMN8RR6yEAxyeYDVWEAuXjCDdh1btZ9wMV gcm8VQ7l/wFsJGap8SF2iBnpHkFxRHEPyjhWY3kQGQH7KmHSLY7Vx3w1oAEXlrVi6SBhjQ ebtRxuHf+RktaFEn1l/GAFz8ek8Pm9+XrBv7ji+ZCQT+uP1n8z8dI+ido7DhSJRPpyPdwT suzc7MiOWmFOUszw58p1pTn1Sg/pLlOKXAnSeL9BsbpSTkTneUTOuhiXBSOLlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698685775; a=rsa-sha256; cv=none; b=GPI34lYO0w3gJF8iHN+04S8ZPC+v8GpWR4xUI/GkBxVmBXqgZ3SxbPjqIlDqyv8SJO9TSW G8OlPwC88bU/ObbPB2Rh/NkWW/JrtSgbQMRw830RzdUAAyphqCpBXR5G7wiHFbeeXnc4jT YgsjNibJmlgbYHeJaYP3RrpQL4WEiSqGYSaateOBQKUOOEQU8E/wgrY8YQ9Wf+/ahBgH4S EQuZXqiZgP7uSbrvfoZUxcBUpsXO9IfeFD83Ll8zVm57pMXak27RMrVgL1uWxkHmeVIof6 aXC+EY/nS+ImtTZkA7B0gC7hfZDPCCktqo8H9AMjfXDksuhdqbJLZHdM8G+jAw== 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 4SK0B73J3vzTKW; Mon, 30 Oct 2023 17:09:35 +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 39UH9ZuB046027; Mon, 30 Oct 2023 17:09:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UH9ZEL046024; Mon, 30 Oct 2023 17:09:35 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:09:35 GMT Message-Id: <202310301709.39UH9ZEL046024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: a5b13ac5f050 - main - graphics/qgis: Readd patch to fix flex version 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: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5b13ac5f0508383b447fc52b994975662f94f0f Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5b13ac5f0508383b447fc52b994975662f94f0f commit a5b13ac5f0508383b447fc52b994975662f94f0f Author: Rainer Hurling AuthorDate: 2023-10-30 16:59:22 +0000 Commit: Rainer Hurling CommitDate: 2023-10-30 17:07:30 +0000 graphics/qgis: Readd patch to fix flex version For FreeBSD versions < 1300501 the existing version of FLEX in base is unsufficient. Readd old patch to install the ports version of FLEX. CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find FLEX: Found unsuitable version "2.5.37", but required is at least "2.6" (found /usr/bin/flex) Call Stack (most recent call first): /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:598 (_FPHSA_FAILURE_MESSAGE) /usr/local/share/cmake/Modules/FindFLEX.cmake:269 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) CMakeLists.txt:339 (find_package) Thanks to Martin Birgmeier for reporting. PR: 274793 --- graphics/qgis/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index f3ce0f39b2f4..6a6c40892a08 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,5 +1,6 @@ PORTNAME= qgis DISTVERSION= 3.34.0 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ @@ -157,6 +158,13 @@ SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE .include +# QGIS requires flex >= 2.5.6, see +# https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md +.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501) +BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex +CMAKE_ARGS+= -DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex +.endif + pre-patch: # Only PostgreSQL Client headers, not Server @${REINPLACE_CMD} -e 's|set(POSTGRES_INCLUDE_DIR \$${PostgreSQL_INCLUDE_DIRS})|set(POSTGRES_INCLUDE ${LOCALBASE}/include)|g' \