From owner-dev-commits-ports-branches@freebsd.org Tue Apr 13 20:55:45 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B9BB5EC51D; Tue, 13 Apr 2021 20:55:45 +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 4FKdDK3v4Vz3MkH; Tue, 13 Apr 2021 20:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7843511579; Tue, 13 Apr 2021 20:55:45 +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 13DKtj23032694; Tue, 13 Apr 2021 20:55:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13DKtjht032693; Tue, 13 Apr 2021 20:55:45 GMT (envelope-from git) Date: Tue, 13 Apr 2021 20:55:45 GMT Message-Id: <202104132055.13DKtjht032693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Adriaan de Groot Subject: git: 3236f55cdc4f - 2021Q2 - Fix KDE_INVENT use MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 3236f55cdc4fa8c030f517486333eb45e6239c5c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 20:55:45 -0000 The branch 2021Q2 has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=3236f55cdc4fa8c030f517486333eb45e6239c5c commit 3236f55cdc4fa8c030f517486333eb45e6239c5c Author: Adriaan de Groot AuthorDate: 2021-04-10 23:31:37 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-13 20:55:43 +0000 Fix KDE_INVENT use Not all GitLab installations are the same; KDE_INVENT is one that still uses the "old" naming scheme, so set WRKSRC for ports that use that (all of which as "this should be a temporary solution until there is a real release again"). Fixes build failures (patch, actually, since the extracted directories didn't match expectations) in e.g. audio/amarok. --- Mk/Uses/kde.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 00d6eebff849..5dc9fc1e14a0 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -131,6 +131,7 @@ GL_SITE= https://invent.kde.org GL_ACCOUNT= ${_invent_category} GL_PROJECT= ${_invent_name} GL_COMMIT= ${_invent_hash} +WRKSRC= ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}-${GL_COMMIT} . endif . endif