[PATCH 5/5] Move libc++ to apache2 license group

[Michał Górny <mgorny%gentoo.org@localhost>]

---
 external/apache2/Makefile                                     | 4 ++++
 external/{bsd => apache2}/libc++/Makefile                     | 0
 [...]

diff --git a/external/apache2/Makefile b/external/apache2/Makefile
index 3d512bd141b4..c5d3679cfea1 100644
--- a/external/apache2/Makefile
+++ b/external/apache2/Makefile
@@ -6,6 +6,10 @@
 SUBDIR+= argon2
 .endif
 
+.if (${MKLIBCXX} != "no")
+SUBDIR+= libc++
+.endif
+
 .if (${MKLLVM} != "no" || ${MKLLVMRT} != "no")
 SUBDIR+= llvm
 .endif

#[ stripped moves from external/bsd/libc++ to external/apache2/libc++]

diff --git a/external/bsd/Makefile b/external/bsd/Makefile
index 0c274b31fa71..14d0818bf45b 100644
--- a/external/bsd/Makefile
+++ b/external/bsd/Makefile
@@ -24,9 +24,6 @@ SUBDIR+= lutok kyua-testers kyua-cli kyua-atf-compat
 .if (${MKLDAP} != "no")
 SUBDIR+= openldap
 .endif
-.if (${MKLIBCXX} != "no")
-SUBDIR+= libc++
-.endif
 .if (${MKNSD} != "no")
 SUBDIR+= nsd
 .endif
diff --git a/lib/Makefile b/lib/Makefile
index 832d84bf7459..69739fb39e88 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -161,7 +161,7 @@ SUBDIR+=	../external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}/lib	# libbfd depends on li
 .endif
 
 .if (${MKLIBCXX} != "no")
-SUBDIR+=	../external/bsd/libc++
+SUBDIR+=	../external/apache2/libc++
 .endif
 
 .if (${MKGCC} != "no" && ${MKCXX} != "no" && ${MKLIBSTDCXX} != "no")
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index aa1872bc96e2..170218ec1906 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -632,7 +632,7 @@ LDADD+= -lgcc
 .if ${LIBISCXX} != "no"
 LIBCC:=	${CXX}
 . if ${MKLIBCXX} == "yes"
-LIBDPLIBS+=     c++	${.CURDIR}/../../../../../external/bsd/libc++/lib
+LIBDPLIBS+=     c++	${.CURDIR}/../../../../../external/apache2/libc++/lib
 . else
 LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
 . endif
diff --git a/sys/rump/listsrcdirs b/sys/rump/listsrcdirs
index 119e8d45a806..b0098c97e1c0 100644
--- a/sys/rump/listsrcdirs
+++ b/sys/rump/listsrcdirs
@@ -150,8 +150,8 @@ if ${cvsmode}; then
 		src/sys
 
 	iswanted usr && \
-	    echo \!src/external/bsd/libc++/dist/libcxx/test \
-	           src/external/bsd/libc++
+	    echo \!src/external/apache2/libc++/dist/libcxx/test \
+	           src/external/apache2/libc++
 
 	# pick a few useful archs, namely those mentioned in buildrump.sh
 	for arch in ${ARCHS}; do
-- 
2.25.1