From owner-svn-ports-all@freebsd.org Thu Sep 20 03:47:24 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7781F108BCE0; Thu, 20 Sep 2018 03:47:24 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2E17B7A6D5; Thu, 20 Sep 2018 03:47:24 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 0E0748204; Thu, 20 Sep 2018 03:47:24 +0000 (UTC) From: Jan Beich To: Brooks Davis Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r480151 - head/devel/llvm70 References: <201809200247.w8K2lO74078886@repo.freebsd.org> Date: Thu, 20 Sep 2018 05:47:09 +0200 In-Reply-To: (Jan Beich's message of "Thu, 20 Sep 2018 05:21:50 +0200") Message-ID: <7ejg-7ruq-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2018 03:47:24 -0000 Jan Beich writes: > Brooks Davis 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]$//}