From nobody Fri Jan 3 23:57:11 2025 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 4YQ0qX26w9z5kbnY; Fri, 03 Jan 2025 23:57:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQ0qX0zGBz4RSQ; Fri, 3 Jan 2025 23:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735948632; 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=N/okVLNHvMibqPnO9t6P9GoizZuf5/4zyL2hWqHUCds=; b=QD7td9upr4YPwU7J5d6xA7iErGvVsh4RTiRplFRAaIJeEbArJZPXs1tZacW5kCquXJaQ/8 Nm6hJrmErUlanc8MLrP4ZARqTY5vMbG06XlBUWN2QjPZzJ0lKVPqcS9x8UnWtci2aXPjvq Z/G/O4B+k7RX8gSUW3xbbLaKub/Y4bAeF2Ub0zcfNS+gN6QZmrZw6gXN8sTPEU+fK5nChT psvyMyeI3XDZY2xyJylPhDfy8mnEvKgE1hIN0OqrHK1mbrXXz/lNYzz6FIwYdMz2Oe9T9G 1ErLBNxK6Ff8RRN8x3dNNB8nwT7/R9nCYruqphL4zCF2y6p1ITYiL8G60OrAbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735948632; 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=N/okVLNHvMibqPnO9t6P9GoizZuf5/4zyL2hWqHUCds=; b=kbIIrrQ85HXmWBfmQ9TJLFfmirGeCN0t/i/Zjx2q+mQnuYr5KFJOunIxVObBG5rwjcWIpZ JEdRFOU0NMRFkELKc7fewX+DSkLH1fSldkrUxQRaUQ1PuWzWTTbKx49a5mfBKrLtvZa9Mm vJFVkYpOeBWMUv9UWwaDAZGR6aLnCc7Fgp/Xdo2YSa4W7XPMfQyCB55vdkhvpiCArKmmvh Zr1ibRtixWtcNc84QbWjYFrTfn3sK6PqD+otLwL6Rcx51I+rErHoGUuOdXIxh1WuXrTlXN WPXXYlGcOoFVz7VZLtCByiJ6Cf3CjOixEKxHI9Ht1AWGCmiiZLWQ3Jd83ZBiTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735948632; a=rsa-sha256; cv=none; b=H1MUu9NiQJ9iXldErwouXbi3ooN+BrvqBKPfUrz5LoSF6Pcf04IIF1Iy7gwTMSRInppDm3 hIz9v+Nttoh1HAEOG7IABppKjthp/p9yJ+TL576CcYpo5iIEbteZXHTk+91Jsh678x9XgQ 8qgbSGDgCXraZWttKWPS+IvZvZITbit4ORIXagB+59E1CpbS4KOsagzX/REpAcLkUjYsp3 7PXzHbyEHkQiWofp/+yp4cRP//F+5UJ864kBL87JJDHvLbh67K9nvYTf/ZxEaAURejHqa5 ECF9IaPL/2ZvnfLgyeTig34g9a7nb81keIRnM9dxEtQ6NfV9FKndtRHBIn9ilw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ0qX00vJzCwN; Fri, 03 Jan 2025 23:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 503NvBTQ076647; Fri, 3 Jan 2025 23:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503NvBvU076644; Fri, 3 Jan 2025 23:57:11 GMT (envelope-from git) Date: Fri, 3 Jan 2025 23:57:11 GMT Message-Id: <202501032357.503NvBvU076644@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 4f177eced75e - main - devel/llvm*: LICENSE_DIR simplification 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f177eced75e0e3fb1c5a9f782b6810e253265f9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f177eced75e0e3fb1c5a9f782b6810e253265f9 commit 4f177eced75e0e3fb1c5a9f782b6810e253265f9 Author: Brooks Davis AuthorDate: 2025-01-03 01:41:07 +0000 Commit: Brooks Davis CommitDate: 2025-01-03 23:56:56 +0000 devel/llvm*: LICENSE_DIR simplification WRKSRC moved to the top of the source tree with llvm12. As a result, LICENSE_DIR became ${WRKSRC}/llvm. Given that llvm11 the only port that wasn't setting LICENSE_DIR, flip the script and default to ${WRKSRC}/llvm with llvm11 overriding. Sponsored by: DARPA, AFRL --- devel/llvm-cheri/Makefile | 1 - devel/llvm-devel/Makefile | 1 - devel/llvm-devel/Makefile.LICENSE | 2 +- devel/llvm11/Makefile | 1 + devel/llvm12/Makefile | 1 - devel/llvm13/Makefile | 1 - devel/llvm14/Makefile | 1 - devel/llvm15/Makefile | 1 - devel/llvm16/Makefile | 1 - devel/llvm17/Makefile | 1 - devel/llvm18/Makefile | 1 - devel/llvm19/Makefile | 1 - 12 files changed, 2 insertions(+), 11 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index f136859697a3..d75b52ff7bbb 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -8,7 +8,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT?= LLVM and Clang with support for the CHERI architecture WWW?= https://cheri-cpu.org -LICENSE_DIR= ${WRKSRC}/llvm .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE" NOT_FOR_ARCHS= i386 armv6 armv7 powerpc mips diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index e9b8c4c9a0ec..7b6c2f5729c4 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -8,7 +8,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm-devel/Makefile.LICENSE b/devel/llvm-devel/Makefile.LICENSE index 29d0e13d0e0f..1e4b968751ed 100644 --- a/devel/llvm-devel/Makefile.LICENSE +++ b/devel/llvm-devel/Makefile.LICENSE @@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE LLVM LLVM2 MIT PD REGEX LICENSE_COMB= multi -LICENSE_DIR?= ${WRKSRC} +LICENSE_DIR?= ${WRKSRC}/llvm LICENSE_FILE_BSD3CLAUSE?= ${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT LICENSE_FILE_LLVM= ${LICENSE_DIR}/LICENSE.TXT LICENSE_FILE_LLVM2= ${LICENSE_DIR}/LICENSE.TXT diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 6747ec29f8f8..475724ea10da 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -12,6 +12,7 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ +LICENSE_DIR= ${WRKSRC} .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 663b5c056669..6c29b93ff15d 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -12,7 +12,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index ebdead4701b9..75487e8350f6 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -12,7 +12,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index 4a540ab2dc49..e3c5c49365e5 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index f43bd9c92cb5..298595c26034 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LIB_DEPENDS= libzstd.so:archivers/zstd diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index bbd9d65e61c3..2fef08038e6a 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile index ceeb618400d2..c900e9790609 100644 --- a/devel/llvm17/Makefile +++ b/devel/llvm17/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile index 6fada4319531..8b59e35b86af 100644 --- a/devel/llvm18/Makefile +++ b/devel/llvm18/Makefile @@ -11,7 +11,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile index df3582ae5676..58935a654dbe 100644 --- a/devel/llvm19/Makefile +++ b/devel/llvm19/Makefile @@ -12,7 +12,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT