Date: Thu, 20 Sep 2018 05:47:09 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Brooks Davis <brooks@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r480151 - head/devel/llvm70 Message-ID: <7ejg-7ruq-wny@FreeBSD.org> In-Reply-To: <worg-7t0x-wny@FreeBSD.org> (Jan Beich's message of "Thu, 20 Sep 2018 05:21:50 %2B0200") References: <201809200247.w8K2lO74078886@repo.freebsd.org> <worg-7t0x-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Jan Beich <jbeich@FreeBSD.org> writes:
> Brooks Davis <brooks@FreeBSD.org> writes:
>
>> +LICENSE= LLVM GTEST REGEX MIT ARM PD
> [...]
>> +LICENSE_NAME_GTEST= Google test license
>
> How GTEST license is different from a regular BSD3CLAUSE?
> devel/googletest defines LICENSE=BSD3CLAUSE.
>
>> +LICENSE_FILE_LLVM= ${WRKSRC}/LICENSE.TXT
>
> How LLVM license is different from a regular NCSA?
> https://svnweb.freebsd.org/changeset/ports/409273
>
> A number of ports already use NCSA:
>
> $ git grep -l LICENSE.\*NCSA
> Mk/bsd.licenses.db.mk
> devel/ds2/Makefile
> devel/include-what-you-use/Makefile
> devel/llbuild/Makefile
> devel/zapcc/Makefile
> lang/cling/Makefile
> net/nyancat/Makefile
> security/klee/Makefile
Here's a diff for better digestion:
- Rename LLVM/GTEST -> NCSA/BSD3CLAUSE [1]
- Add LICENSE_FILE for pyyaml
- Convert spaces to tabs (see portlint -C)
- Sort alphabetically
[1] Standardization on license names maybe important for users that define
LICENSES_{ACCEPTED,REJECTED} or LICENSES_GROUPS_{ACCEPTED,REJECTED}
in make.conf
Index: devel/llvm70/Makefile
===================================================================
--- devel/llvm70/Makefile (revision 480151)
+++ devel/llvm70/Makefile (working copy)
@@ -13,22 +13,18 @@ MAINTAINER= brooks@FreeBSD.org
COMMENT= LLVM and Clang
# License are listed in the order they appear in LICENSE.TXT
-LICENSE= LLVM GTEST REGEX MIT ARM PD
-LICENSE_COMB= multi
-LICENSE_NAME_LLVM= LLVM Release License
-LICENSE_NAME_GTEST= Google test license
-LICENSE_NAME_REGEX= OpenBSD Regex License
-# pyyaml tests are under the MIT license
-LICENSE_NAME_ARM= ARM Limited license
+LICENSE= ARM BSD3CLAUSE MIT NCSA PD REGEX
+LICENSE_COMB= multi
+LICENSE_NAME_ARM= ARM Limited license
+LICENSE_NAME_REGEX= OpenBSD Regex License
# md5 is in the public domain
-LICENSE_FILE_LLVM= ${WRKSRC}/LICENSE.TXT
-LICENSE_FILE_GTEST= ${WRKSRC}/utils/unittest/googletest/LICENSE.TXT
-LICENSE_FILE_REGEX= ${WRKSRC}/lib/Support/COPYRIGHT.regex
-LICENSE_FILE_ARM= ${WRKSRC}/lib/Target/ARM/LICENSE.TXT
-LICENSE_PERMS_LLVM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_PERMS_GTEST= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_PERMS_REGEX= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_PERMS_ARM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_FILE_ARM= ${WRKSRC}/lib/Target/ARM/LICENSE.TXT
+LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/utils/unittest/googletest/LICENSE.TXT
+LICENSE_FILE_MIT= ${WRKSRC}/test/YAMLParser/LICENSE.txt
+LICENSE_FILE_NCSA= ${WRKSRC}/LICENSE.TXT
+LICENSE_FILE_REGEX= ${WRKSRC}/lib/Support/COPYRIGHT.regex
+LICENSE_PERMS_REGEX= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_ARM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LLVM_RELEASE= ${DISTVERSION:C/rc.*//}
LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7ejg-7ruq-wny>