Index: head/devel/argdata/Makefile
===================================================================
--- head/devel/argdata/Makefile
+++ head/devel/argdata/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	argdata
-PORTVERSION=	0.6
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.7
 CATEGORIES=	devel
 
 MAINTAINER=	ed@FreeBSD.org
@@ -12,10 +12,9 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	NuxiNL
-
 USES=		cmake compiler:c11 tar:xz
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	NuxiNL
 
 .include <bsd.port.mk>
Index: head/devel/argdata/distinfo
===================================================================
--- head/devel/argdata/distinfo
+++ head/devel/argdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502984887
-SHA256 (NuxiNL-argdata-v0.6_GH0.tar.gz) = 15983371932190f7488c5e0a597bc4c2510c35ed336cbbfb3407d78e2fbc303e
-SIZE (NuxiNL-argdata-v0.6_GH0.tar.gz) = 26548
+TIMESTAMP = 1504791313
+SHA256 (NuxiNL-argdata-v0.7_GH0.tar.gz) = ed48e65c9e4d1ee0d3d72adee9d7a64690e2afd15e0e4eec799ddf409f89799c
+SIZE (NuxiNL-argdata-v0.7_GH0.tar.gz) = 26849
Index: head/devel/cloudabi/Makefile
===================================================================
--- head/devel/cloudabi/Makefile
+++ head/devel/cloudabi/Makefile
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi
-PORTVERSION=	0.12
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.15
 CATEGORIES=	devel
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	Constants, types and data structures used by CloudABI
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NuxiNL
Index: head/devel/cloudabi/distinfo
===================================================================
--- head/devel/cloudabi/distinfo
+++ head/devel/cloudabi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500995346
-SHA256 (NuxiNL-cloudabi-v0.12_GH0.tar.gz) = e3e9b4045ce9cdece50252107c0b9156c39ce723586cafba5ddb569aa34d2844
-SIZE (NuxiNL-cloudabi-v0.12_GH0.tar.gz) = 109352
+TIMESTAMP = 1504786436
+SHA256 (NuxiNL-cloudabi-v0.15_GH0.tar.gz) = c4dbb8a1c53597cfb0ef1645c1fcd2bbcef91cbfc95cc2e4b2740e5cb42f28f4
+SIZE (NuxiNL-cloudabi-v0.15_GH0.tar.gz) = 104693
Index: head/sysutils/cloudabi-utils/Makefile
===================================================================
--- head/sysutils/cloudabi-utils/Makefile
+++ head/sysutils/cloudabi-utils/Makefile
@@ -2,28 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi-utils
-PORTVERSION=	0.26
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.30
 CATEGORIES=	sysutils
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	Utilities for running CloudABI programs
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 i386
+ONLY_FOR_ARCHS_REASON=	CloudABI has not yet been ported to other architectures
+
+BUILD_DEPENDS=	${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi \
+		${LOCALBASE}/include/flower/protocol/switchboard.ad.h:net/flower \
+		${LOCALBASE}/include/yaml2argdata/yaml_builder.h:devel/yaml2argdata
 LIB_DEPENDS=	libargdata.so:devel/argdata \
-		libyaml.so:textproc/libyaml
+		libarpc.so:devel/arpc \
+		libyaml-cpp.so:devel/yaml-cpp
 
+USES=		cmake localbase:ldflags pkgconfig tar:xz
+USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	NuxiNL
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 i386
-ONLY_FOR_ARCHS_REASON=	CloudABI has not yet been ported to other architectures
+.include <bsd.port.pre.mk>
 
-USES=		cmake compiler:c11 pkgconfig tar:xz
-USE_LDCONFIG=	yes
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100511
+IGNORE=		requires various C++17 features
+.endif
 
-CFLAGS+=	-I${LOCALBASE}/include
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/sysutils/cloudabi-utils/distinfo
===================================================================
--- head/sysutils/cloudabi-utils/distinfo
+++ head/sysutils/cloudabi-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500995361
-SHA256 (NuxiNL-cloudabi-utils-v0.26_GH0.tar.gz) = b48449fa0623b71a25f365a2b7e7f938190d33825113c8948b19f0b9ceac350c
-SIZE (NuxiNL-cloudabi-utils-v0.26_GH0.tar.gz) = 227599
+TIMESTAMP = 1504787087
+SHA256 (NuxiNL-cloudabi-utils-v0.30_GH0.tar.gz) = 7e1483348b322dec8ce1d31202e9d635dbfdfa3a1e46f0675b5e997aa28c0a93
+SIZE (NuxiNL-cloudabi-utils-v0.30_GH0.tar.gz) = 221541