Wed Mar 10 11:50:26 2021 UTC ()
libpurple: adapt for nss change


(wiz)
diff -r1.31 -r1.32 pkgsrc/chat/libpurple/options.mk
cvs diff -r1.31 -r1.32 pkgsrc/chat/libpurple/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/options.mk 2020/06/12 11:40:19 1.31
+++ pkgsrc/chat/libpurple/options.mk 2021/03/10 11:50:26 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.31 2020/06/12 11:40:19 nia Exp $ 1# $NetBSD: options.mk,v 1.32 2021/03/10 11:50:26 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple 3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
4PKG_OPTIONS_REQUIRED_GROUPS= ssl 4PKG_OPTIONS_REQUIRED_GROUPS= ssl
5PKG_OPTIONS_GROUP.ssl= gnutls nss 5PKG_OPTIONS_GROUP.ssl= gnutls nss
6PKG_SUPPORTED_OPTIONS+= avahi dbus debug farstream 6PKG_SUPPORTED_OPTIONS+= avahi dbus debug farstream
7PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl 7PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl
8PKG_SUGGESTED_OPTIONS+= dbus farstream gstreamer gnutls 8PKG_SUGGESTED_OPTIONS+= dbus farstream gstreamer gnutls
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12PLIST_VARS+= avahi dbus gnutls nss perl tcl vv 12PLIST_VARS+= avahi dbus gnutls nss perl tcl vv
13 13
14.if !empty(PKG_OPTIONS:Mavahi) 14.if !empty(PKG_OPTIONS:Mavahi)
@@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --enable-avahi @@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --enable-avahi
20.if !empty(PKG_OPTIONS:Mgnutls) 20.if !empty(PKG_OPTIONS:Mgnutls)
21PLIST.gnutls= yes 21PLIST.gnutls= yes
22CONFIGURE_ARGS+= --enable-gnutls 22CONFIGURE_ARGS+= --enable-gnutls
23CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include 23CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
24CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib 24CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
25. include "../../security/gnutls/buildlink3.mk" 25. include "../../security/gnutls/buildlink3.mk"
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mnss) 28.if !empty(PKG_OPTIONS:Mnss)
29PLIST.nss= yes 29PLIST.nss= yes
30CONFIGURE_ARGS+= --enable-nss 30CONFIGURE_ARGS+= --enable-nss
31CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr 31CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
32CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr 32CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
33CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss 33CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss
34CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss 34CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
35. include "../../devel/nss/buildlink3.mk" 35. include "../../devel/nss/buildlink3.mk"
36.endif 36.endif
37 37
38.if !empty(PKG_OPTIONS:Mperl) 38.if !empty(PKG_OPTIONS:Mperl)
39PLIST.perl= yes 39PLIST.perl= yes
40CONFIGURE_ARGS+= --enable-perl 40CONFIGURE_ARGS+= --enable-perl
41USE_TOOLS+= perl:run 41USE_TOOLS+= perl:run
42PERL5_PACKLIST_DIR= ${PREFIX}/lib/purple-2/perl 42PERL5_PACKLIST_DIR= ${PREFIX}/lib/purple-2/perl
43PERL5_PACKLIST= auto/Purple/.packlist 43PERL5_PACKLIST= auto/Purple/.packlist
44. include "../../lang/perl5/packlist.mk" 44. include "../../lang/perl5/packlist.mk"
45. include "../../lang/perl5/buildlink3.mk" 45. include "../../lang/perl5/buildlink3.mk"
46.endif 46.endif