Index: head/devel/dcd-client/pkg-plist
===================================================================
--- head/devel/dcd-client/pkg-plist	(revision 471461)
+++ head/devel/dcd-client/pkg-plist	(revision 471462)
@@ -1,3 +1,3 @@
 bin/dcd-client
-include/d/client/client.d
+include/d/dcd/client/client.d
 man/man1/dcd-client.1.gz
Index: head/devel/dcd-server/Makefile
===================================================================
--- head/devel/dcd-server/Makefile	(revision 471461)
+++ head/devel/dcd-server/Makefile	(revision 471462)
@@ -1,53 +1,54 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dcd
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.6
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES?=	devel
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Auto-complete program for the D programming language (server)
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libemsi_containers.a:devel/containers \
 		${LOCALBASE}/lib/d/libdsymbol.a:devel/dsymbol \
 		${LOCALBASE}/lib/d/libmsgpack-d.a:devel/msgpack-d \
-		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse
+		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse \
+		${LOCALBASE}/lib/d/libstdx-allocator.a:devel/stdx-allocator
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 GH_PROJECT=	DCD
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 DUB_CONFIG?=	server
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dub.json
 
 do-build:
 	@cd ${WRKSRC} && ${DUB_CMD} --config=${DUB_CONFIG}
 .if ${PKGNAMESUFFIX} == "-server"
 	@cd ${WRKSRC} && ${DUB_CMD} --config=library
 .endif
 
 do-install:
-	@${MKDIR} ${STAGEDIR}/${D_INCLUDE_DIR}/${PKGNAMESUFFIX:S/-//}
-	${INSTALL_PROGRAM} ${WRKSRC}/dcd${PKGNAMESUFFIX} ${STAGEDIR}${PREFIX}/bin/
+	@${MKDIR} ${STAGEDIR}/${D_INCLUDE_DIR}/dcd/${PKGNAMESUFFIX:S/-//}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/dcd${PKGNAMESUFFIX} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/man1/dcd${PKGNAMESUFFIX}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	cd ${WRKSRC}/src/${PKGNAMESUFFIX:S/-//} && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR}/${PKGNAMESUFFIX:S/-//} "-name *\.d"
+	cd ${WRKSRC}/src/dcd/${PKGNAMESUFFIX:S/-//} && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR}/dcd/${PKGNAMESUFFIX:S/-//} "-name *\.d"
 .if ${PKGNAMESUFFIX} == "-server"
 	@${MKDIR} ${STAGEDIR}/${D_LIB_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/libdcd.a ${STAGEDIR}${D_LIB_DIR}
 	@${MKDIR} ${STAGEDIR}/${D_INCLUDE_DIR}/common
-	cd ${WRKSRC}/src/common && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR}/common "-name *\.d"
+	cd ${WRKSRC}/src/dcd/common && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR}/dcd/common "-name *\.d"
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/dcd-server/distinfo
===================================================================
--- head/devel/dcd-server/distinfo	(revision 471461)
+++ head/devel/dcd-server/distinfo	(revision 471462)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517522258
-SHA256 (dlang-community-DCD-v0.9.1_GH0.tar.gz) = 00800721a859cb40fc770d9f13ded428152a1cd9eb8e1b841197745cf7184ccd
-SIZE (dlang-community-DCD-v0.9.1_GH0.tar.gz) = 102825
+TIMESTAMP = 1525931074
+SHA256 (dlang-community-DCD-v0.9.6_GH0.tar.gz) = 64f2a05bbccb68a20f7212f84c914c73f9a2a1882dce6a200ab6e27ef0a9087e
+SIZE (dlang-community-DCD-v0.9.6_GH0.tar.gz) = 124990
Index: head/devel/dcd-server/files/patch-dub.json
===================================================================
--- head/devel/dcd-server/files/patch-dub.json	(revision 471461)
+++ head/devel/dcd-server/files/patch-dub.json	(revision 471462)
@@ -1,17 +1,17 @@
---- dub.json.orig	2017-07-03 08:14:25 UTC
-+++ dub.json
-@@ -6,12 +6,9 @@
+--- dub.json.orig	2018-05-07 07:47:46.000000000 -0500
++++ dub.json	2018-05-10 00:47:19.488680000 -0500
+@@ -6,12 +6,8 @@
      "Brian Schott"
    ],
    "license": "GPL-3.0",
 -  "dependencies": {
--    "dsymbol": "~>0.2.8",
--    "libdparse": "~>0.7.1-beta.7",
--    "msgpack-d": "~>1.0.0-beta.3"
+-    "dsymbol": "~>0.3.5",
+-    "libdparse": "~>0.8.1",
+-    "msgpack-d": "~>1.0.0-beta.3",
+-    "stdx-allocator": "~>2.77.0"
 -  },
++  "libs": ["dsymbol","dparse","emsi_containers","msgpack-d","stdx-allocator"],
++  "lflags": ["-L%%LOCALBASE%%/lib/d"],
    "versions": ["built_with_dub"],
-+  "libs": ["dsymbol","dparse","emsi_containers","msgpack-d"],
-+  "lflags": ["-L/usr/local/lib/d"],
    "configurations": [
      {
-       "name": "library",
Index: head/devel/dcd-server/pkg-plist
===================================================================
--- head/devel/dcd-server/pkg-plist	(revision 471461)
+++ head/devel/dcd-server/pkg-plist	(revision 471462)
@@ -1,10 +1,17 @@
 bin/dcd-server
-include/d/common/constants.d
-include/d/common/dcd_version.d
-include/d/common/messages.d
-include/d/common/socket.d
-include/d/server/autocomplete.d
-include/d/server/main.d
-include/d/server/server.d
+include/d/dcd/common/constants.d
+include/d/dcd/common/constants2.d
+include/d/dcd/common/dcd_version.d
+include/d/dcd/common/messages.d
+include/d/dcd/common/socket.d
+include/d/dcd/server/autocomplete/complete.d
+include/d/dcd/server/autocomplete/doc.d
+include/d/dcd/server/autocomplete/localuse.d
+include/d/dcd/server/autocomplete/package.d
+include/d/dcd/server/autocomplete/symbols.d
+include/d/dcd/server/autocomplete/util.d
+include/d/dcd/server/main.d
+include/d/dcd/server/server.d
 lib/d/libdcd.a
 man/man1/dcd-server.1.gz
+@dir include/d/common