CVS commit: pkgsrc/security/gnutls

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun  9 09:53:11 UTC 2020

Modified Files:
        pkgsrc/security/gnutls: Makefile buildlink3.mk

Log Message:
gnutls: fix detection of build options


To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/gnutls/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gnutls/Makefile
diff -u pkgsrc/security/gnutls/Makefile:1.213 pkgsrc/security/gnutls/Makefile:1.214
--- pkgsrc/security/gnutls/Makefile:1.213       Mon Jun  8 19:48:14 2020
+++ pkgsrc/security/gnutls/Makefile     Tue Jun  9 09:53:11 2020
@@ -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 @@ USE_TOOLS+=                   msgfmt msgmerge xgettext
 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

Index: pkgsrc/security/gnutls/buildlink3.mk
diff -u pkgsrc/security/gnutls/buildlink3.mk:1.38 pkgsrc/security/gnutls/buildlink3.mk:1.39
--- pkgsrc/security/gnutls/buildlink3.mk:1.38   Fri May 22 10:55:50 2020
+++ pkgsrc/security/gnutls/buildlink3.mk        Tue Jun  9 09:53:11 2020
@@ -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 @@ BUILDLINK_API_DEPENDS.nettle+=              nettle>=
 .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