CVS commit: pkgsrc/security/gnutls

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan  3 12:36:53 UTC 2022

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

Log Message:
gnutls: add lzo option

Based on PR 56601 by Vladimir Stupin.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/security/gnutls/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 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.225 pkgsrc/security/gnutls/Makefile:1.226
--- pkgsrc/security/gnutls/Makefile:1.225       Sun Dec 26 23:03:54 2021
+++ pkgsrc/security/gnutls/Makefile     Mon Jan  3 12:36:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.225 2021/12/26 23:03:54 gutteridge Exp $
+# $NetBSD: Makefile,v 1.226 2022/01/03 12:36:53 wiz Exp $
 
 DISTNAME=      gnutls-3.7.2
 PKGREVISION=   2
@@ -99,7 +99,6 @@ CONFIGURE_ARGS.SunOS+=        --disable-tests
 post-install:
        cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${DESTDIR}${EGDIR}
 
-.include "../../archivers/lzo/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gmp+=            gmp>=5.0

Index: pkgsrc/security/gnutls/buildlink3.mk
diff -u pkgsrc/security/gnutls/buildlink3.mk:1.41 pkgsrc/security/gnutls/buildlink3.mk:1.42
--- pkgsrc/security/gnutls/buildlink3.mk:1.41   Wed Sep 29 19:00:12 2021
+++ pkgsrc/security/gnutls/buildlink3.mk        Mon Jan  3 12:36:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2021/09/29 19:00:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2022/01/03 12:36:53 wiz Exp $
 
 BUILDLINK_TREE+=       gnutls
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.gnutls+=  gnutls>=3
 BUILDLINK_ABI_DEPENDS.gnutls+= gnutls>=3.7.2nb1
 BUILDLINK_PKGSRCDIR.gnutls?=   ../../security/gnutls
 
-.include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libcfg+/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -26,6 +25,9 @@ pkgbase := gnutls
 .if ${PKG_BUILD_OPTIONS.gnutls:Mguile}
 .include "../../lang/guile22/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.gnutls:Mlzo}
+.include "../../archivers/lzo/buildlink3.mk"
+.endif
 .endif # GNUTLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gnutls

Index: pkgsrc/security/gnutls/options.mk
diff -u pkgsrc/security/gnutls/options.mk:1.3 pkgsrc/security/gnutls/options.mk:1.4
--- pkgsrc/security/gnutls/options.mk:1.3       Thu May 14 14:30:02 2020
+++ pkgsrc/security/gnutls/options.mk   Mon Jan  3 12:36:53 2022
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2020/05/14 14:30:02 nikita Exp $
+# $NetBSD: options.mk,v 1.4 2022/01/03 12:36:53 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnutls
-PKG_SUPPORTED_OPTIONS= dane guile
+PKG_SUPPORTED_OPTIONS= dane guile lzo
+PKG_SUGGESTED_OPTIONS= lzo
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,3 +21,10 @@ PLIST_SRC+=          PLIST.guile
 .else
 CONFIGURE_ARGS+=       --disable-guile
 .endif
+
+.if !empty(PKG_OPTIONS:Mlzo)
+.include "../../archivers/lzo/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-lzo
+.else
+CONFIGURE_ARGS+=       --disable-lzo
+.endif