Index: head/release/packages/clang.ucl
===================================================================
--- head/release/packages/clang.ucl	(revision 309261)
+++ head/release/packages/clang.ucl	(revision 309262)
@@ -1,24 +1,24 @@
 #
 # $FreeBSD$
 #
 
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
 prefix = "/"
 licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
+licenses = [ NCSA ]
 desc = <<EOD
 %DESC%
 EOD
 deps: {
     FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
 }
 
Index: head/release/packages/lld.ucl
===================================================================
--- head/release/packages/lld.ucl	(nonexistent)
+++ head/release/packages/lld.ucl	(revision 309262)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ NCSA ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Property changes on: head/release/packages/lld.ucl
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/release/packages/lldb.ucl
===================================================================
--- head/release/packages/lldb.ucl	(nonexistent)
+++ head/release/packages/lldb.ucl	(revision 309262)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ NCSA ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Property changes on: head/release/packages/lldb.ucl
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/usr.bin/clang/clang.prog.mk
===================================================================
--- head/usr.bin/clang/clang.prog.mk	(revision 309261)
+++ head/usr.bin/clang/clang.prog.mk	(revision 309262)
@@ -1,21 +1,23 @@
 # $FreeBSD$
 
 .include "${SRCTOP}/lib/clang/clang.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/clang.build.mk"
 
 LIBDEPS+=	clang
 LIBDEPS+=	llvm
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
+PACKAGE=	clang
+
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 
 .include <bsd.prog.mk>
Index: head/usr.bin/clang/lld/Makefile
===================================================================
--- head/usr.bin/clang/lld/Makefile	(revision 309261)
+++ head/usr.bin/clang/lld/Makefile	(revision 309262)
@@ -1,74 +1,75 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 LLVM_SRCS=	${SRCTOP}/contrib/llvm
 LLD_SRCS=	${LLVM_SRCS}/tools/lld
 
+PACKAGE=	lld
 PROG_CXX=	ld.lld
 MAN=
 .if ${MK_LLD_AS_LD} != "no"
 SYMLINKS=	${PROG_CXX} ${BINDIR}/ld
 .endif
 
 CFLAGS+=	-I${LLD_SRCS}/include
 CFLAGS+=	-I${.OBJDIR}
 CFLAGS+=	-I${.OBJDIR}/../../../lib/clang/libllvm
 
 SRCDIR=		tools/lld
 SRCS+=		ELF/Driver.cpp
 SRCS+=		ELF/DriverUtils.cpp
 SRCS+=		ELF/EhFrame.cpp
 SRCS+=		ELF/Error.cpp
 SRCS+=		ELF/ICF.cpp
 SRCS+=		ELF/InputFiles.cpp
 SRCS+=		ELF/InputSection.cpp
 SRCS+=		ELF/LinkerScript.cpp
 SRCS+=		ELF/LTO.cpp
 SRCS+=		ELF/MarkLive.cpp
 SRCS+=		ELF/OutputSections.cpp
 SRCS+=		ELF/Relocations.cpp
 SRCS+=		ELF/ScriptParser.cpp
 SRCS+=		ELF/Strings.cpp
 SRCS+=		ELF/SymbolListFile.cpp
 SRCS+=		ELF/SymbolTable.cpp
 SRCS+=		ELF/Symbols.cpp
 SRCS+=		ELF/Target.cpp
 SRCS+=		ELF/Thunks.cpp
 SRCS+=		ELF/Writer.cpp
 SRCS+=		lib/Config/Version.cpp
 SRCS+=		lib/Core/DefinedAtom.cpp
 SRCS+=		lib/Core/Error.cpp
 SRCS+=		lib/Core/File.cpp
 SRCS+=		lib/Core/LinkingContext.cpp
 SRCS+=		lib/Core/Reader.cpp
 SRCS+=		lib/Core/Resolver.cpp
 SRCS+=		lib/Core/SymbolTable.cpp
 SRCS+=		lib/Core/Writer.cpp
 SRCS+=		tools/lld/lld.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.build.mk"
 
 LIBDEPS+=	llvm
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 LLVM_TBLGEN?=	llvm-tblgen
 ELF/Options.inc: ${LLD_SRCS}/ELF/Options.td
 	${LLVM_TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include \
 	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/tools/lld/ELF/Options.td
 TGHDRS+=	ELF/Options.inc
 
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 LIBADD+=	z
 
 .include <bsd.prog.mk>
Index: head/usr.bin/clang/lldb/Makefile
===================================================================
--- head/usr.bin/clang/lldb/Makefile	(revision 309261)
+++ head/usr.bin/clang/lldb/Makefile	(revision 309262)
@@ -1,31 +1,32 @@
 # $FreeBSD$
 
 .include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
+PACKAGE=	lldb
 PROG_CXX=	lldb
 # Man page directory
 .PATH:		${LLDB_SRCS}/docs
 
 CFLAGS+=	-I${LLDB_SRCS}/include
 
 SRCDIR=		tools/lldb/tools/driver
 SRCS+=		Driver.cpp
 
 .include "${SRCTOP}/lib/clang/clang.build.mk"
 
 LIBDEPS+=	lldb
 LIBDEPS+=	clang
 LIBDEPS+=	llvm
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 LIBADD+=	edit
 LIBADD+=	panel
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 LIBADD+=	z
 
 .include <bsd.prog.mk>
Index: head/usr.bin/clang/llvm.prog.mk
===================================================================
--- head/usr.bin/clang/llvm.prog.mk	(revision 309261)
+++ head/usr.bin/clang/llvm.prog.mk	(revision 309262)
@@ -1,25 +1,27 @@
 # $FreeBSD$
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/llvm.build.mk"
 
 # Special case for the bootstrap-tools phase.
 .if (defined(TOOLS_PREFIX) || ${MACHINE} == "host") && \
     (${PROG_CXX} == "clang-tblgen" || ${PROG_CXX} == "llvm-tblgen")
 LIBDEPS+=	llvmminimal
 .else
 LIBDEPS+=	llvm
 .endif
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
+PACKAGE=	clang
+
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 
 .include <bsd.prog.mk>