[pkgsrc/trunk]: pkgsrc/security/gnutls security/gnutls: revbump, add support ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8e9a8fc454f
branches:  trunk
changeset: 431528:a8e9a8fc454f
user:      nikita <nikita%pkgsrc.org@localhost>
date:      Thu May 14 14:30:02 2020 +0000

description:
security/gnutls: revbump, add support for building guile bindings

diffstat:

 security/gnutls/Makefile      |   4 ++--
 security/gnutls/PLIST.guile   |  10 ++++++++++
 security/gnutls/buildlink3.mk |   8 +++++++-
 security/gnutls/options.mk    |  12 ++++++++++--
 4 files changed, 29 insertions(+), 5 deletions(-)

diffs (81 lines):

diff -r 9455ae361cf5 -r a8e9a8fc454f security/gnutls/Makefile
--- a/security/gnutls/Makefile  Thu May 14 14:28:04 2020 +0000
+++ b/security/gnutls/Makefile  Thu May 14 14:30:02 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.210 2020/04/01 08:24:07 adam Exp $
+# $NetBSD: Makefile,v 1.211 2020/05/14 14:30:02 nikita Exp $
 
 DISTNAME=      gnutls-3.6.13
+PKGREVISION=   1
 CATEGORIES=    security devel
 MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/
 EXTRACT_SUFX=  .tar.xz
@@ -21,7 +22,6 @@
 GNU_CONFIGURE=                 yes
 # this library duplicates (and conflicts with) openssl
 CONFIGURE_ARGS+=               --disable-openssl-compatibility
-CONFIGURE_ARGS+=               --disable-guile
 CONFIGURE_ARGS+=               --disable-libdane
 CONFIGURE_ARGS+=               --without-idn
 CONFIGURE_ARGS+=               --without-tpm
diff -r 9455ae361cf5 -r a8e9a8fc454f security/gnutls/PLIST.guile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnutls/PLIST.guile       Thu May 14 14:30:02 2020 +0000
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.guile,v 1.1 2020/05/14 14:30:02 nikita Exp $
+guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.a
+guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.la
+guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.so
+guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.so.0
+guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.so.0.0.0
+guile/2.2/lib/guile/2.2/site-ccache/gnutls.go
+guile/2.2/lib/guile/2.2/site-ccache/gnutls/extra.go
+guile/2.2/share/guile/site/2.2/gnutls.scm
+guile/2.2/share/guile/site/2.2/gnutls/extra.scm
diff -r 9455ae361cf5 -r a8e9a8fc454f security/gnutls/buildlink3.mk
--- a/security/gnutls/buildlink3.mk     Thu May 14 14:28:04 2020 +0000
+++ b/security/gnutls/buildlink3.mk     Thu May 14 14:30:02 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2020/03/08 16:48:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2020/05/14 14:30:02 nikita Exp $
 
 BUILDLINK_TREE+=       gnutls
 
@@ -18,6 +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)
+.include "../../net/unbound/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.gnutls:Mguile)
+.include "../../lang/guile22/buildlink3.mk"
+.endif
 .endif # GNUTLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gnutls
diff -r 9455ae361cf5 -r a8e9a8fc454f security/gnutls/options.mk
--- a/security/gnutls/options.mk        Thu May 14 14:28:04 2020 +0000
+++ b/security/gnutls/options.mk        Thu May 14 14:30:02 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2019/10/04 17:25:53 nia Exp $
+# $NetBSD: options.mk,v 1.3 2020/05/14 14:30:02 nikita Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnutls
-PKG_SUPPORTED_OPTIONS= dane
+PKG_SUPPORTED_OPTIONS= dane guile
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,3 +12,11 @@
 .else
 CONFIGURE_ARGS+=       --disable-libdane
 .endif
+
+.if !empty(PKG_OPTIONS:Mguile)
+.include "../../lang/guile22/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-guile
+PLIST_SRC+=            PLIST.guile
+.else
+CONFIGURE_ARGS+=       --disable-guile
+.endif