Index: databases/erlfdb/Makefile
===================================================================
--- databases/erlfdb/Makefile
+++ databases/erlfdb/Makefile
@@ -1,24 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	erlfdb
-PORTVERSION=	0.0.0
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.0.0
 CATEGORIES=	databases
 
 MAINTAINER=	dch@FreeBSD.org
-COMMENT=	FoundationDB client in Erlang
+COMMENT=	FoundationDB client in Erlang via FDB C bindings
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libfdb_c.so:databases/foundationdb-devel
-RUN_DEPENDS=	erlang-runtime21>=0:lang/erlang-runtime21
 
 USES=		erlang:rebar
 USE_GITHUB=	yes
-GH_ACCOUNT=	cloudant-labs
+GH_ACCOUNT=	apache
 GH_PROJECT=	couchdb-${PORTNAME}
-GH_TAGNAME=	c89b2d6
-
-MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang21/bin:${PATH}
 
 post-install:
 	@${FIND} -E ${STAGEDIR} -type f  -name *.so \
Index: databases/erlfdb/distinfo
===================================================================
--- databases/erlfdb/distinfo
+++ databases/erlfdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579559156
-SHA256 (cloudant-labs-couchdb-erlfdb-0.0.0-c89b2d6_GH0.tar.gz) = e81a9e686060f9c0e638e623e3c2d5efd9451be9b6c54948745d83a6998e1dbd
-SIZE (cloudant-labs-couchdb-erlfdb-0.0.0-c89b2d6_GH0.tar.gz) = 68922
+TIMESTAMP = 1586340078
+SHA256 (apache-couchdb-erlfdb-v1.0.0_GH0.tar.gz) = e32a8fe8d0d2fdcddb770c11e57625bd9c8121bdc361762cf3948ec10ad749ff
+SIZE (apache-couchdb-erlfdb-v1.0.0_GH0.tar.gz) = 69217
Index: databases/foundationdb-devel/Makefile
===================================================================
--- databases/foundationdb-devel/Makefile
+++ databases/foundationdb-devel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	foundationdb-devel
-DISTVERSION=	7.0.0.a.20190823
-PORTREVISION=	2
+DISTVERSION=	7.0.0.a.20200408
 CATEGORIES=	databases
 
 MAINTAINER=	dch@FreeBSD.org
@@ -20,16 +19,17 @@
 
 USES=		compiler:c++17-lang cmake mono:build python:build shebangfix ssl
 USE_GITHUB=	yes
-GH_ACCOUNT=	wolfspider
-GH_PROJECT=	foundationdb
-GH_TAGNAME=	bc56b13
+GH_ACCOUNT=	skunkwerks
+GH_PROJECT=	fdb
+GH_TAGNAME=	7608cb9
 
 USE_RC_SUBR=	foundationdb
 
-SHEBANG_FILES=	build/csprojtom4.py build/link-wrapper.sh build/vcxprojtom4.py \
-		bindings/c/generate_asm.py
+SHEBANG_FILES=	bindings/c/generate_asm.py
 
-CFLAGS+=	-Wno-implicit-int-float-conversion
+CMAKE_ARGS=	DLibreSSL_ROOT=${OPENSSLLIB}
+CMAKE_OFF=	USE_DTRACE
+CMAKE_ON=	DISABLE_TLS
 
 USERS=		foundationdb
 GROUPS=		foundationdb
Index: databases/foundationdb-devel/distinfo
===================================================================
--- databases/foundationdb-devel/distinfo
+++ databases/foundationdb-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580299391
-SHA256 (wolfspider-foundationdb-7.0.0.a.20190823-bc56b13_GH0.tar.gz) = 70b380a3fa8d4eea94a03ef1874cdd39bd9c705d9a1c902bab758004557343b0
-SIZE (wolfspider-foundationdb-7.0.0.a.20190823-bc56b13_GH0.tar.gz) = 5049549
+TIMESTAMP = 1586381044
+SHA256 (skunkwerks-fdb-7.0.0.a.20200408-7608cb9_GH0.tar.gz) = bc95899eae9c1b009e01aaab1eed5df569807a6aed15a41033c0d2ccd0f639de
+SIZE (skunkwerks-fdb-7.0.0.a.20200408-7608cb9_GH0.tar.gz) = 5306375
Index: databases/foundationdb/Makefile
===================================================================
--- databases/foundationdb/Makefile
+++ databases/foundationdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	foundationdb
 DISTVERSION=	6.1.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 
 MAINTAINER=	dch@FreeBSD.org
@@ -15,16 +15,24 @@
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64
 
-BUILD_DEPENDS=	bash:shells/bash
+_LLVM_VER=	90
+BUILD_DEPENDS=	bash:shells/bash \
+		llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libeio.so:devel/libeio
+RUN_DEPENDS=	llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
 
-USES=		compiler:c++14-lang gmake mono:build python:build shebangfix
+USES=		compiler:c++17-lang gmake mono:build python:build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple
 USE_RC_SUBR=	foundationdb
 SHEBANG_FILES=	build/csprojtom4.py build/link-wrapper.sh build/vcxprojtom4.py \
 		bindings/c/generate_asm.py
+
+CC=		${LOCALBASE}/llvm${_LLVM_VER}/bin/clang
+CXX=		${LOCALBASE}/llvm${_LLVM_VER}/bin/clang++
+CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${_LLVM_VER}/lib/cmake/llvm \
+		-DBUILD_WITH_CLANG=${LOCALBASE}/llvm${_LLVM_VER}
 MAKE_ENV+=	PYTHON=${PYTHON_CMD} TLS_DISABLED=yes
 CXXFLAGS+=	-Wno-varargs -DTLS_DISABLED
 CFLAGS+=	-Wno-implicit-int-float-conversion