From 6d0c556d8c5b45b9edcdec97d699b24985fb4f0b Mon Sep 17 00:00:00 2001
From: ng0 <ng0@pkgsrc.org>
Date: Wed, 18 Sep 2019 15:27:05 +0000
Subject: [PATCH] security/gnutls: Add ability to link against libunbound for
 DANE support.

---
 security/gnutls/Makefile   |  5 ++++-
 security/gnutls/PLIST      |  7 ++++++-
 security/gnutls/options.mk | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 security/gnutls/options.mk

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index bff0711b6042..70be935e14a4 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.199 2019/09/16 00:28:48 nia Exp $
+# $NetBSD: Makefile,v 1.200 2019/09/18 15:27:05 ng0 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
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 11230420db75..caaf84d2fa70 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.65 2019/09/16 00:28:48 nia Exp $
+@comment $NetBSD: PLIST,v 1.66 2019/09/18 15:27:05 ng0 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.dane}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.dane}lib/libgnutls-dane.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
+${PLIST.dane}lib/pkgconfig/gnutls-dane.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1
+${PLIST.dane}man/man1/danetool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1
diff --git a/security/gnutls/options.mk b/security/gnutls/options.mk
new file mode 100644
index 000000000000..9ccebc90b652
--- /dev/null
+++ b/security/gnutls/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2019/09/18 15:27:05 ng0 Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnutls
+PKG_SUPPORTED_OPTIONS=	dane
+PLIST_VARS+=		dane
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdane)
+.include "../../net/unbound/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-libdane
+PLIST.dane=		yes
+.else
+CONFIGURE_ARGS+=	--disable-libdane
+.endif