[pkgsrc/trunk]: pkgsrc/security/gnutls gnutls: fix detection of build options

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/267069c8f91e
branches:  trunk
changeset: 433950:267069c8f91e
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jun 09 09:53:11 2020 +0000

description:
gnutls: fix detection of build options

diffstat:

 security/gnutls/Makefile      |  3 +--
 security/gnutls/buildlink3.mk |  8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 5440d010e82d -r 267069c8f91e security/gnutls/Makefile
--- a/security/gnutls/Makefile  Tue Jun 09 09:00:28 2020 +0000
+++ b/security/gnutls/Makefile  Tue Jun 09 09:53:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.213 2020/06/08 19:48:14 leot Exp $
+# $NetBSD: Makefile,v 1.214 2020/06/09 09:53:11 nia Exp $
 
 DISTNAME=      gnutls-3.6.14
 CATEGORIES=    security devel
@@ -21,7 +21,6 @@
 GNU_CONFIGURE=                 yes
 # this library duplicates (and conflicts with) openssl
 CONFIGURE_ARGS+=               --disable-openssl-compatibility
-CONFIGURE_ARGS+=               --disable-libdane
 CONFIGURE_ARGS+=               --without-idn
 CONFIGURE_ARGS+=               --without-tpm
 CONFIGURE_ARGS+=               --disable-valgrind-tests
diff -r 5440d010e82d -r 267069c8f91e security/gnutls/buildlink3.mk
--- a/security/gnutls/buildlink3.mk     Tue Jun 09 09:00:28 2020 +0000
+++ b/security/gnutls/buildlink3.mk     Tue Jun 09 09:53:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2020/05/22 10:55:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2020/06/09 09:53:11 nia Exp $
 
 BUILDLINK_TREE+=       gnutls
 
@@ -18,10 +18,12 @@
 .include "../../security/nettle/buildlink3.mk"
 .include "../../security/p11-kit/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.gnutls:Mdane)
+pkgbase := gnutls
+.include "../../mk/pkg-build-options.mk"
+.if ${PKG_BUILD_OPTIONS.gnutls:Mdane}
 .include "../../net/unbound/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.gnutls:Mguile)
+.if ${PKG_BUILD_OPTIONS.gnutls:Mguile}
 .include "../../lang/guile22/buildlink3.mk"
 .endif
 .endif # GNUTLS_BUILDLINK3_MK