[pkgsrc/trunk]: pkgsrc/www/neon neon: Add gnutls support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9aca826bbc6e
branches:  trunk
changeset: 428128:9aca826bbc6e
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Apr 25 12:45:43 2020 +0000

description:
neon: Add gnutls support.

This probably makes more sense as a default given that neon is GPLv2.

diffstat:

 www/neon/Makefile      |   6 ++----
 www/neon/buildlink3.mk |  14 ++++++++++++--
 www/neon/options.mk    |  15 ++++++++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diffs (86 lines):

diff -r c0aa24effb2b -r 9aca826bbc6e www/neon/Makefile
--- a/www/neon/Makefile Sat Apr 25 12:07:47 2020 +0000
+++ b/www/neon/Makefile Sat Apr 25 12:45:43 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2020/01/18 21:48:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.75 2020/04/25 12:45:43 nia Exp $
 
 DISTNAME=      neon-0.30.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 #MASTER_SITES= http://www.webdav.org/neon/
 
@@ -15,7 +15,6 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --with-expat
-CONFIGURE_ARGS+=       --with-ssl=yes
 
 PKGCONFIG_OVERRIDE=    neon.pc.in
 TEST_TARGET=           check
@@ -28,6 +27,5 @@
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c0aa24effb2b -r 9aca826bbc6e www/neon/buildlink3.mk
--- a/www/neon/buildlink3.mk    Sat Apr 25 12:07:47 2020 +0000
+++ b/www/neon/buildlink3.mk    Sat Apr 25 12:45:43 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2020/01/18 21:48:30 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2020/04/25 12:45:43 nia Exp $
 
 BUILDLINK_TREE+=       neon
 
@@ -9,8 +9,18 @@
 BUILDLINK_ABI_DEPENDS.neon+=   neon>=0.30.2nb3
 BUILDLINK_PKGSRCDIR.neon?=     ../../www/neon
 
+pkgbase := neon
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.neon:Mgnutls}
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.neon:Mopenssl}
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .endif # NEON_BUILDLINK3_MK
 
diff -r c0aa24effb2b -r 9aca826bbc6e www/neon/options.mk
--- a/www/neon/options.mk       Sat Apr 25 12:07:47 2020 +0000
+++ b/www/neon/options.mk       Sat Apr 25 12:45:43 2020 +0000
@@ -1,7 +1,12 @@
-# $NetBSD: options.mk,v 1.1 2006/01/31 04:15:29 epg Exp $
+# $NetBSD: options.mk,v 1.2 2020/04/25 12:45:43 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.neon
+
+PKG_OPTIONS_REQUIRED_GROUPS=   ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+
 PKG_SUPPORTED_OPTIONS= gssapi
+PKG_SUGGESTED_OPTIONS= gnutls
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,3 +16,11 @@
 .else
 CONFIGURE_ARGS+=       --without-gssapi
 .endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ssl=openssl
+.elif !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ssl=gnutls
+.endif