- Update to 1.6.8

PR:		ports/154268
Submitted by:	Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer)
Feature safe:	yes

3 files changed, 43 insertions, 16 deletions

diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 1d7a77a61f0b..152cb3e16ca4 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ldns
-PORTVERSION=	1.6.7
-PORTREVISION=	1
+PORTVERSION=	1.6.8
 CATEGORIES=	dns
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/
 
@@ -23,6 +22,7 @@ USE_LDCONFIG=	yes
 
 OPTIONS=	DOCS "With documentation" Off \
 		EXAMPLES "With example programs" Off \
+		DRILL "With drill program" Off \
 		GOST "GOST signatures enabled (requires openssl >= 1.0.0)" Off \
 		ECDSA "With highly experimental ECDSA support" Off
 
@@ -230,26 +230,23 @@ NO_GOST=		--disable-gost
 CONFIGURE_ARGS+=	${NO_GOST}
 .endif
 
+.if defined(WITH_DRILL)
+PLIST_SUB+=		DRILLPROG=""
+MAN1+=	drill.1
+.else
+PLIST_SUB+=		DRILLPROG="@comment "
+.endif
+
 .if defined(WITH_EXAMPLES)
 PLIST_SUB+=		EXAMPLES=""
 NOMANCOMPRESS=	true
 MANCOMPRESSED=	no
-MAN1=	ldns-chaos.1 ldns-compare-zones.1 ldns-dpa.1 ldns-key2ds.1 \
+MAN1+=	ldns-chaos.1 ldns-compare-zones.1 ldns-dpa.1 ldns-key2ds.1 \
 	ldns-keyfetcher.1 ldns-keygen.1 ldns-mx.1 ldns-notify.1 \
 	ldns-nsec3-hash.1 ldns-read-zone.1 ldns-resolver.1 ldns-revoke.1 \
 	ldns-rrsig.1 ldns-signzone.1 ldns-testns.1 ldns-update.1 \
 	ldns-verify-zone.1 ldns-version.1 ldns-walk.1 ldns-zcat.1 \
-	ldns-zsplit.1 ldnsd.1
-post-configure:
-	@(cd ${WRKSRC}/examples; ./configure --prefix=${PREFIX} \
-		--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man \
-		--build=${CONFIGURE_TARGET} ${NO_GOST} ${NO_SHA2})
-
-post-build:
-	@(cd ${WRKSRC}/examples; ${GMAKE})
-
-post-install:
-	@(cd ${WRKSRC}/examples; ${GMAKE} install)
+	ldns-zsplit.1 ldnsd.1 ldns-test-edns.1
 .else
 PLIST_SUB+=		EXAMPLES="@comment "
 .endif
@@ -263,4 +260,32 @@ NO_SHA2=		--disable-sha2
 CONFIGURE_ARGS+=	${NO_SHA2}
 .endif
 
+post-configure:
+.if defined(WITH_EXAMPLES)
+	@(cd ${WRKSRC}/examples; ./configure --prefix=${PREFIX} \
+		--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man \
+		--build=${CONFIGURE_TARGET} ${NO_GOST} ${NO_SHA2})
+.endif
+.if defined(WITH_DRILL)
+	@(cd ${WRKSRC}/drill; ./configure --prefix=${PREFIX} \
+		--mandir=${MANPREFIX}/man \
+		--build=${CONFIGURE_TARGET})
+.endif
+
+post-build:
+.if defined(WITH_EXAMPLES)
+	 @(cd ${WRKSRC}/examples; ${GMAKE})
+.endif
+.if defined(WITH_DRILL)
+	 @(cd ${WRKSRC}/drill; ${GMAKE})
+.endif
+
+post-install:
+.if defined(WITH_EXAMPLES)
+	@(cd ${WRKSRC}/examples; ${GMAKE} install)
+.endif
+.if defined(WITH_DRILL)
+	@(cd ${WRKSRC}/drill; ${GMAKE} install)
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/dns/ldns/distinfo b/dns/ldns/distinfo
index 8b9eb2943288..3e2decfbe4c1 100644
--- a/dns/ldns/distinfo
+++ b/dns/ldns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ldns-1.6.7.tar.gz) = f718b28c9b5243ea6aba8514581d746974161eb5d6781bdbbe46f5ce13294ba8
-SIZE (ldns-1.6.7.tar.gz) = 962100
+SHA256 (ldns-1.6.8.tar.gz) = 8f0180aa742964f7d14256c48fd4a4d175d192422dd7d00b1dbc2d5281db403e
+SIZE (ldns-1.6.8.tar.gz) = 968066
diff --git a/dns/ldns/pkg-plist b/dns/ldns/pkg-plist
index dada1ced413d..c6fb32565584 100644
--- a/dns/ldns/pkg-plist
+++ b/dns/ldns/pkg-plist
@@ -20,6 +20,8 @@
 %%EXAMPLES%%bin/ldns-zcat
 %%EXAMPLES%%bin/ldns-zsplit
 %%EXAMPLES%%bin/ldnsd
+%%EXAMPLES%%bin/ldns-test-edns
+%%DRILLPROG%%bin/drill
 include/ldns/buffer.h
 include/ldns/common.h
 include/ldns/dname.h