Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Dec 2023 12:37:39 GMT
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: db9e2b36f9ca - main - kde.mk: fix DESCR for non kf5-ports
Message-ID:  <202312051237.3B5Cbd0B021042@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=db9e2b36f9cac40c1fe86aa4c9ee5ee584d31ff3

commit db9e2b36f9cac40c1fe86aa4c9ee5ee584d31ff3
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-12-05 12:35:32 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-12-05 12:35:32 +0000

    kde.mk: fix DESCR for non kf5-ports
    
    For the kf6 ports we use a single pkg-descr file at the moment, by
    setting DESCR in kde.mk. This was however not guarded behind a check
    for _KDE_VERSION==6, which lead to it being used for kf5-* ports too.
    
    Reported by:    fluffy
---
 Mk/Uses/kde.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 609c37c1638b..8a27b4ae6b83 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -220,7 +220,9 @@ MASTER_SITES?=		KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION
 MASTER_SITES?=		KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION}
 .        endif
 DIST_SUBDIR?=		KDE/frameworks/${KDE_FRAMEWORKS_VERSION}
+.        if ${_KDE_VERSION:M6}
 DESCR=			${.CURDIR:H:H}/x11/kf6-frameworks/pkg-descr
+.        endif
 .      else
 IGNORE?=		unknown CATEGORY value '${_KDE_CATEGORY}' #'
 .      endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312051237.3B5Cbd0B021042>