Wed May 31 18:40:00 2023 UTC ()
gnunet: add libcurl-gnutls on Linux


(nikita)
diff -r1.10 -r1.11 pkgsrc/net/gnunet/Makefile
diff -r1.3 -r1.4 pkgsrc/net/gnunet/buildlink3.mk
cvs diff -r1.10 -r1.11 pkgsrc/net/gnunet/Makefile (expand / switch to unified diff)

--- pkgsrc/net/gnunet/Makefile 2023/05/17 23:24:03 1.10
+++ pkgsrc/net/gnunet/Makefile 2023/05/31 18:40:00 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2023/05/17 23:24:03 nikita Exp $ 1# $NetBSD: Makefile,v 1.11 2023/05/31 18:40:00 nikita Exp $
2 2
3DISTNAME= gnunet-0.19.4 3DISTNAME= gnunet-0.19.4
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GNU:=gnunet/} 6MASTER_SITES= ${MASTER_SITE_GNU:=gnunet/}
7 7
8MAINTAINER= nikita@NetBSD.org 8MAINTAINER= nikita@NetBSD.org
9HOMEPAGE= https://gnunet.org/ 9HOMEPAGE= https://gnunet.org/
10COMMENT= Framework for secure P2P networking 10COMMENT= Framework for secure P2P networking
11LICENSE= gnu-agpl-v3 11LICENSE= gnu-agpl-v3
12 12
13USE_TOOLS+= msgfmt pkg-config gmake 13USE_TOOLS+= msgfmt pkg-config gmake
14USE_LANGUAGES= c 14USE_LANGUAGES= c
@@ -24,26 +24,29 @@ CHECK_PORTABILITY_SKIP+= contrib/package @@ -24,26 +24,29 @@ CHECK_PORTABILITY_SKIP+= contrib/package
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25.include "options.mk" 25.include "options.mk"
26 26
27BUILD_DEFS+= VARBASE 27BUILD_DEFS+= VARBASE
28 28
29CONFIGURE_ARGS+= --localstatedir=${VARBASE} 29CONFIGURE_ARGS+= --localstatedir=${VARBASE}
30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
31CONFIGURE_ARGS+= --with-extractor=${BUILDLINK_PREFIX.libextractor} 31CONFIGURE_ARGS+= --with-extractor=${BUILDLINK_PREFIX.libextractor}
32CONFIGURE_ARGS+= --with-jansson=${BUILDLINK_PREFIX.jansson} 32CONFIGURE_ARGS+= --with-jansson=${BUILDLINK_PREFIX.jansson}
33CONFIGURE_ARGS+= --with-jose=${BUILDLINK_PREFIX.jose}/lib 33CONFIGURE_ARGS+= --with-jose=${BUILDLINK_PREFIX.jose}/lib
34CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt} 34CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt}
35CONFIGURE_ARGS+= --with-microhttpd=${BUILDLINK_PREFIX.libmicrohttpd} 35CONFIGURE_ARGS+= --with-microhttpd=${BUILDLINK_PREFIX.libmicrohttpd}
36CONFIGURE_ARGS+= --without-zbar 36CONFIGURE_ARGS+= --without-zbar
 37.if ${OPSYS} == "Linux"
 38CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.libcurl-gnutls}/lib
 39.endif
37 40
38 41
39GNUNET_LOG_DIR= ${VARBASE}/chroot/gnunet/cache 42GNUNET_LOG_DIR= ${VARBASE}/chroot/gnunet/cache
40GNUNET_DIR= ${VARBASE}/chroot/gnunet 43GNUNET_DIR= ${VARBASE}/chroot/gnunet
41GNUNET_USER= gnunet 44GNUNET_USER= gnunet
42GNUNET_GROUP= gnunet 45GNUNET_GROUP= gnunet
43GNUNETDNS_GROUP= gnunetdns 46GNUNETDNS_GROUP= gnunetdns
44PKG_SYSCONFSUBDIR= gnunet 47PKG_SYSCONFSUBDIR= gnunet
45 48
46PKG_GROUPS+= ${GNUNET_GROUP} 49PKG_GROUPS+= ${GNUNET_GROUP}
47PKG_GROUPS+= ${GNUNETDNS_GROUP} 50PKG_GROUPS+= ${GNUNETDNS_GROUP}
48PKG_USERS+= ${GNUNET_USER}:${GNUNET_GROUP} 51PKG_USERS+= ${GNUNET_USER}:${GNUNET_GROUP}
49PKG_GECOS.gnunet= GNUnet System user 52PKG_GECOS.gnunet= GNUnet System user
@@ -118,18 +121,21 @@ SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/lib @@ -118,18 +121,21 @@ SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/lib
118.include "../../devel/nss/buildlink3.mk" 121.include "../../devel/nss/buildlink3.mk"
119.include "../../devel/zlib/buildlink3.mk" 122.include "../../devel/zlib/buildlink3.mk"
120.include "../../devel/libextractor/buildlink3.mk" 123.include "../../devel/libextractor/buildlink3.mk"
121.include "../../devel/libgsf/buildlink3.mk" 124.include "../../devel/libgsf/buildlink3.mk"
122.include "../../devel/libltdl/buildlink3.mk" 125.include "../../devel/libltdl/buildlink3.mk"
123.include "../../net/miniupnpc/buildlink3.mk" 126.include "../../net/miniupnpc/buildlink3.mk"
124.include "../../security/gnutls/buildlink3.mk" 127.include "../../security/gnutls/buildlink3.mk"
125.include "../../security/libgcrypt/buildlink3.mk" 128.include "../../security/libgcrypt/buildlink3.mk"
126.include "../../security/libsodium/buildlink3.mk" 129.include "../../security/libsodium/buildlink3.mk"
127.include "../../security/openssl/buildlink3.mk" 130.include "../../security/openssl/buildlink3.mk"
128.include "../../textproc/jansson/buildlink3.mk" 131.include "../../textproc/jansson/buildlink3.mk"
129.include "../../textproc/jose/buildlink3.mk" 132.include "../../textproc/jose/buildlink3.mk"
130.include "../../textproc/libunistring/buildlink3.mk" 133.include "../../textproc/libunistring/buildlink3.mk"
 134.if ${OPSYS} == "Linux"
 135.include "../../www/libcurl-gnutls/buildlink3.mk"
 136.endif
131.include "../../www/curl/buildlink3.mk" 137.include "../../www/curl/buildlink3.mk"
132.include "../../www/libmicrohttpd/buildlink3.mk" 138.include "../../www/libmicrohttpd/buildlink3.mk"
133.include "../../mk/atomic64.mk" 139.include "../../mk/atomic64.mk"
134.include "../../mk/pthread.buildlink3.mk" 140.include "../../mk/pthread.buildlink3.mk"
135.include "../../mk/bsd.pkg.mk" 141.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/gnunet/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/gnunet/buildlink3.mk 2023/05/06 19:08:53 1.3
+++ pkgsrc/net/gnunet/buildlink3.mk 2023/05/31 18:40:00 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.3 2023/05/06 19:08:53 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2023/05/31 18:40:00 nikita Exp $
2 2
3BUILDLINK_TREE+= gnunet 3BUILDLINK_TREE+= gnunet
4 4
5.if !defined(GNUNET_BUILDLINK3_MK) 5.if !defined(GNUNET_BUILDLINK3_MK)
6GNUNET_BUILDLINK3_MK:= 6GNUNET_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gnunet+= gnunet>=0.19.2 8BUILDLINK_API_DEPENDS.gnunet+= gnunet>=0.19.2
9BUILDLINK_ABI_DEPENDS.gnunet?= gnunet>=0.19.4nb2 9BUILDLINK_ABI_DEPENDS.gnunet?= gnunet>=0.19.4nb2
10BUILDLINK_PKGSRCDIR.gnunet?= ../../net/gnunet 10BUILDLINK_PKGSRCDIR.gnunet?= ../../net/gnunet
11 11
12pkgbase:= gnunet 12pkgbase:= gnunet
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
@@ -62,23 +62,26 @@ pkgbase:= gnunet @@ -62,23 +62,26 @@ pkgbase:= gnunet
62.include "../../devel/libextractor/buildlink3.mk" 62.include "../../devel/libextractor/buildlink3.mk"
63.include "../../devel/libgsf/buildlink3.mk" 63.include "../../devel/libgsf/buildlink3.mk"
64.include "../../devel/libltdl/buildlink3.mk" 64.include "../../devel/libltdl/buildlink3.mk"
65.include "../../devel/nss/buildlink3.mk" 65.include "../../devel/nss/buildlink3.mk"
66.include "../../devel/zlib/buildlink3.mk" 66.include "../../devel/zlib/buildlink3.mk"
67.include "../../security/gnutls/buildlink3.mk" 67.include "../../security/gnutls/buildlink3.mk"
68.include "../../security/libgcrypt/buildlink3.mk" 68.include "../../security/libgcrypt/buildlink3.mk"
69.include "../../security/libsodium/buildlink3.mk" 69.include "../../security/libsodium/buildlink3.mk"
70.include "../../security/openssl/buildlink3.mk" 70.include "../../security/openssl/buildlink3.mk"
71.include "../../textproc/jansson/buildlink3.mk" 71.include "../../textproc/jansson/buildlink3.mk"
72.include "../../textproc/jose/buildlink3.mk" 72.include "../../textproc/jose/buildlink3.mk"
73.include "../../textproc/libunistring/buildlink3.mk" 73.include "../../textproc/libunistring/buildlink3.mk"
74.include "../../www/curl/buildlink3.mk" 74.include "../../www/curl/buildlink3.mk"
 75.if ${OPSYS} == "Linux"
 76.include "../../www/libcurl-gnutls/buildlink3.mk"
 77.endif
75.include "../../www/libmicrohttpd/buildlink3.mk" 78.include "../../www/libmicrohttpd/buildlink3.mk"
76.include "../../mk/pthread.buildlink3.mk" 79.include "../../mk/pthread.buildlink3.mk"
77 80
78#.if ${OPSYS} == "Linux" && ${PKG_BUILD_OPTIONS.gnunet:Mbluez} 81#.if ${OPSYS} == "Linux" && ${PKG_BUILD_OPTIONS.gnunet:Mbluez}
79#.include "../../wip/bluez-libs/buildlink3.mk" 82#.include "../../wip/bluez-libs/buildlink3.mk"
80#.endif 83#.endif
81 84
82.endif # GNUNET_BUILDLINK3_MK 85.endif # GNUNET_BUILDLINK3_MK
83 86
84BUILDLINK_TREE+= -gnunet 87BUILDLINK_TREE+= -gnunet