Sat Apr 25 12:45:43 2020 UTC ()
neon: Add gnutls support.

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


(nia)
diff -r1.74 -r1.75 pkgsrc/www/neon/Makefile
diff -r1.20 -r1.21 pkgsrc/www/neon/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/www/neon/options.mk
cvs diff -r1.74 -r1.75 pkgsrc/www/neon/Makefile (expand / switch to unified diff)

--- pkgsrc/www/neon/Makefile 2020/01/18 21:48:30 1.74
+++ pkgsrc/www/neon/Makefile 2020/04/25 12:45:43 1.75
@@ -1,33 +1,31 @@ @@ -1,33 +1,31 @@
1# $NetBSD: Makefile,v 1.74 2020/01/18 21:48:30 jperkin Exp $ 1# $NetBSD: Makefile,v 1.75 2020/04/25 12:45:43 nia Exp $
2 2
3DISTNAME= neon-0.30.2 3DISTNAME= neon-0.30.2
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= www 5CATEGORIES= www
6#MASTER_SITES= http://www.webdav.org/neon/ 6#MASTER_SITES= http://www.webdav.org/neon/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= http://www.webdav.org/neon/ 9#HOMEPAGE= http://www.webdav.org/neon/
10COMMENT= HTTP and WebDAV client library 10COMMENT= HTTP and WebDAV client library
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= pkg-config msgfmt 14USE_TOOLS+= pkg-config msgfmt
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --enable-shared 16CONFIGURE_ARGS+= --enable-shared
17CONFIGURE_ARGS+= --with-expat 17CONFIGURE_ARGS+= --with-expat
18CONFIGURE_ARGS+= --with-ssl=yes 
19 18
20PKGCONFIG_OVERRIDE= neon.pc.in 19PKGCONFIG_OVERRIDE= neon.pc.in
21TEST_TARGET= check 20TEST_TARGET= check
22#selftest needs perl 21#selftest needs perl
23USE_TOOLS+= perl 22USE_TOOLS+= perl
24 23
25LDFLAGS.SunOS+= -lintl 24LDFLAGS.SunOS+= -lintl
26 25
27.include "options.mk" 26.include "options.mk"
28 27
29.include "../../devel/gettext-lib/buildlink3.mk" 28.include "../../devel/gettext-lib/buildlink3.mk"
30.include "../../devel/zlib/buildlink3.mk" 29.include "../../devel/zlib/buildlink3.mk"
31.include "../../security/openssl/buildlink3.mk" 
32.include "../../textproc/expat/buildlink3.mk" 30.include "../../textproc/expat/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/www/neon/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/neon/buildlink3.mk 2020/01/18 21:48:30 1.20
+++ pkgsrc/www/neon/buildlink3.mk 2020/04/25 12:45:43 1.21
@@ -1,17 +1,27 @@ @@ -1,17 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.20 2020/01/18 21:48:30 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.21 2020/04/25 12:45:43 nia Exp $
2 2
3BUILDLINK_TREE+= neon 3BUILDLINK_TREE+= neon
4 4
5.if !defined(NEON_BUILDLINK3_MK) 5.if !defined(NEON_BUILDLINK3_MK)
6NEON_BUILDLINK3_MK:= 6NEON_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.neon+= neon>=0.24.4 8BUILDLINK_API_DEPENDS.neon+= neon>=0.24.4
9BUILDLINK_ABI_DEPENDS.neon+= neon>=0.30.2nb3 9BUILDLINK_ABI_DEPENDS.neon+= neon>=0.30.2nb3
10BUILDLINK_PKGSRCDIR.neon?= ../../www/neon 10BUILDLINK_PKGSRCDIR.neon?= ../../www/neon
11 11
12.include "../../devel/zlib/buildlink3.mk" 12pkgbase := neon
 13.include "../../mk/pkg-build-options.mk"
 14
 15.if ${PKG_BUILD_OPTIONS.neon:Mgnutls}
 16.include "../../security/gnutls/buildlink3.mk"
 17.endif
 18
 19.if ${PKG_BUILD_OPTIONS.neon:Mopenssl}
13.include "../../security/openssl/buildlink3.mk" 20.include "../../security/openssl/buildlink3.mk"
 21.endif
 22
 23.include "../../devel/zlib/buildlink3.mk"
14.include "../../textproc/expat/buildlink3.mk" 24.include "../../textproc/expat/buildlink3.mk"
15.endif # NEON_BUILDLINK3_MK 25.endif # NEON_BUILDLINK3_MK
16 26
17BUILDLINK_TREE+= -neon 27BUILDLINK_TREE+= -neon
cvs diff -r1.1 -r1.2 pkgsrc/www/neon/options.mk (expand / switch to unified diff)

--- pkgsrc/www/neon/options.mk 2006/01/31 04:15:29 1.1
+++ pkgsrc/www/neon/options.mk 2020/04/25 12:45:43 1.2
@@ -1,13 +1,26 @@ @@ -1,13 +1,26 @@
1# $NetBSD: options.mk,v 1.1 2006/01/31 04:15:29 epg Exp $ 1# $NetBSD: options.mk,v 1.2 2020/04/25 12:45:43 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.neon 3PKG_OPTIONS_VAR= PKG_OPTIONS.neon
 4
 5PKG_OPTIONS_REQUIRED_GROUPS= ssl
 6PKG_OPTIONS_GROUP.ssl= gnutls openssl
 7
4PKG_SUPPORTED_OPTIONS= gssapi 8PKG_SUPPORTED_OPTIONS= gssapi
 9PKG_SUGGESTED_OPTIONS= gnutls
5 10
6.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
7 12
8.if !empty(PKG_OPTIONS:Mgssapi) 13.if !empty(PKG_OPTIONS:Mgssapi)
9CONFIGURE_ARGS+= --with-gssapi 14CONFIGURE_ARGS+= --with-gssapi
10. include "../../mk/krb5.buildlink3.mk" 15. include "../../mk/krb5.buildlink3.mk"
11.else 16.else
12CONFIGURE_ARGS+= --without-gssapi 17CONFIGURE_ARGS+= --without-gssapi
13.endif 18.endif
 19
 20.if !empty(PKG_OPTIONS:Mopenssl)
 21. include "../../security/openssl/buildlink3.mk"
 22CONFIGURE_ARGS+= --with-ssl=openssl
 23.elif !empty(PKG_OPTIONS:Mgnutls)
 24. include "../../security/gnutls/buildlink3.mk"
 25CONFIGURE_ARGS+= --with-ssl=gnutls
 26.endif