Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -8238,3 +8238,4 @@
 devel/pecl-inclued||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70)
 security/pecl-taint||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70)
 net/libnids-libnet11|net/libnids|2016-03-20|Same content
+lang/cloudabi-clang|devel/cloudabi-toolchain|2016-03-21|Merged
Index: head/devel/cloudabi-toolchain/Makefile
===================================================================
--- head/devel/cloudabi-toolchain/Makefile
+++ head/devel/cloudabi-toolchain/Makefile
@@ -2,18 +2,59 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi-toolchain
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	devel
+MASTER_SITES=	# None
+DISTFILES=	# None
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	C and C++ toolchain for CloudABI
 
-USES=		metaport
+LICENSE=	MIT
 
-LIBDIR=		${LOCALBASE}/x86_64-unknown-cloudabi/lib
-
-RUN_DEPENDS+=	aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \
-		x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64 \
-		x86_64-unknown-cloudabi-cc:${PORTSDIR}/lang/cloudabi-clang
+RUN_DEPENDS=	clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX} \
+		pkgconf:${PORTSDIR}/devel/pkgconf \
+		aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \
+		x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64
+
+LLVM_SUFFIX=	38
+
+CLOUDABI_ARCHS=	aarch64-unknown-cloudabi x86_64-unknown-cloudabi
+
+LLVM_TOOLS=	ar nm objdump ranlib size
+SHELL_TOOLS=	man pkg-config
+
+.for arch in ${CLOUDABI_ARCHS}
+. for tool in ${LLVM_TOOLS} ${SHELL_TOOLS}
+PLIST_FILES+=	bin/${arch}-${tool}
+. endfor
+PLIST_FILES+=	bin/${arch}-cc bin/${arch}-c++ llvm${LLVM_SUFFIX}/${arch}
+.endfor
+
+do-build:
+.for arch in ${CLOUDABI_ARCHS}
+. for tool in ${SHELL_TOOLS}
+	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' -e 's:%%ARCH%%:${arch}:g' \
+		${FILESDIR}/${tool}.in > ${WRKDIR}/${arch}-${tool}
+. endfor
+.endfor
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}
+.for arch in ${CLOUDABI_ARCHS}
+. for tool in ${LLVM_TOOLS}
+	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/llvm-${tool} \
+		${STAGEDIR}${PREFIX}/bin/${arch}-${tool}
+. endfor
+. for tool in ${SHELL_TOOLS}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${arch}-${tool} \
+		${STAGEDIR}${PREFIX}/bin/${arch}-${tool}
+. endfor
+	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang \
+		${STAGEDIR}${PREFIX}/bin/${arch}-cc
+	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang++ \
+		${STAGEDIR}${PREFIX}/bin/${arch}-c++
+	@${LN} -s ../${arch} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/${arch}
+.endfor
 
 .include <bsd.port.mk>
Index: head/devel/cloudabi-toolchain/files/man.in
===================================================================
--- head/devel/cloudabi-toolchain/files/man.in
+++ head/devel/cloudabi-toolchain/files/man.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+MANPATH=%%PREFIX%%/%%ARCH%%/share/man man "$@"
Index: head/devel/cloudabi-toolchain/files/pkg-config.in
===================================================================
--- head/devel/cloudabi-toolchain/files/pkg-config.in
+++ head/devel/cloudabi-toolchain/files/pkg-config.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+PKG_CONFIG_LIBDIR=%%PREFIX%%/%%ARCH%%/lib/pkgconfig %%PREFIX%%/bin/pkgconf "$@"
Index: head/lang/Makefile
===================================================================
--- head/lang/Makefile
+++ head/lang/Makefile
@@ -42,7 +42,6 @@
     SUBDIR += clang38
     SUBDIR += clojure
     SUBDIR += clojure-mode.el
-    SUBDIR += cloudabi-clang
     SUBDIR += clover
     SUBDIR += cmucl
     SUBDIR += cmucl-extra
Index: head/lang/cloudabi-clang/Makefile
===================================================================
--- head/lang/cloudabi-clang/Makefile
+++ head/lang/cloudabi-clang/Makefile
@@ -1,52 +0,0 @@
-# Created by: Ed Schouten <ed@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	cloudabi-clang
-PORTVERSION=	3.8
-PORTREVISION=	1
-CATEGORIES=	lang
-MASTER_SITES=	# None
-DISTFILES=	# None
-
-MAINTAINER=	ed@FreeBSD.org
-COMMENT=	Clang for CloudABI
-
-LICENSE=	MIT
-
-RUN_DEPENDS=	clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX} \
-		aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \
-		x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64
-
-LLVM_SUFFIX=	${DISTVERSION:S/.//}
-
-NO_BUILD=	yes
-
-CLOUDABI_ARCHS=	aarch64-unknown-cloudabi x86_64-unknown-cloudabi
-
-.for arch in ${CLOUDABI_ARCHS}
-PLIST_FILES+=	bin/${arch}-ar bin/${arch}-cc bin/${arch}-c++ bin/${arch}-nm \
-		bin/${arch}-objdump bin/${arch}-ranlib bin/${arch}-size \
-		llvm${LLVM_SUFFIX}/${arch}
-.endfor
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}
-.for arch in ${CLOUDABI_ARCHS}
-	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/llvm-ar \
-		${STAGEDIR}${PREFIX}/bin/${arch}-ar
-	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang \
-		${STAGEDIR}${PREFIX}/bin/${arch}-cc
-	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang++ \
-		${STAGEDIR}${PREFIX}/bin/${arch}-c++
-	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/llvm-nm \
-		${STAGEDIR}${PREFIX}/bin/${arch}-nm
-	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/llvm-objdump \
-		${STAGEDIR}${PREFIX}/bin/${arch}-objdump
-	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/llvm-ranlib \
-		${STAGEDIR}${PREFIX}/bin/${arch}-ranlib
-	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/llvm-size \
-		${STAGEDIR}${PREFIX}/bin/${arch}-size
-	@${LN} -s ../${arch} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/${arch}
-.endfor
-
-.include <bsd.port.mk>
Index: head/lang/cloudabi-clang/pkg-descr
===================================================================
--- head/lang/cloudabi-clang/pkg-descr
+++ head/lang/cloudabi-clang/pkg-descr
@@ -1,5 +0,0 @@
-The CloudABI environment uses Clang as its C/C++ compiler. This meta
-port installs Clang and sets up symbolic links, so that Clang can be
-used as a cross compiler for CloudABI.
-
-WWW: https://github.com/NuxiNL/cloudlibc