Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -7860,3 +7860,8 @@
 textproc/ruby-xmlconfigfile|textproc/ruby-xml-configfile|2015-09-03|Rename to match our ruby naming
 net/mcast-tools|net/pim6-tools|2015-09-07|Rename
 www/p5-Dancer-Session-Memcached|databases/p5-Dancer-Session-Memcached|2015-09-09|Duplicate port
+devel/cloudabi-cloudlibc||2015-09-12|Moved to the CloudABI Ports Collection
+devel/cloudabi-compiler-rt||2015-09-12|Moved to the CloudABI Ports Collection
+devel/cloudabi-libc++||2015-09-12|Moved to the CloudABI Ports Collection
+devel/cloudabi-libc++abi||2015-09-12|Moved to the CloudABI Ports Collection
+devel/cloudabi-libunwind||2015-09-12|Moved to the CloudABI Ports Collection
Index: head/devel/Makefile
===================================================================
--- head/devel/Makefile
+++ head/devel/Makefile
@@ -255,11 +255,6 @@
     SUBDIR += clisp-hyperspec
     SUBDIR += clojure-cider
     SUBDIR += cloudabi-binutils
-    SUBDIR += cloudabi-cloudlibc
-    SUBDIR += cloudabi-compiler-rt
-    SUBDIR += cloudabi-libc++
-    SUBDIR += cloudabi-libc++abi
-    SUBDIR += cloudabi-libunwind
     SUBDIR += cloudabi-toolchain
     SUBDIR += cmake
     SUBDIR += cmake-fedora
Index: head/devel/cloudabi-cloudlibc/Makefile
===================================================================
--- head/devel/cloudabi-cloudlibc/Makefile
+++ head/devel/cloudabi-cloudlibc/Makefile
@@ -1,32 +0,0 @@
-# Created by: Ed Schouten <ed@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	cloudlibc
-PORTVERSION=	0.4
-CATEGORIES=	devel
-MASTER_SITES=	https://nuxi.nl/distfiles/cloudlibc/
-PKGNAMEPREFIX=	cloudabi-
-
-MAINTAINER=	ed@FreeBSD.org
-COMMENT=	C library for CloudABI
-
-LICENSE=	BSD2CLAUSE
-
-BUILD_DEPENDS=	x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \
-		x86_64-unknown-cloudabi-cc:${PORTSDIR}/lang/cloudabi-clang
-
-USES=		tar:xz
-
-do-build:
-	@cd ${WRKSRC} && \
-		AR=${LOCALBASE}/bin/x86_64-unknown-cloudabi-ar \
-		CC=${LOCALBASE}/bin/x86_64-unknown-cloudabi-cc \
-		${SH} build
-
-do-install:
-	@cd ${WRKSRC} && \
-		DESTDIR=${STAGEDIR} \
-		PREFIX=${PREFIX}/x86_64-unknown-cloudabi \
-		${SH} install
-
-.include <bsd.port.mk>
Index: head/devel/cloudabi-cloudlibc/distinfo
===================================================================
--- head/devel/cloudabi-cloudlibc/distinfo
+++ head/devel/cloudabi-cloudlibc/distinfo
@@ -1,2 +0,0 @@
-SHA256 (cloudlibc-0.4.tar.xz) = ec9892519a2c1711005f7ab7cc4d7f98278ab4f3fcce0466fe57bd4e902b06b1
-SIZE (cloudlibc-0.4.tar.xz) = 633100
Index: head/devel/cloudabi-cloudlibc/pkg-descr
===================================================================
--- head/devel/cloudabi-cloudlibc/pkg-descr
+++ head/devel/cloudabi-cloudlibc/pkg-descr
@@ -1,11 +0,0 @@
-Nuxi CloudABI is an application binary interface for UNIX-like operating
-systems built around the concept of capability-based security. In a
-nutshell, it means that you can run processes directly on top of a UNIX
-kernel while keeping complete control over the actions the process is
-allowed to perform.
-
-cloudlibc is a standard C library built on top of CloudABI. It
-implements almost all features of the C11 standard, but also a large
-part of POSIX.1-2008.
-
-WWW: https://github.com/NuxiNL/cloudlibc
Index: head/devel/cloudabi-cloudlibc/pkg-plist
===================================================================
--- head/devel/cloudabi-cloudlibc/pkg-plist
+++ head/devel/cloudabi-cloudlibc/pkg-plist
@@ -1,81 +0,0 @@
-x86_64-unknown-cloudabi/include/_/arch/x86-64/fenv.h
-x86_64-unknown-cloudabi/include/_/arch/x86-64/setjmp.h
-x86_64-unknown-cloudabi/include/_/cdefs.h
-x86_64-unknown-cloudabi/include/_/endian.h
-x86_64-unknown-cloudabi/include/_/limits.h
-x86_64-unknown-cloudabi/include/_/struct/in_addr.h
-x86_64-unknown-cloudabi/include/_/struct/iovec.h
-x86_64-unknown-cloudabi/include/_/struct/timespec.h
-x86_64-unknown-cloudabi/include/_/types.h
-x86_64-unknown-cloudabi/include/aio.h
-x86_64-unknown-cloudabi/include/argdata.h
-x86_64-unknown-cloudabi/include/arpa/inet.h
-x86_64-unknown-cloudabi/include/assert.h
-x86_64-unknown-cloudabi/include/complex.h
-x86_64-unknown-cloudabi/include/cpio.h
-x86_64-unknown-cloudabi/include/ctype.h
-x86_64-unknown-cloudabi/include/dirent.h
-x86_64-unknown-cloudabi/include/dlfcn.h
-x86_64-unknown-cloudabi/include/elf.h
-x86_64-unknown-cloudabi/include/errno.h
-x86_64-unknown-cloudabi/include/fcntl.h
-x86_64-unknown-cloudabi/include/fenv.h
-x86_64-unknown-cloudabi/include/float.h
-x86_64-unknown-cloudabi/include/fnmatch.h
-x86_64-unknown-cloudabi/include/iconv.h
-x86_64-unknown-cloudabi/include/inttypes.h
-x86_64-unknown-cloudabi/include/iso646.h
-x86_64-unknown-cloudabi/include/langinfo.h
-x86_64-unknown-cloudabi/include/libgen.h
-x86_64-unknown-cloudabi/include/limits.h
-x86_64-unknown-cloudabi/include/link.h
-x86_64-unknown-cloudabi/include/locale.h
-x86_64-unknown-cloudabi/include/math.h
-x86_64-unknown-cloudabi/include/monetary.h
-x86_64-unknown-cloudabi/include/netdb.h
-x86_64-unknown-cloudabi/include/netinet/in.h
-x86_64-unknown-cloudabi/include/poll.h
-x86_64-unknown-cloudabi/include/program.h
-x86_64-unknown-cloudabi/include/pthread.h
-x86_64-unknown-cloudabi/include/regex.h
-x86_64-unknown-cloudabi/include/sched.h
-x86_64-unknown-cloudabi/include/semaphore.h
-x86_64-unknown-cloudabi/include/setjmp.h
-x86_64-unknown-cloudabi/include/signal.h
-x86_64-unknown-cloudabi/include/stdalign.h
-x86_64-unknown-cloudabi/include/stdarg.h
-x86_64-unknown-cloudabi/include/stdatomic.h
-x86_64-unknown-cloudabi/include/stdbool.h
-x86_64-unknown-cloudabi/include/stddef.h
-x86_64-unknown-cloudabi/include/stdint.h
-x86_64-unknown-cloudabi/include/stdio.h
-x86_64-unknown-cloudabi/include/stdlib.h
-x86_64-unknown-cloudabi/include/stdnoreturn.h
-x86_64-unknown-cloudabi/include/string.h
-x86_64-unknown-cloudabi/include/strings.h
-x86_64-unknown-cloudabi/include/sys/capsicum.h
-x86_64-unknown-cloudabi/include/sys/event.h
-x86_64-unknown-cloudabi/include/sys/mman.h
-x86_64-unknown-cloudabi/include/sys/procdesc.h
-x86_64-unknown-cloudabi/include/sys/socket.h
-x86_64-unknown-cloudabi/include/sys/stat.h
-x86_64-unknown-cloudabi/include/sys/time.h
-x86_64-unknown-cloudabi/include/sys/types.h
-x86_64-unknown-cloudabi/include/sys/uio.h
-x86_64-unknown-cloudabi/include/sys/un.h
-x86_64-unknown-cloudabi/include/syslog.h
-x86_64-unknown-cloudabi/include/tar.h
-x86_64-unknown-cloudabi/include/testing.h
-x86_64-unknown-cloudabi/include/tgmath.h
-x86_64-unknown-cloudabi/include/threads.h
-x86_64-unknown-cloudabi/include/time.h
-x86_64-unknown-cloudabi/include/uchar.h
-x86_64-unknown-cloudabi/include/unistd.h
-x86_64-unknown-cloudabi/include/wchar.h
-x86_64-unknown-cloudabi/include/wctype.h
-x86_64-unknown-cloudabi/lib/crt0.o
-x86_64-unknown-cloudabi/lib/crtbegin.o
-x86_64-unknown-cloudabi/lib/crtend.o
-x86_64-unknown-cloudabi/lib/libc.a
-x86_64-unknown-cloudabi/lib/libm.a
-x86_64-unknown-cloudabi/lib/libpthread.a
Index: head/devel/cloudabi-compiler-rt/Makefile
===================================================================
--- head/devel/cloudabi-compiler-rt/Makefile
+++ head/devel/cloudabi-compiler-rt/Makefile
@@ -1,65 +0,0 @@
-# Created by: Ed Schouten <ed@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	compiler-rt
-CATEGORIES=	devel
-
-MAINTAINER=	ed@FreeBSD.org
-COMMENT=	Compiler runtime library for CloudABI
-
-LICENSE=	MIT
-
-PLIST_FILES=	x86_64-unknown-cloudabi/lib/libcompiler_rt.a
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/lib/builtins
-
-# Do not use the CMake build rules provided by compiler-rt. The CMake build
-# rules shipped with compiler-rt depend both on a standard C++ library and a
-# compiler that can generate working executables. In our case we are not
-# capable of generating executables, for the reason that we need an installed
-# copy of compiler-rt.
-#
-# Fall back to generating the object files and the library manually.
-SRCFILES=	absvdi2.c absvsi2.c absvti2.c adddf3.c addsf3.c addtf3.c \
-		addvdi3.c addvsi3.c addvti3.c ashldi3.c ashlti3.c ashrdi3.c \
-		ashrti3.c clear_cache.c clzdi2.c clzsi2.c clzti2.c cmpdi2.c \
-		cmpti2.c comparedf2.c comparesf2.c ctzdi2.c ctzsi2.c ctzti2.c \
-		divdc3.c divdf3.c divdi3.c divmoddi4.c divmodsi4.c divsc3.c \
-		divsf3.c divsi3.c divtf3.c divti3.c divxc3.c \
-		enable_execute_stack.c extendhfsf2.c extendsfdf2.c ffsdi2.c \
-		ffsti2.c fixdfdi.c fixdfsi.c fixdfti.c fixsfdi.c fixsfsi.c \
-		fixsfti.c fixunsdfdi.c fixunsdfsi.c fixunsdfti.c fixunssfdi.c \
-		fixunssfsi.c fixunssfti.c fixunsxfdi.c fixunsxfsi.c \
-		fixunsxfti.c fixxfdi.c fixxfti.c floatsidf.c floatsisf.c \
-		floattidf.c floattisf.c floattixf.c floatunsidf.c \
-		floatunsisf.c floatuntidf.c floatuntisf.c floatuntixf.c \
-		int_util.c lshrdi3.c lshrti3.c moddi3.c modsi3.c modti3.c \
-		muldc3.c muldf3.c muldi3.c mulodi4.c mulosi4.c muloti4.c \
-		mulsc3.c mulsf3.c multf3.c multi3.c mulvdi3.c mulvsi3.c \
-		mulvti3.c mulxc3.c negdf2.c negdi2.c negsf2.c negti2.c \
-		negvdi2.c negvsi2.c negvti2.c paritydi2.c paritysi2.c \
-		parityti2.c popcountdi2.c popcountsi2.c popcountti2.c \
-		powidf2.c powisf2.c powitf2.c powixf2.c subdf3.c subsf3.c \
-		subtf3.c subvdi3.c subvsi3.c subvti3.c trampoline_setup.c \
-		truncdfhf2.c truncdfsf2.c truncsfhf2.c ucmpdi2.c ucmpti2.c \
-		udivdi3.c udivmoddi4.c udivmodsi4.c udivmodti4.c udivsi3.c \
-		udivti3.c umoddi3.c umodsi3.c umodti3.c x86_64/floatdidf.c \
-		x86_64/floatdisf.c x86_64/floatdixf.c x86_64/floatundidf.S \
-		x86_64/floatundisf.S x86_64/floatundixf.S
-
-do-build:
-.for f in ${SRCFILES}
-	${LOCALBASE}/bin/x86_64-unknown-cloudabi-cc -O2 \
-		-c -o ${WRKSRC}/$f.o ${WRKSRC}/$f
-.endfor
-	cd ${WRKSRC}; ${LOCALBASE}/bin/x86_64-unknown-cloudabi-ar -rcs \
-		libcompiler_rt.a ${SRCFILES:S/$/.o/}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/
-	${INSTALL_DATA} ${WRKSRC}/libcompiler_rt.a \
-		${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/
-
-.include "${.CURDIR}/../cloudabi-libc++/Makefile.common"
-
-.include <bsd.port.mk>
Index: head/devel/cloudabi-compiler-rt/pkg-descr
===================================================================
--- head/devel/cloudabi-compiler-rt/pkg-descr
+++ head/devel/cloudabi-compiler-rt/pkg-descr
@@ -1,9 +0,0 @@
-The compiler-rt library provides fallback routines for mathematical
-functions that are not implemented in hardware. For example, when
-compiling for a 32-bit target, converting a double to a 64-bit unsigned
-integer is compiling into a runtime call to the "__fixunsdfdi" function.
-
-This library is a prerequisite for having a working CloudABI toolchain,
-as Clang attempts to link this library into executables unconditionally.
-
-WWW: http://compiler-rt.llvm.org/
Index: head/devel/cloudabi-libc++/Makefile
===================================================================
--- head/devel/cloudabi-libc++/Makefile
+++ head/devel/cloudabi-libc++/Makefile
@@ -1,41 +0,0 @@
-# Created by: Ed Schouten <ed@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	libc++
-CATEGORIES=	devel
-DISTNAME=	libcxx-${DISTVERSION}.src
-DISTFILES=	libcxx-${DISTVERSION}.src${EXTRACT_SUFX} \
-		libcxxabi-${DISTVERSION}.src${EXTRACT_SUFX}
-
-MAINTAINER=	ed@FreeBSD.org
-COMMENT=	C++ standard template library for CloudABI
-
-LICENSE=	MIT
-
-SRCFILES=	algorithm bind chrono condition_variable debug exception \
-		future hash ios iostream locale memory mutex new optional \
-		random regex shared_mutex stdexcept string strstream \
-		system_error thread typeinfo utility valarray
-
-do-build:
-.for f in ${SRCFILES}
-	${LOCALBASE}/bin/x86_64-unknown-cloudabi-c++ \
-		-g -O2 -nostdinc++ -std=c++11 -I${WRKSRC}/include \
-		-I${WRKDIR}/libcxxabi-${DISTVERSION}.src/include \
-		-D_LIBCPP_BUILD_STATIC -DLIBCXX_BUILDING_LIBCXXABI \
-		-c -o ${WRKSRC}/$f.o ${WRKSRC}/src/$f.cpp
-.endfor
-	cd ${WRKSRC}; ${LOCALBASE}/bin/x86_64-unknown-cloudabi-ar -rcs \
-		libc++.a ${SRCFILES:S/$/.o/}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/ \
-		${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/include/c++/
-	${INSTALL_DATA} ${WRKSRC}/libc++.a \
-		${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/
-	@${CP} -r ${WRKSRC}/include \
-		${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/include/c++/v1
-
-.include "${.CURDIR}/Makefile.common"
-
-.include <bsd.port.mk>
Index: head/devel/cloudabi-libc++/Makefile.common
===================================================================
--- head/devel/cloudabi-libc++/Makefile.common
+++ head/devel/cloudabi-libc++/Makefile.common
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-DISTVERSION=	3.7.0rc1
-MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}/
-PKGNAMEPREFIX=	cloudabi-
-DISTNAME?=	${PORTNAME}-${DISTVERSION}.src
-DISTINFO_FILE=	${.CURDIR}/../cloudabi-libc++/distinfo
-
-BUILD_DEPENDS+=	x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \
-		x86_64-unknown-cloudabi-c++:${PORTSDIR}/lang/cloudabi-clang \
-		${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc
-
-LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
-RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
-PRE_=		${DISTVERSION:C/.*rc.*/pre-/:N*[0-9]*}
-LLVM_SUFFIX=	${DISTVERSION:R:S/.//}
-
-USES=		tar:xz
Index: head/devel/cloudabi-libc++/distinfo
===================================================================
--- head/devel/cloudabi-libc++/distinfo
+++ head/devel/cloudabi-libc++/distinfo
@@ -1,8 +0,0 @@
-SHA256 (compiler-rt-3.7.0rc1.src.tar.xz) = bafe3216bee62051ceed91d7eaaccd85f07b1a20e55c8adcfd8d7eea8d7bf211
-SIZE (compiler-rt-3.7.0rc1.src.tar.xz) = 1191260
-SHA256 (libcxx-3.7.0rc1.src.tar.xz) = 9207bb09c83fe8ab6262861f5e5294243763917635cc73579ea333efcf72e686
-SIZE (libcxx-3.7.0rc1.src.tar.xz) = 996500
-SHA256 (libcxxabi-3.7.0rc1.src.tar.xz) = db9bb2f2f71b3b46b91836541f3f55be4a53d977543ff64c2aefc9232d8c17ea
-SIZE (libcxxabi-3.7.0rc1.src.tar.xz) = 507276
-SHA256 (libunwind-3.7.0rc1.src.tar.xz) = 2d52487c3fc4dc2968bb1295d2da541fe667c8e044be0fc1e661f0e49fd01247
-SIZE (libunwind-3.7.0rc1.src.tar.xz) = 59328
Index: head/devel/cloudabi-libc++/files/patch-include_cstdio
===================================================================
--- head/devel/cloudabi-libc++/files/patch-include_cstdio
+++ head/devel/cloudabi-libc++/files/patch-include_cstdio
@@ -1,25 +0,0 @@
---- include/cstdio.orig	2015-06-17 04:49:22 UTC
-+++ include/cstdio
-@@ -151,7 +151,6 @@ using ::setvbuf;
- using ::fprintf;
- using ::fscanf;
- using ::snprintf;
--using ::sprintf;
- using ::sscanf;
- #ifndef _LIBCPP_MSVCRT
- using ::vfprintf;
-@@ -159,14 +158,12 @@ using ::vfscanf;
- using ::vsscanf;
- #endif // _LIBCPP_MSVCRT
- using ::vsnprintf;
--using ::vsprintf;
- using ::fgetc;
- using ::fgets;
- using ::fputc;
- using ::fputs;
- using ::getc;
- using ::putc;
--using ::ungetc;
- using ::fread;
- using ::fwrite;
- using ::fgetpos;
Index: head/devel/cloudabi-libc++/files/patch-include_cstdlib
===================================================================
--- head/devel/cloudabi-libc++/files/patch-include_cstdlib
+++ head/devel/cloudabi-libc++/files/patch-include_cstdlib
@@ -1,10 +0,0 @@
---- include/cstdlib.orig	2015-06-24 08:46:34 UTC
-+++ include/cstdlib
-@@ -118,7 +118,6 @@ using ::strtoul;
- using ::strtoull;
- #endif // _LIBCPP_HAS_NO_LONG_LONG
- using ::rand;
--using ::srand;
- using ::calloc;
- using ::free;
- using ::malloc;
Index: head/devel/cloudabi-libc++/files/patch-include_cstring
===================================================================
--- head/devel/cloudabi-libc++/files/patch-include_cstring
+++ head/devel/cloudabi-libc++/files/patch-include_cstring
@@ -1,13 +0,0 @@
---- include/cstring.orig	2015-06-24 08:46:34 UTC
-+++ include/cstring
-@@ -69,10 +69,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
- using ::size_t;
- using ::memcpy;
- using ::memmove;
--using ::strcpy;
- using ::strncpy;
--using ::strcat;
--using ::strncat;
- using ::memcmp;
- using ::strcmp;
- using ::strncmp;
Index: head/devel/cloudabi-libc++/files/patch-include_cwchar
===================================================================
--- head/devel/cloudabi-libc++/files/patch-include_cwchar
+++ head/devel/cloudabi-libc++/files/patch-include_cwchar
@@ -1,32 +0,0 @@
---- include/cwchar.orig	2015-06-17 04:49:22 UTC
-+++ include/cwchar
-@@ -135,10 +135,8 @@ using ::fgetwc;
- using ::fgetws;
- using ::fputwc;
- using ::fputws;
--using ::fwide;
- using ::getwc;
- using ::putwc;
--using ::ungetwc;
- using ::wcstod;
- #ifndef _LIBCPP_MSVCRT
- using ::wcstof;
-@@ -152,10 +150,7 @@ using ::wcstoul;
- #ifndef _LIBCPP_HAS_NO_LONG_LONG
- using ::wcstoull;
- #endif // _LIBCPP_HAS_NO_LONG_LONG
--using ::wcscpy;
- using ::wcsncpy;
--using ::wcscat;
--using ::wcsncat;
- using ::wcscmp;
- using ::wcscoll;
- using ::wcsncmp;
-@@ -199,7 +194,6 @@ using ::wmemset;
- using ::wcsftime;
- using ::btowc;
- using ::wctob;
--using ::mbsinit;
- using ::mbrlen;
- using ::mbrtowc;
- using ::wcrtomb;
Index: head/devel/cloudabi-libc++/pkg-descr
===================================================================
--- head/devel/cloudabi-libc++/pkg-descr
+++ head/devel/cloudabi-libc++/pkg-descr
@@ -1,5 +0,0 @@
-libc++ is an implementation of the C++ standard library maintained by
-the LLVM project. This package installs a copy of this library as part
-of the CloudABI toolchain.
-
-WWW: http://libcxx.llvm.org/
Index: head/devel/cloudabi-libc++/pkg-plist
===================================================================
--- head/devel/cloudabi-libc++/pkg-plist
+++ head/devel/cloudabi-libc++/pkg-plist
@@ -1,113 +0,0 @@
-x86_64-unknown-cloudabi/include/c++/v1/__bit_reference
-x86_64-unknown-cloudabi/include/c++/v1/__config
-x86_64-unknown-cloudabi/include/c++/v1/__debug
-x86_64-unknown-cloudabi/include/c++/v1/__functional_03
-x86_64-unknown-cloudabi/include/c++/v1/__functional_base
-x86_64-unknown-cloudabi/include/c++/v1/__functional_base_03
-x86_64-unknown-cloudabi/include/c++/v1/__hash_table
-x86_64-unknown-cloudabi/include/c++/v1/__locale
-x86_64-unknown-cloudabi/include/c++/v1/__mutex_base
-x86_64-unknown-cloudabi/include/c++/v1/__refstring
-x86_64-unknown-cloudabi/include/c++/v1/__split_buffer
-x86_64-unknown-cloudabi/include/c++/v1/__sso_allocator
-x86_64-unknown-cloudabi/include/c++/v1/__std_stream
-x86_64-unknown-cloudabi/include/c++/v1/__tree
-x86_64-unknown-cloudabi/include/c++/v1/__tuple
-x86_64-unknown-cloudabi/include/c++/v1/__undef___deallocate
-x86_64-unknown-cloudabi/include/c++/v1/__undef_min_max
-x86_64-unknown-cloudabi/include/c++/v1/algorithm
-x86_64-unknown-cloudabi/include/c++/v1/array
-x86_64-unknown-cloudabi/include/c++/v1/atomic
-x86_64-unknown-cloudabi/include/c++/v1/bitset
-x86_64-unknown-cloudabi/include/c++/v1/cassert
-x86_64-unknown-cloudabi/include/c++/v1/ccomplex
-x86_64-unknown-cloudabi/include/c++/v1/cctype
-x86_64-unknown-cloudabi/include/c++/v1/cerrno
-x86_64-unknown-cloudabi/include/c++/v1/cfenv
-x86_64-unknown-cloudabi/include/c++/v1/cfloat
-x86_64-unknown-cloudabi/include/c++/v1/chrono
-x86_64-unknown-cloudabi/include/c++/v1/cinttypes
-x86_64-unknown-cloudabi/include/c++/v1/ciso646
-x86_64-unknown-cloudabi/include/c++/v1/climits
-x86_64-unknown-cloudabi/include/c++/v1/clocale
-x86_64-unknown-cloudabi/include/c++/v1/cmath
-x86_64-unknown-cloudabi/include/c++/v1/codecvt
-x86_64-unknown-cloudabi/include/c++/v1/complex
-x86_64-unknown-cloudabi/include/c++/v1/complex.h
-x86_64-unknown-cloudabi/include/c++/v1/condition_variable
-x86_64-unknown-cloudabi/include/c++/v1/csetjmp
-x86_64-unknown-cloudabi/include/c++/v1/csignal
-x86_64-unknown-cloudabi/include/c++/v1/cstdarg
-x86_64-unknown-cloudabi/include/c++/v1/cstdbool
-x86_64-unknown-cloudabi/include/c++/v1/cstddef
-x86_64-unknown-cloudabi/include/c++/v1/cstdint
-x86_64-unknown-cloudabi/include/c++/v1/cstdio
-x86_64-unknown-cloudabi/include/c++/v1/cstdlib
-x86_64-unknown-cloudabi/include/c++/v1/cstring
-x86_64-unknown-cloudabi/include/c++/v1/ctgmath
-x86_64-unknown-cloudabi/include/c++/v1/ctime
-x86_64-unknown-cloudabi/include/c++/v1/cwchar
-x86_64-unknown-cloudabi/include/c++/v1/cwctype
-x86_64-unknown-cloudabi/include/c++/v1/deque
-x86_64-unknown-cloudabi/include/c++/v1/exception
-x86_64-unknown-cloudabi/include/c++/v1/experimental/__config
-x86_64-unknown-cloudabi/include/c++/v1/experimental/algorithm
-x86_64-unknown-cloudabi/include/c++/v1/experimental/chrono
-x86_64-unknown-cloudabi/include/c++/v1/experimental/dynarray
-x86_64-unknown-cloudabi/include/c++/v1/experimental/optional
-x86_64-unknown-cloudabi/include/c++/v1/experimental/ratio
-x86_64-unknown-cloudabi/include/c++/v1/experimental/string_view
-x86_64-unknown-cloudabi/include/c++/v1/experimental/system_error
-x86_64-unknown-cloudabi/include/c++/v1/experimental/tuple
-x86_64-unknown-cloudabi/include/c++/v1/experimental/type_traits
-x86_64-unknown-cloudabi/include/c++/v1/experimental/utility
-x86_64-unknown-cloudabi/include/c++/v1/ext/__hash
-x86_64-unknown-cloudabi/include/c++/v1/ext/hash_map
-x86_64-unknown-cloudabi/include/c++/v1/ext/hash_set
-x86_64-unknown-cloudabi/include/c++/v1/forward_list
-x86_64-unknown-cloudabi/include/c++/v1/fstream
-x86_64-unknown-cloudabi/include/c++/v1/functional
-x86_64-unknown-cloudabi/include/c++/v1/future
-x86_64-unknown-cloudabi/include/c++/v1/initializer_list
-x86_64-unknown-cloudabi/include/c++/v1/iomanip
-x86_64-unknown-cloudabi/include/c++/v1/ios
-x86_64-unknown-cloudabi/include/c++/v1/iosfwd
-x86_64-unknown-cloudabi/include/c++/v1/iostream
-x86_64-unknown-cloudabi/include/c++/v1/istream
-x86_64-unknown-cloudabi/include/c++/v1/iterator
-x86_64-unknown-cloudabi/include/c++/v1/limits
-x86_64-unknown-cloudabi/include/c++/v1/list
-x86_64-unknown-cloudabi/include/c++/v1/locale
-x86_64-unknown-cloudabi/include/c++/v1/map
-x86_64-unknown-cloudabi/include/c++/v1/memory
-x86_64-unknown-cloudabi/include/c++/v1/module.modulemap
-x86_64-unknown-cloudabi/include/c++/v1/mutex
-x86_64-unknown-cloudabi/include/c++/v1/new
-x86_64-unknown-cloudabi/include/c++/v1/numeric
-x86_64-unknown-cloudabi/include/c++/v1/ostream
-x86_64-unknown-cloudabi/include/c++/v1/queue
-x86_64-unknown-cloudabi/include/c++/v1/random
-x86_64-unknown-cloudabi/include/c++/v1/ratio
-x86_64-unknown-cloudabi/include/c++/v1/regex
-x86_64-unknown-cloudabi/include/c++/v1/scoped_allocator
-x86_64-unknown-cloudabi/include/c++/v1/set
-x86_64-unknown-cloudabi/include/c++/v1/shared_mutex
-x86_64-unknown-cloudabi/include/c++/v1/sstream
-x86_64-unknown-cloudabi/include/c++/v1/stack
-x86_64-unknown-cloudabi/include/c++/v1/stdexcept
-x86_64-unknown-cloudabi/include/c++/v1/streambuf
-x86_64-unknown-cloudabi/include/c++/v1/string
-x86_64-unknown-cloudabi/include/c++/v1/strstream
-x86_64-unknown-cloudabi/include/c++/v1/system_error
-x86_64-unknown-cloudabi/include/c++/v1/tgmath.h
-x86_64-unknown-cloudabi/include/c++/v1/thread
-x86_64-unknown-cloudabi/include/c++/v1/tuple
-x86_64-unknown-cloudabi/include/c++/v1/type_traits
-x86_64-unknown-cloudabi/include/c++/v1/typeindex
-x86_64-unknown-cloudabi/include/c++/v1/typeinfo
-x86_64-unknown-cloudabi/include/c++/v1/unordered_map
-x86_64-unknown-cloudabi/include/c++/v1/unordered_set
-x86_64-unknown-cloudabi/include/c++/v1/utility
-x86_64-unknown-cloudabi/include/c++/v1/valarray
-x86_64-unknown-cloudabi/include/c++/v1/vector
-x86_64-unknown-cloudabi/lib/libc++.a
Index: head/devel/cloudabi-libc++abi/Makefile
===================================================================
--- head/devel/cloudabi-libc++abi/Makefile
+++ head/devel/cloudabi-libc++abi/Makefile
@@ -1,42 +0,0 @@
-# Created by: Ed Schouten <ed@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	libc++abi
-CATEGORIES=	devel
-DISTNAME=	libcxxabi-${DISTVERSION}.src
-DISTFILES=	libcxxabi-${DISTVERSION}.src${EXTRACT_SUFX} \
-		libunwind-${DISTVERSION}.src${EXTRACT_SUFX}
-
-MAINTAINER=	ed@FreeBSD.org
-COMMENT=	C++ standard library support for CloudABI
-
-LICENSE=	MIT
-
-BUILD_DEPENDS=	${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc++.a:${PORTSDIR}/devel/cloudabi-libc++
-
-PLIST_FILES=	x86_64-unknown-cloudabi/lib/libc++abi.a
-
-SRCFILES=	abort_message cxa_aux_runtime cxa_default_handlers \
-		cxa_demangle cxa_exception cxa_exception_storage cxa_guard \
-		cxa_handlers cxa_new_delete cxa_personality cxa_thread_atexit \
-		cxa_unexpected cxa_vector cxa_virtual exception \
-		private_typeinfo stdexcept typeinfo
-
-do-build:
-.for f in ${SRCFILES}
-	${LOCALBASE}/bin/x86_64-unknown-cloudabi-c++ \
-		-O2 -std=c++11 -I${WRKSRC}/include \
-		-I${WRKDIR}/libunwind-${DISTVERSION}.src/include \
-		-c -o ${WRKSRC}/$f.o ${WRKSRC}/src/$f.cpp
-.endfor
-	cd ${WRKSRC}; ${LOCALBASE}/bin/x86_64-unknown-cloudabi-ar -rcs \
-		libc++abi.a ${SRCFILES:S/$/.o/}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/
-	${INSTALL_DATA} ${WRKSRC}/libc++abi.a \
-		${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/
-
-.include "${.CURDIR}/../cloudabi-libc++/Makefile.common"
-
-.include <bsd.port.mk>
Index: head/devel/cloudabi-libc++abi/pkg-descr
===================================================================
--- head/devel/cloudabi-libc++abi/pkg-descr
+++ head/devel/cloudabi-libc++abi/pkg-descr
@@ -1,6 +0,0 @@
-libc++abi is the C++ support library. It implements low-level language
-features such as type information, name demangling and thread-safe
-initialization of global storage. This port provides a copy of libc++abi
-built for CloudABI.
-
-WWW: http://libcxxabi.llvm.org/
Index: head/devel/cloudabi-libunwind/Makefile
===================================================================
--- head/devel/cloudabi-libunwind/Makefile
+++ head/devel/cloudabi-libunwind/Makefile
@@ -1,39 +0,0 @@
-# Created by: Ed Schouten <ed@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	libunwind
-CATEGORIES=	devel
-DISTFILES=	libcxxabi-${DISTVERSION}.src${EXTRACT_SUFX} \
-		libunwind-${DISTVERSION}.src${EXTRACT_SUFX}
-
-MAINTAINER=	ed@FreeBSD.org
-COMMENT=	C++ exception handling for CloudABI
-
-LICENSE=	MIT
-
-BUILD_DEPENDS=	${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc++.a:${PORTSDIR}/devel/cloudabi-libc++
-
-PLIST_FILES=	x86_64-unknown-cloudabi/lib/libunwind.a
-
-SRCFILES=	Unwind-EHABI.cpp Unwind-sjlj.c UnwindLevel1-gcc-ext.c \
-		UnwindLevel1.c UnwindRegistersRestore.S UnwindRegistersSave.S \
-		libunwind.cpp
-
-do-build:
-.for f in ${SRCFILES}
-	${LOCALBASE}/bin/x86_64-unknown-cloudabi-c++ \
-		-O2 -std=c++11 -I${WRKSRC}/include \
-		-I${WRKDIR}/libcxxabi-${DISTVERSION}.src/include \
-		-c -o ${WRKSRC}/$f.o ${WRKSRC}/src/$f
-.endfor
-	cd ${WRKSRC}; ${LOCALBASE}/bin/x86_64-unknown-cloudabi-ar -rcs \
-		libunwind.a ${SRCFILES:S/$/.o/}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/
-	${INSTALL_DATA} ${WRKSRC}/libunwind.a \
-		${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/
-
-.include "${.CURDIR}/../cloudabi-libc++/Makefile.common"
-
-.include <bsd.port.mk>
Index: head/devel/cloudabi-libunwind/pkg-descr
===================================================================
--- head/devel/cloudabi-libunwind/pkg-descr
+++ head/devel/cloudabi-libunwind/pkg-descr
@@ -1,5 +0,0 @@
-libunwind is a stack unwinder library maintained by the LLVM project. It
-is used when handling exceptions in C++. This port provides a copy of
-libunwind built for CloudABI.
-
-WWW: http://libcxxabi.llvm.org/
Index: head/devel/cloudabi-toolchain/Makefile
===================================================================
--- head/devel/cloudabi-toolchain/Makefile
+++ head/devel/cloudabi-toolchain/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi-toolchain
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	devel
 
 MAINTAINER=	ed@FreeBSD.org
@@ -12,17 +12,7 @@
 
 LIBDIR=		${LOCALBASE}/x86_64-unknown-cloudabi/lib
 
-# C and C++ compiler to be run on the development system.
 RUN_DEPENDS+=	x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \
 		x86_64-unknown-cloudabi-cc:${PORTSDIR}/lang/cloudabi-clang
 
-# Libraries for C language support.
-RUN_DEPENDS+=	${LIBDIR}/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc \
-		${LIBDIR}/libcompiler_rt.a:${PORTSDIR}/devel/cloudabi-compiler-rt
-
-# Libraries for C++ language support.
-RUN_DEPENDS+=	${LIBDIR}/libc++.a:${PORTSDIR}/devel/cloudabi-libc++ \
-		${LIBDIR}/libc++abi.a:${PORTSDIR}/devel/cloudabi-libc++abi \
-		${LIBDIR}/libunwind.a:${PORTSDIR}/devel/cloudabi-libunwind
-
 .include <bsd.port.mk>