Index: head/devel/dcd-client/Makefile
===================================================================
--- head/devel/dcd-client/Makefile	(revision 446441)
+++ head/devel/dcd-client/Makefile	(revision 446442)
@@ -1,13 +1,16 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Auto-complete program for the D programming language (client)
 
 MASTERDIR=	${.CURDIR}/../../devel/dcd-server
+
+PLIST=		${.CURDIR}/pkg-plist
 
 DUB_CONFIG=	client
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/dcd-server/Makefile
===================================================================
--- head/devel/dcd-server/Makefile	(revision 446441)
+++ head/devel/dcd-server/Makefile	(revision 446442)
@@ -1,40 +1,52 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dcd
 PORTVERSION=	0.9.0
+PORTREVISION?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	https://github.com/dlang-community/DCD/archive/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTVERSION:S/^/v/}
 DIST_SUBDIR=	${PORTNAME}-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
 
-PLIST_FILES=	bin/dcd-${PKGNAMESUFFIX:S/-//} \
-		man/man1/dcd${PKGNAMESUFFIX}.1.gz
 WRKSRC=		${WRKDIR}/${PORTNAME:tu}-${PORTVERSION}
-DUB_CMD=	${LOCALBASE}/bin/dub build --build=release --config=${DUB_CONFIG}
+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}
+	@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/
 	${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"
+.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"
+.endif
 
 .include <bsd.port.mk>