Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171576180078890"
MIME-Version: 1.0
Date: Wed, 15 May 2024 08:30:00 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/security/gnutls
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20240515083000.872B2FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171576180078890
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Wed May 15 08:30:00 UTC 2024

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

Log Message:
gnutls: pkg-build-options.mk must come before conditional


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/gnutls/buildlink3.mk

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


--_----------=_171576180078890
Content-Disposition: inline
Content-Length: 1129
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/gnutls/buildlink3.mk
diff -u pkgsrc/security/gnutls/buildlink3.mk:1.51 pkgsrc/security/gnutls/buildlink3.mk:1.52
--- pkgsrc/security/gnutls/buildlink3.mk:1.51	Wed May 15 08:13:25 2024
+++ pkgsrc/security/gnutls/buildlink3.mk	Wed May 15 08:30:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2024/05/15 08:13:25 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2024/05/15 08:30:00 tnn Exp $
 
 BUILDLINK_TREE+=	gnutls
 
@@ -14,15 +14,15 @@ BUILDLINK_PKGSRCDIR.gnutls?=	../../secur
 .include "../../security/libtasn1/buildlink3.mk"
 BUILDLINK_API_DEPENDS.nettle+=		nettle>=3.4.1
 .include "../../security/nettle/buildlink3.mk"
-.if ${PKG_BUILD_OPTIONS.gnutls:Mpkcs11}
-.include "../../security/p11-kit/buildlink3.mk"
-.endif
 .include "../../textproc/libunistring/buildlink3.mk"
 pkgbase := gnutls
 .include "../../mk/pkg-build-options.mk"
 .if ${PKG_BUILD_OPTIONS.gnutls:Mdane}
 .include "../../net/unbound/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.gnutls:Mpkcs11}
+.include "../../security/p11-kit/buildlink3.mk"
+.endif
 .endif # GNUTLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnutls


--_----------=_171576180078890--