From 8930262bceba1141aff0a4339e9dd4b864680bd0 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 28 Nov 2016 20:13:56 +0000
Subject: [PATCH] Fix packaging for clang, lldb and lld 3.9.0

During the upgrade of clang/llvm etc to 3.9.0 in r309124, the PACKAGE
directive in the usr.bin/clang/*.mk files got dropped accidentally.

Restore it, with a few minor changes and additions:
* Correct license in clang.ucl to NCSA
* Add PACKAGE=clang for clang and most of the "ll" tools
* Put lldb in its own package
* Put lld in its own package

Reviewed by:	gjb, jmallett
X-MFC-With:	309124
Differential Revision: https://reviews.freebsd.org/D8666
---
 release/packages/clang.ucl  |  2 +-
 release/packages/lld.ucl    | 24 ++++++++++++++++++++++++
 release/packages/lldb.ucl   | 24 ++++++++++++++++++++++++
 usr.bin/clang/clang.prog.mk |  2 ++
 usr.bin/clang/lld/Makefile  |  1 +
 usr.bin/clang/lldb/Makefile |  1 +
 usr.bin/clang/llvm.prog.mk  |  2 ++
 7 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 release/packages/lld.ucl
 create mode 100644 release/packages/lldb.ucl

diff --git a/release/packages/clang.ucl b/release/packages/clang.ucl
index 753c26bc5021..9b2f16fd1451 100644
--- a/release/packages/clang.ucl
+++ b/release/packages/clang.ucl
@@ -11,7 +11,7 @@ maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
 prefix = "/"
 licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
+licenses = [ NCSA ]
 desc = <<EOD
 %DESC%
 EOD
diff --git a/release/packages/lld.ucl b/release/packages/lld.ucl
new file mode 100644
index 000000000000..9b2f16fd1451
--- /dev/null
+++ b/release/packages/lld.ucl
@@ -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%"
+    }
+}
+
diff --git a/release/packages/lldb.ucl b/release/packages/lldb.ucl
new file mode 100644
index 000000000000..9b2f16fd1451
--- /dev/null
+++ b/release/packages/lldb.ucl
@@ -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%"
+    }
+}
+
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 96276ba90112..0ceb9e8ece6f 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -15,6 +15,8 @@ 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
 
diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile
index 65a73f2f4c0f..6a41cd528ff4 100644
--- a/usr.bin/clang/lld/Makefile
+++ b/usr.bin/clang/lld/Makefile
@@ -5,6 +5,7 @@
 LLVM_SRCS=	${SRCTOP}/contrib/llvm
 LLD_SRCS=	${LLVM_SRCS}/tools/lld
 
+PACKAGE=	lld
 PROG_CXX=	ld.lld
 MAN=
 .if ${MK_LLD_AS_LD} != "no"
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 857d6163321e..1bbbb530726e 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -2,6 +2,7 @@
 
 .include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
+PACKAGE=	lldb
 PROG_CXX=	lldb
 # Man page directory
 .PATH:		${LLDB_SRCS}/docs
diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk
index 1c8633216cb0..94fe1eec6424 100644
--- a/usr.bin/clang/llvm.prog.mk
+++ b/usr.bin/clang/llvm.prog.mk
@@ -19,6 +19,8 @@ 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