From nobody Tue Aug 23 08:16:09 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 4MBhrV0qY9z4ZmWX; Tue, 23 Aug 2022 08:16:10 +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 4MBhrV06Mpz3jbD; Tue, 23 Aug 2022 08:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661242570; 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=PKERKzyfvaVq9jJbZC6m47VZHQsnZU2jZQ5IpfmWe14=; b=x7Sh5b9ShrMKlVb98jv/Kw8TIx1BwBFlFq3wUosvQKU9ik7+tTCQw4HVIULkGrSjQF+Hbq SRcY2junoSbaqWXgaPQOKWGDu0iMLf/KP81iWUVrRJXVWdTbmWf49Ft7KzaThxHxdt7XiN N2KyW0W+pUPsjtqv5hx0AHuwEORfTjwGARCwz4IX3G2Orp64gatRa+eDPiLK+Z7jDMxNQC kchW8NLOJl1bCa2PUL27aaEoTAhx6Jfmm3dGK+bSSnDQT4QScsXI9c6ouGW6H8vFaFo1In 76cx+YD2qUJp7O6228ud6SAowRQGmfzkdg49UQKITOWPR78wrvSCDbAdFQP0mQ== 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 4MBhrT6JWGzMjB; Tue, 23 Aug 2022 08:16:09 +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 27N8G9VW093384; Tue, 23 Aug 2022 08:16:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27N8G9dC093383; Tue, 23 Aug 2022 08:16:09 GMT (envelope-from git) Date: Tue, 23 Aug 2022 08:16:09 GMT Message-Id: <202208230816.27N8G9dC093383@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 4851d9b21a5a - main - devel/cmake-gui: flavorize for Qt5 and Qt6 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4851d9b21a5a10449dbb725dd475fd10721f291d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661242570; 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=PKERKzyfvaVq9jJbZC6m47VZHQsnZU2jZQ5IpfmWe14=; b=r4GdixgA6uIUujBsmxraL799DxTqEQ4jTzA46BIwA9m5EV9JxE0U3DEzGNnG0/YZRFVGVC 6Chdl+H6m1dKBgDgoT5uS1tbneNfqn+PQT21rrEGP/kOL8teXSOu5eVEHmW6pQ4tHId5U6 Lw087OiV+AcjFKPnnq8LJKL/S15AYcQIoe7YKrBE8coFhqqAqafLRo3deDBVcpjPtpSohP PoiWPYzsKqcmEPoDosQ3FoX99igoiRZd5Dt9+r/mpLpvnZIyZHnwf7xIRhExFKrF9MDsY/ M7LKRs9Hq3/U/EYsGryJ1josmuhDvtwOLZFDLUtwMC9slpz5y/zFGR6hy7lcmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661242570; a=rsa-sha256; cv=none; b=LIvWD6RzqjDJc8hyOAhxztIT0IJo2dx9MdJbuhsls9plcKi7pQk21WI/Eydc8/qrTz5UPO lZFgl/Hn8VcCL4TIzEUsPana3o6BuqA3vbr/JVyrgsEHNyexBuyRSQAD645eh+XXDr6sGA +K4MgaiNfl9bZ5EFN21mIN4SSX7IXHQW02sCICCLECD8KsHf0sRqoXxmo/tO6nh+BTAcig HEMJGAr8CKEKoS3UFclpu71fTgbyW7mY8Qk+QKtLBFOPeFy3g02Mn3V3ieOA6Gux4myCdG STORuu/Q8/a50pRrjwxJXGbWxtGekisUMjqicoI9QTzunSJAy5LmpAEV8bzcHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4851d9b21a5a10449dbb725dd475fd10721f291d commit 4851d9b21a5a10449dbb725dd475fd10721f291d Author: Tobias C. Berner AuthorDate: 2022-08-23 08:14:27 +0000 Commit: Tobias C. Berner CommitDate: 2022-08-23 08:14:27 +0000 devel/cmake-gui: flavorize for Qt5 and Qt6 --- devel/cmake-gui/Makefile | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index 0bd548ae8df9..579c9d1fbc9f 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -1,8 +1,9 @@ PORTNAME= cmake DISTVERSION= 3.23.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ -PKGNAMESUFFIX= -gui +PKGNAMESUFFIX= -gui-${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Qt-based GUI for CMake @@ -17,24 +18,34 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libuv.so:devel/libuv \ librhash.so:security/rhash +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +qt5_CONFLICTS_INSTALL= cmake-gui-qt6 +qt6_CONFLICTS_INSTALL= cmake-gui-qt5 + USES= cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \ - shared-mime-info qt:5 -USE_QT= core gui widgets buildtools_build qmake_build -CMAKE_OFF= BUILD_CursesDialog \ - CMake_SPHINX_DEPEND_ON_EXECUTABLES + shared-mime-info qt:${FLAVOR:S/qt//} +_USE_QT5= core gui widgets buildtools_build qmake_build +_USE_QT6= base +USE_QT= ${_USE_QT${FLAVOR:S/qt//}} +CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ + -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \ + -DCMake_QT_MAJOR_VERSION=${FLAVOR:S/qt//} CMAKE_ON= BUILD_QtDialog \ CMAKE_USE_SYSTEM_LIBRARIES \ SPHINX_MAN -CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ - -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \ +CMAKE_OFF= BUILD_CursesDialog \ + CMake_SPHINX_DEPEND_ON_EXECUTABLES ALL_TARGET= cmake-gui documentation + +CXXFLAGS+= -D__BSD_VISIBLE + INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialog DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo -CXXFLAGS+= -D__BSD_VISIBLE - post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \