Re: security/gnutls: link against libunbound for DANE support (patch)

[ng0 <ng0%n0.is@localhost>]

Adding to the email sent a couple of minutes ago, here's
the latest diff:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnutls/Makefile,v
retrieving revision 1.199
diff -u -p -r1.199 Makefile
--- Makefile	16 Sep 2019 00:28:48 -0000	1.199
+++ Makefile	17 Sep 2019 10:41:25 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.199 2019/09/16 00:28:48 nia Exp $
 
 DISTNAME=	gnutls-3.6.9
+PKGREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/
 EXTRACT_SUFX=	.tar.xz
@@ -31,6 +32,8 @@ CONFIGURE_ARGS+=		--enable-local-libopts
 CONFIGURE_ARGS.SunOS+=		--disable-hardware-acceleration
 CONFIGURE_ARGS.FreeBSD+=	ac_cv_type_max_align_t=yes
 
+.include "options.mk"
+
 TEST_TARGET=		check
 
 INFO_FILES=		yes
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnutls/PLIST,v
retrieving revision 1.65
diff -u -p -r1.65 PLIST
--- PLIST	16 Sep 2019 00:28:48 -0000	1.65
+++ PLIST	17 Sep 2019 10:41:25 -0000
@@ -1,5 +1,6 @@
 @comment $NetBSD: PLIST,v 1.65 2019/09/16 00:28:48 nia Exp $
 bin/certtool
+${PLIST.unbound}bin/danetool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -10,6 +11,7 @@ bin/srptool
 include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h
+${PLIST.unbound}include/gnutls/dane.h
 include/gnutls/dtls.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
@@ -36,10 +38,13 @@ info/gnutls-modauth.png
 info/gnutls-x509.png
 info/gnutls.info
 info/pkcs11-vision.png
+${PLIST.unbound}lib/libgnutls-dane.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
+${PLIST.unbound}lib/pkgconfig/gnutls-dane.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1
+${PLIST.unbound}man/man1/danetool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ options.mk	17 Sep 2019 10:41:25 -0000
@@ -0,0 +1,15 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnutls
+PKG_SUPPORTED_OPTIONS=	unbound
+PLIST_VARS+=		unbound
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Munbound)
+.include "../../net/unbound/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-libdane
+PLIST.unbound=		yes
+.else
+CONFIGURE_ARGS+=	--disable-libdane
+.endif