3 files changed, 40 insertions, 19 deletions

diff --git a/dns/yadifa/Makefile b/dns/yadifa/Makefile
index 346d9e22030d..1163be25deeb 100644
--- a/dns/yadifa/Makefile
+++ b/dns/yadifa/Makefile
@@ -2,30 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	yadifa
-PORTVERSION=	2.0.5
-DISTVERSIONSUFFIX=	-4735
+PORTVERSION=	2.1.0
+DISTVERSIONSUFFIX=	-5055
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://cdn.yadifa.eu/sites/default/files/releases/ LOCAL/mat/yadifa
 
 MAINTAINER=	mat@FreeBSD.org
-COMMENT=	YADIFA is an authoritative Name Server with DNSSEC capabilities
+COMMENT=	Authoritative nameserver with DNSSEC capabilities
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
-WITHOUT=TCL DOCS MESSAGES EXAMPLES RRL NSID
-OPTIONS_DEFINE=	DOCS EXAMPLES TCL RRL MESSAGES NSID
+
+GNU_CONFIGURE=	yes
+USES=		libtool compiler:c11
+USE_OPENSSL=	yes
+CONFIGURE_ARGS=	--localstatedir=/var
+
+OPTIONS_DEFINE=	CTRL DOCS EXAMPLES TCL RRL MESSAGES NSID
 OPTIONS_DEFAULT=	RRL NSID
 OPTIONS_SUB=	yes
 
+CTRL_DESC=	Remote control
 RRL_DESC=	Response Rate Limiting
 MESSAGES_DESC=	Use messages instead of send (if many ip aliases)
 NSID_DESC=	Name Server Identifier Option
 
-GNU_CONFIGURE=	yes
-USES=		libtool compiler:c11 tar:tgz
-USE_OPENSSL=	yes
-CONFIGURE_ARGS=	--localstatedir=/var
-
+CTRL_CONFIGURE_ENABLE=	ctrl
 TCL_USES=	tcl
 TCL_CONFIGURE_ENABLE=	tcl
 RRL_CONFIGURE_ENABLE=	rrl
diff --git a/dns/yadifa/distinfo b/dns/yadifa/distinfo
index fc7ad2a2ca1a..54df174d5213 100644
--- a/dns/yadifa/distinfo
+++ b/dns/yadifa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yadifa-2.0.5-4735.tgz) = 1959962621ef41e8d621dcc879093f0127b9ec38aceb58d86285c70f634ce15a
-SIZE (yadifa-2.0.5-4735.tgz) = 3432608
+SHA256 (yadifa-2.1.0-5055.tar.gz) = b63d34f8051b4d8d0371b414707f4856f5f866460e096c5785d7d8b25a05a1b3
+SIZE (yadifa-2.1.0-5055.tar.gz) = 3458049
diff --git a/dns/yadifa/pkg-plist b/dns/yadifa/pkg-plist
index bf014aa9c21f..1d1c3d82c811 100644
--- a/dns/yadifa/pkg-plist
+++ b/dns/yadifa/pkg-plist
@@ -14,6 +14,7 @@ include/dnscore/buffer_input_stream.h
 include/dnscore/buffer_output_stream.h
 include/dnscore/bytearray_input_stream.h
 include/dnscore/bytearray_output_stream.h
+include/dnscore/bytezarray_output_stream.h
 include/dnscore/chroot.h
 include/dnscore/clone_input_output_stream.h
 include/dnscore/cmdline.h
@@ -38,6 +39,7 @@ include/dnscore/dnskey_rsa.h
 include/dnscore/dnsname.h
 include/dnscore/dnsname_set.h
 include/dnscore/dnssec_errors.h
+include/dnscore/empty-input-stream.h
 include/dnscore/fdtools.h
 include/dnscore/file_input_stream.h
 include/dnscore/file_output_stream.h
@@ -75,8 +77,10 @@ include/dnscore/pid.h
 include/dnscore/pipe_stream.h
 include/dnscore/pool.h
 include/dnscore/print_stream.h
+include/dnscore/ptr_set.h
 include/dnscore/ptr_vector.h
 include/dnscore/random.h
+include/dnscore/rc.h
 include/dnscore/rfc.h
 include/dnscore/serial.h
 include/dnscore/server-setup.h
@@ -87,22 +91,21 @@ include/dnscore/sys_get_cpu_count.h
 include/dnscore/sys_types.h
 include/dnscore/tcp_io_stream.h
 include/dnscore/thread_pool.h
+include/dnscore/threaded_dll_cw.h
 include/dnscore/threaded_nb_mm.h
 include/dnscore/threaded_nbrb.h
 include/dnscore/threaded_queue.h
 include/dnscore/threaded_ringbuffer.h
 include/dnscore/threaded_ringbuffer_cw.h
 include/dnscore/threaded_ringlist.h
-include/dnscore/threaded_sll_cw.h
 include/dnscore/timeformat.h
 include/dnscore/timems.h
-include/dnscore/treeset.h
 include/dnscore/tsig.h
 include/dnscore/typebitmap.h
 include/dnscore/u32_set.h
 include/dnscore/u64_set.h
-include/dnscore/xfr_copy.h
 include/dnscore/xfr_input_stream.h
+include/dnscore/zalloc.h
 include/dnscore/zonefile_reader.h
 include/dnsdb/avl.h
 include/dnsdb/btree.h
@@ -113,13 +116,18 @@ include/dnsdb/dnsrdata.h
 include/dnsdb/dnssec.h
 include/dnsdb/dnssec_config.h
 include/dnsdb/dnssec_keystore.h
-include/dnsdb/dnssec_scheduler.h
 include/dnsdb/dnssec_task.h
 include/dnsdb/dynupdate.h
 include/dnsdb/hash.h
 include/dnsdb/htable.h
 include/dnsdb/htbt.h
 include/dnsdb/icmtl_input_stream.h
+include/dnsdb/journal-cjf-common.h
+include/dnsdb/journal-cjf-idxt.h
+include/dnsdb/journal-cjf-page-cache.h
+include/dnsdb/journal-cjf-page-output-stream.h
+include/dnsdb/journal-cjf-page.h
+include/dnsdb/journal-cjf.h
 include/dnsdb/journal.h
 include/dnsdb/journal_ix.h
 include/dnsdb/nsec.h
@@ -141,12 +149,20 @@ include/dnsdb/nsec_common.h
 include/dnsdb/rr_canonize.h
 include/dnsdb/rrsig.h
 include/dnsdb/rrsig_updater.h
+include/dnsdb/xfr_copy.h
 include/dnsdb/zdb-config-features.h
+include/dnsdb/zdb-lock.h
 include/dnsdb/zdb-zone-answer-axfr.h
 include/dnsdb/zdb-zone-answer-ixfr.h
+include/dnsdb/zdb-zone-arc.h
+include/dnsdb/zdb-zone-find.h
+include/dnsdb/zdb-zone-garbage.h
+include/dnsdb/zdb-zone-journal.h
+include/dnsdb/zdb-zone-lock.h
+include/dnsdb/zdb-zone-path-provider.h
 include/dnsdb/zdb-zone-reader-filter.h
 include/dnsdb/zdb.h
-include/dnsdb/zdb_alloc.h
+include/dnsdb/zdb_cache.h
 include/dnsdb/zdb_config.h
 include/dnsdb/zdb_dnsname.h
 include/dnsdb/zdb_error.h
@@ -168,8 +184,10 @@ include/dnsdb/zdb_zone_write.h
 include/dnslg/config-load.h
 include/dnslg/config-resolver.h
 include/dnslg/dns.h
+include/dnslg/dnslg-config-features.h
 include/dnslg/resolv-conf.h
 include/dnslg/resolv.h
+include/dnszone/dnszone-config-features.h
 include/dnszone/dnszone-config.h
 include/dnszone/dnszone.h
 include/dnszone/hints_file_reader.h
@@ -179,9 +197,10 @@ lib/libdnscore.a
 lib/libdnsdb.a
 lib/libdnslg.a
 lib/libdnszone.a
-man/man1/yadifa.1.gz
-man/man1/yadifad.1.gz
+man/man5/yadifa.rc.5.gz
 man/man5/yadifad.conf.5.gz
+man/man8/yadifa.8.gz
+man/man8/yadifad.8.gz
 sbin/yadifad
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-master.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-slave.conf.example