From nobody Tue Dec 5 12:37:39 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 4Sl0Rl2L8dz52xHW; Tue, 5 Dec 2023 12:37:39 +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 4Sl0Rl1rBMz4Yvh; Tue, 5 Dec 2023 12:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701779859; 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=2+7A73SmjWAei9inLr4m3SCuRa0utXUBGzZQhlm/rOE=; b=PDU5ScS49gPRp2urCJtTvUrcPuYbe5VDbj92oKQZA/ObS8Wm8QhlnI8S75ylC4N+FqEDuX v4zGU63ftimYOcG9QvG2NNtP7fPjQr6NLls1Lt84HfVLgOZVjioe0fENrbJlbNK0zn2Qgw TUDYS210rLp+PD5Er/mm6Af7uoa9A+evRpEo7C4mzmfQ871c2xZ6vNGYhhlF27cDBWJbvl y7LZs0Ur0I92RiYxXBNyitUjaJn+YEcl8GuAz0/SLcZxdyPrPGXHgJY0hE4YwtvH7SgoWN zKCYscktGKrXoVxnmDGM11x+1ZfZIEGz/cHPozy2Q1eiOk2bd5Oz4sQ1yyzc2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701779859; a=rsa-sha256; cv=none; b=fb7IJa9DlijSQoqqawsauCSpWvliZW7+PwHVyIQZjsJteJoqpmBFGtaK4Bj058QzvPTP9M H7JVU9rEiJV2IoHbVS9EcyFOl7zPlkbP7bsVJJt4he3rVfA4ZpUf3wcHF2LOW9EpTWheox rDJrhTWJmGAJuhkdpQOSAQpL/DDsg3F5YwD/HOVi3xsqpzUTu1MDxss+JnfVChZMMj2KK6 MO1kasrAIw0tBOpBex8K2u2QWfk13Uih97d1/UMpT6WL1via9B5NdO7Lg5bv3hl7YiAnQ1 j6IWqfLx5MjflUO+nuogtGhHTEloA/3t9N/WudGPk4/tixMT1ZQJMVqo9sDxAw== 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=1701779859; 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=2+7A73SmjWAei9inLr4m3SCuRa0utXUBGzZQhlm/rOE=; b=vGacI8lLnqgEl1Uiih0bpX28/Q3xWnVBtJNeD9ltGgg8d2kIEJ5hYv25ZuvDc1VSVCVLmk vNvkjTJRy+DRCKM3acsyZM2Xn0A5+cdmaS3FCDm0y6CUe5WO9NBUFOZJDkah9adX1SX1GO s8yWH68aes9T4B7173rWfQK1QdFBGvueTnP18l+OL/lja7c+kZPXQJBTDNiztKwOQqV+lm JFjzFmM4UnPBm6zan/ld17o1m7VH314YeGZt1Dt66cD9OdfhoZLopvgXjz7ADICd7Dz0as 0VgeDWAcik7C30u8QDPGsFi/RhmM7+WiiZX6CYRBbv8pBZkqxzd8WmdYYaDmRg== 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 4Sl0Rl0vfpz18b8; Tue, 5 Dec 2023 12:37:39 +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 3B5CbdYr021045; Tue, 5 Dec 2023 12:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5Cbd0B021042; Tue, 5 Dec 2023 12:37:39 GMT (envelope-from git) Date: Tue, 5 Dec 2023 12:37:39 GMT Message-Id: <202312051237.3B5Cbd0B021042@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: db9e2b36f9ca - main - kde.mk: fix DESCR for non kf5-ports 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db9e2b36f9cac40c1fe86aa4c9ee5ee584d31ff3 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=db9e2b36f9cac40c1fe86aa4c9ee5ee584d31ff3 commit db9e2b36f9cac40c1fe86aa4c9ee5ee584d31ff3 Author: Tobias C. Berner AuthorDate: 2023-12-05 12:35:32 +0000 Commit: Tobias C. Berner 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