From nobody Thu Dec 7 18:04:47 2023 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 4SmMcH2f1Vz53NN0; Thu, 7 Dec 2023 18:04:47 +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 4SmMcH1pB1z4csX; Thu, 7 Dec 2023 18:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701972287; 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=wARW3TsybvmVdNrUM0sVoTpv3f3BObtaFa+f4fVIzkI=; b=nGODu/lEw7Aq2xAWQ6O5SyvYthXfKEtPrBjiCi0X8GAcqLIHcN05rAyM2vBpJT6i0FFaPX BAIkCuwBxYNGhyrdEPlm8VOWZM4ukFCeILnuQnI9QrGnjNiPG86LJduqdiHN7PE1EBkdUD o7xbPyA1N5sSSVS0mu/qXJ66yjy1fYUjmjHdCV2EUxgOPOqGzL8C4c6/vlEQDHLwS/574m trBVNsMShQNnBXZZ1jvFzO6k2pD8n6XTBDMKD+yOIucN4ZyYwrKbgat+KkSvLvz3H/5Bni eKLt8NDecedqxQ6aR4FcQTF+xgde7uapg2RENjrJDp+MJLfEvTQVt0ftbWHoQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701972287; a=rsa-sha256; cv=none; b=jTqrWvpWJKw4w8R7oSJfW8Oa/XOoYzfryXZB1daeJXWVm90zTLUwqO7A9rI3HCQ+9dOmzj o33r7SJfmguuNjrSTXWqvnh6zoFu7JZpNkQP0//mtNRoQi3VDh/MYfuyc/7THj/l7fPM1X oPATvmJiD/333UWAW157kZimzLDleUg+vWD108gKNDBuHBKwkhQEHLw/rHNJ/J5O+Ppf0z p8j0RV2HRt4cCOvIGU4H3aSqVOXcO3t+DPn7cMr0glGsOOMh+Sn15Nx8ZX4hsHTVyzqPx1 WPelnkUZTJnu8IPYJi/4f1vPiIEHOgleVg3aU4TtqZiUxwC8uxTYYNDtEzMlgg== 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=1701972287; 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=wARW3TsybvmVdNrUM0sVoTpv3f3BObtaFa+f4fVIzkI=; b=w+UkyitHpEtwOdbdWsLQdgHv5pDp/taMSBt9OMgOV7RBIUovsIHtmr2YiwX+g3GVXDiwnW 6U9MYIXRvcVZeRETpk5zBYmfpVibsn38DuUat/5uifERw3rJfme/a3d6fMwG+DMS9SiwEs UAY+IhHH6IPuCWvCZdF11A4Qt0VVuXz4tCPIWiYRuWPI2GrNau/9KlGVujXmfhz3h/+bd3 /fmKEtPmMhpGv+U9852xAzKw8FsW4WyUYHhQXz4n0XLtj+utwiGV3QFnRjNf5OS+epMkWf xBnF7DTRbKxuROxnlyj/Y3w9D/ZKJSUbM6SOjqxei0NSkLRg2B7Qoa7qTUWrNQ== 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 4SmMcH0rvPznBN; Thu, 7 Dec 2023 18:04:47 +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 3B7I4l7p002937; Thu, 7 Dec 2023 18:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7I4l2g002934; Thu, 7 Dec 2023 18:04:47 GMT (envelope-from git) Date: Thu, 7 Dec 2023 18:04:47 GMT Message-Id: <202312071804.3B7I4l2g002934@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: b42bee5ad6d7 - main - kde.mk: add virtual category 'kde-devel' 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: b42bee5ad6d7c0e0b8e95303caaadb4d63b5bb36 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b42bee5ad6d7c0e0b8e95303caaadb4d63b5bb36 commit b42bee5ad6d7c0e0b8e95303caaadb4d63b5bb36 Author: Tobias C. Berner AuthorDate: 2023-12-07 17:47:30 +0000 Commit: Tobias C. Berner CommitDate: 2023-12-07 17:52:55 +0000 kde.mk: add virtual category 'kde-devel' Previously we assumed that a port of KDE Gear 24.02-beta1 will use Qt6. So kde:6 was used to determine that the applications version is beta1. However, not all applications will be ported in time of the release as it seems, so we need to have a better way to select the version. For now, the KDE Gear-ports can use (for beta1) CATEGORIES=$main kde kde-applications kde-devel resepectively (for stable version) CATEGORIES=$main kde kde-applications to get the proper DISTVERSION value and environment set up. --- Mk/Uses/kde.mk | 24 +++++++++++++++--------- archivers/ark-devel/Makefile | 2 +- devel/dolphin-plugins-devel/Makefile | 2 +- editors/kate-devel/Makefile | 2 +- graphics/gwenview-devel/Makefile | 2 +- graphics/libkexiv2-devel/Makefile | 3 +-- x11-fm/dolphin-devel/Makefile | 2 +- x11/konsole-devel/Makefile | 2 +- 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 8a27b4ae6b83..1399068dd1da 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -81,10 +81,19 @@ KDE_PLASMA_BRANCH?= ${KDE_PLASMA${_KDE_VERSION}_BRANCH} KDE_FRAMEWORKS_VERSION?= ${KDE_FRAMEWORKS${_KDE_VERSION}_VERSION} KDE_FRAMEWORKS_BRANCH?= ${KDE_FRAMEWORKS${_KDE_VERSION}_BRANCH} -KDE_APPLICATIONS_BRANCH?= ${KDE_APPLICATIONS${_KDE_VERSION}_BRANCH} -KDE_APPLICATIONS_VERSION?= ${KDE_APPLICATIONS${_KDE_VERSION}_VERSION} -KDE_APPLICATIONS_SHLIB_VER?= ${KDE_APPLICATIONS${_KDE_VERSION}_SHLIB_VER} -KDE_APPLICATIONS_SHLIB_G_VER?= ${KDE_APPLICATIONS${_KDE_VERSION}_SHLIB_G_VER} +. if ${CATEGORIES:Mkde-devel} +KDE_APPLICATIONS_BRANCH?= ${KDE_APPLICATIONS6_BRANCH} +KDE_APPLICATIONS_VERSION?= ${KDE_APPLICATIONS6_VERSION} +KDE_APPLICATIONS_SHLIB_VER?= ${KDE_APPLICATIONS6_SHLIB_VER} +KDE_APPLICATIONS_SHLIB_G_VER?= ${KDE_APPLICATIONS6_SHLIB_G_VER} +PKGNAMESUFFIX?= -devel +. else +KDE_APPLICATIONS_BRANCH?= ${KDE_APPLICATIONS5_BRANCH} +KDE_APPLICATIONS_VERSION?= ${KDE_APPLICATIONS5_VERSION} +KDE_APPLICATIONS_SHLIB_VER?= ${KDE_APPLICATIONS5_SHLIB_VER} +KDE_APPLICATIONS_SHLIB_G_VER?= ${KDE_APPLICATIONS5_SHLIB_G_VER} +. endif + # Current KDE desktop. KDE_PLASMA5_VERSION?= 5.27.9 @@ -128,8 +137,8 @@ KDE_PREFIX= ${LOCALBASE} # === CATEGORIES HANDLING -- SETTING DEFAULT VALUES ============================ # Doing MASTER_SITES magic based on the category of the port -_KDE_CATEGORIES_SUPPORTED= kde-applications kde-frameworks kde-plasma -. for cat in ${_KDE_CATEGORIES_SUPPORTED} +_KDE_CATEGORIES_SUPPORTED= kde-applications kde-frameworks kde-plasma kde-devel +. for cat in ${_KDE_CATEGORIES_SUPPORTED:Nkde-devel} . if ${CATEGORIES:M${cat}} . if !defined(_KDE_CATEGORY) _KDE_CATEGORY= ${cat} @@ -188,9 +197,6 @@ DOCSDIR= ${PREFIX}/share/doc PORTDOCS?= HTML/* USE_KDE+= doctools:build . endif -. if ${_KDE_VERSION:M6} -PKGNAMESUFFIX?= -devel -. endif # Further pass along a SHLIB_VER PLIST_SUB PLIST_SUB+= KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_SHLIB_VER} \ KDE_APPLICATIONS_VERSION_SHORT="${KDE_APPLICATIONS_VERSION:R:R}" diff --git a/archivers/ark-devel/Makefile b/archivers/ark-devel/Makefile index 32c67cb13169..92b14faa4302 100644 --- a/archivers/ark-devel/Makefile +++ b/archivers/ark-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= ark DISTVERSION= ${KDE_APPLICATIONS_VERSION} -CATEGORIES= archivers kde kde-applications +CATEGORIES= archivers kde kde-applications kde-devel MAINTAINER= kde@FreeBSD.org COMMENT= Archiving tool for KDE diff --git a/devel/dolphin-plugins-devel/Makefile b/devel/dolphin-plugins-devel/Makefile index c6a86e364fcc..93a0b008ff62 100644 --- a/devel/dolphin-plugins-devel/Makefile +++ b/devel/dolphin-plugins-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= dolphin-plugins DISTVERSION= ${KDE_APPLICATIONS_VERSION} -CATEGORIES= devel kde kde-applications +CATEGORIES= devel kde kde-applications kde-devel MAINTAINER= kde@FreeBSD.org COMMENT= Plugins for Dolphin file manager diff --git a/editors/kate-devel/Makefile b/editors/kate-devel/Makefile index 65711ab0704b..ad19b4b776eb 100644 --- a/editors/kate-devel/Makefile +++ b/editors/kate-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= kate DISTVERSION= ${KDE_APPLICATIONS_VERSION} -CATEGORIES= editors kde kde-applications +CATEGORIES= editors kde kde-applications kde-devel MAINTAINER= kde@FreeBSD.org COMMENT= Basic editor framework for the KDE system diff --git a/graphics/gwenview-devel/Makefile b/graphics/gwenview-devel/Makefile index 2832b2c3dba8..e131b274f25d 100644 --- a/graphics/gwenview-devel/Makefile +++ b/graphics/gwenview-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= gwenview DISTVERSION= ${KDE_APPLICATIONS_VERSION} -CATEGORIES= graphics kde kde-applications +CATEGORIES= graphics kde kde-applications kde-devel MAINTAINER= kde@FreeBSD.org COMMENT= Image viewer and browser for KDE diff --git a/graphics/libkexiv2-devel/Makefile b/graphics/libkexiv2-devel/Makefile index b9ae3b079537..7d0c41d32d97 100644 --- a/graphics/libkexiv2-devel/Makefile +++ b/graphics/libkexiv2-devel/Makefile @@ -1,7 +1,6 @@ PORTNAME= libkexiv2 DISTVERSION= ${KDE_APPLICATIONS_VERSION} -CATEGORIES= graphics kde kde-applications -PKGNAMESUFFIX= -devel +CATEGORIES= graphics kde kde-applications kde-devel MAINTAINER= kde@FreeBSD.org COMMENT= Exiv2 library interface for KDE diff --git a/x11-fm/dolphin-devel/Makefile b/x11-fm/dolphin-devel/Makefile index c2ed8177cdc1..d92e99abd516 100644 --- a/x11-fm/dolphin-devel/Makefile +++ b/x11-fm/dolphin-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= dolphin DISTVERSION= ${KDE_APPLICATIONS_VERSION} -CATEGORIES= x11-fm kde kde-applications +CATEGORIES= x11-fm kde kde-applications kde-devel MAINTAINER= kde@FreeBSD.org COMMENT= KDE filemanager dolphin diff --git a/x11/konsole-devel/Makefile b/x11/konsole-devel/Makefile index e8599e9499be..7ea97ccadbde 100644 --- a/x11/konsole-devel/Makefile +++ b/x11/konsole-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= konsole DISTVERSION= ${KDE_APPLICATIONS_VERSION} -CATEGORIES= x11 kde kde-applications +CATEGORIES= x11 kde kde-applications kde-devel MAINTAINER= kde@FreeBSD.org COMMENT= KDE terminal emulator