CVS commit: pkgsrc/security/gnutls

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Thu May 14 14:30:02 UTC 2020

Modified Files:
        pkgsrc/security/gnutls: Makefile buildlink3.mk options.mk
Added Files:
        pkgsrc/security/gnutls: PLIST.guile

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


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gnutls/PLIST.guile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/gnutls/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/gnutls/options.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.210 pkgsrc/security/gnutls/Makefile:1.211
--- pkgsrc/security/gnutls/Makefile:1.210       Wed Apr  1 08:24:07 2020
+++ pkgsrc/security/gnutls/Makefile     Thu May 14 14:30:02 2020
@@ -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 @@ USE_TOOLS+=                   msgfmt msgmerge xgettext
 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

Index: pkgsrc/security/gnutls/buildlink3.mk
diff -u pkgsrc/security/gnutls/buildlink3.mk:1.36 pkgsrc/security/gnutls/buildlink3.mk:1.37
--- pkgsrc/security/gnutls/buildlink3.mk:1.36   Sun Mar  8 16:48:06 2020
+++ pkgsrc/security/gnutls/buildlink3.mk        Thu May 14 14:30:02 2020
@@ -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 @@ 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)
+.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

Index: pkgsrc/security/gnutls/options.mk
diff -u pkgsrc/security/gnutls/options.mk:1.2 pkgsrc/security/gnutls/options.mk:1.3
--- pkgsrc/security/gnutls/options.mk:1.2       Fri Oct  4 17:25:53 2019
+++ pkgsrc/security/gnutls/options.mk   Thu May 14 14:30:02 2020
@@ -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 @@ PLIST_SRC+=          PLIST.dane
 .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

Added files:

Index: pkgsrc/security/gnutls/PLIST.guile
diff -u /dev/null pkgsrc/security/gnutls/PLIST.guile:1.1
--- /dev/null   Thu May 14 14:30:02 2020
+++ pkgsrc/security/gnutls/PLIST.guile  Thu May 14 14:30:02 2020
@@ -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