Index: head/dns/dnscap/Makefile
===================================================================
--- head/dns/dnscap/Makefile	(revision 461713)
+++ head/dns/dnscap/Makefile	(revision 461714)
@@ -1,36 +1,46 @@
 # Created by: Edwin Groothuis <edwin@mavetju.org>
 # $FreeBSD$
 
 PORTNAME=	dnscap
 PORTVERSION=	1.8.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	dns
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DNS network traffic capture utility
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=	DOCS THREADS
+OPTIONS_DEFINE=	CDS DOCS THREADS
 OPTIONS_DEFAULT=THREADS
+OPTIONS_SUB=	yes
+CDS_DESC=	CBOR DNS Stream (CDS) format (experimental)
 
 CONFIGURE_ARGS=	--enable-shared --enable-static
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		autoreconf libtool
+USES=		autoreconf libtool localbase
 
 GH_ACCOUNT=	DNS-OARC
+# https://github.com/DNS-OARC/dnscap/tree/develop/src
 GH_TUPLE=	DNS-OARC:pcap-thread:v3.1.0:pcap/src/pcap-thread
 USE_GITHUB=	yes
 
+CDS_CONFIGURE_OFF=	ac_cv_lib_ldns_ldns_wire2pkt=no \
+			ac_cv_lib_tinycbor_cbor_parser_init=no
+CDS_LIB_DEPENDS=	libldns.so:dns/ldns \
+			libtinycbor.so:devel/tinycbor
 THREADS_CONFIGURE_ENABLE=	threads
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|\(HAVE_\)\(CBOR_CBOR_H\)|\1TINY\2|; s|cbor/cbor.h|tiny&|' ${WRKSRC}/configure.ac ${WRKSRC}/src/dump_cbor.c ${WRKSRC}/src/dump_cds.c
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^install-data-am: / s| install-dist_docDATA||' ${WRKSRC}/Makefile.am
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/^dist_doc_DATA = / s| LICENSE||' ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
Index: head/dns/dnscap/pkg-plist
===================================================================
--- head/dns/dnscap/pkg-plist	(revision 461713)
+++ head/dns/dnscap/pkg-plist	(revision 461714)
@@ -1,10 +1,16 @@
 bin/dnscap
+%%CDS%%bin/dnscap-rssm-rssac002
 lib/dnscap/pcapdump.a
 lib/dnscap/pcapdump.so
 lib/dnscap/royparse.a
 lib/dnscap/royparse.so
+%%CDS%%lib/dnscap/rssm.a
+%%CDS%%lib/dnscap/rssm.so
+%%CDS%%lib/dnscap/rzkeychange.a
+%%CDS%%lib/dnscap/rzkeychange.so
 lib/dnscap/txtout.a
 lib/dnscap/txtout.so
+%%CDS%%man/man1/dnscap-rssm-rssac002.1.gz
 man/man1/dnscap.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/README.md