git: b42bee5ad6d7 - main - kde.mk: add virtual category 'kde-devel'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 07 Dec 2023 18:04:47 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b42bee5ad6d7c0e0b8e95303caaadb4d63b5bb36
commit b42bee5ad6d7c0e0b8e95303caaadb4d63b5bb36
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-12-07 17:47:30 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
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