Fri Jan 20 14:49:19 2023 UTC ()
pidgin: Replace conditional

pkgsrc changes:
---------------
  * Actually, the build fails on Darwin is x11/gtk2 has been built with
    quartz option (suggested option) instead of x11. But the x11 option
    should not be excluded on Darwin since x11/gtk2 could be built with
    x11.


(triaxx)
diff -r1.19 -r1.20 pkgsrc/chat/pidgin/options.mk

cvs diff -r1.19 -r1.20 pkgsrc/chat/pidgin/options.mk (switch to unified diff)

--- pkgsrc/chat/pidgin/options.mk 2023/01/20 14:15:38 1.19
+++ pkgsrc/chat/pidgin/options.mk 2023/01/20 14:49:18 1.20
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: options.mk,v 1.19 2023/01/20 14:15:38 triaxx Exp $ 1# $NetBSD: options.mk,v 1.20 2023/01/20 14:49:18 triaxx Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin 3PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin
4PKG_SUPPORTED_OPTIONS+= dbus debug gtkspell 4PKG_SUPPORTED_OPTIONS+= dbus debug gtkspell
5PKG_SUGGESTED_OPTIONS+= dbus gtkspell 5PKG_SUGGESTED_OPTIONS+= dbus gtkspell
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../x11/gtk2/buildlink3.mk"
8.if ${OPSYS} != "Darwin" 8.if ${PKG_BUILD_OPTIONS.gtk2:Mx11}
9PKG_SUPPORTED_OPTIONS+= x11 9PKG_SUPPORTED_OPTIONS+= x11
10PKG_SUGGESTED_OPTIONS+= x11 10PKG_SUGGESTED_OPTIONS+= x11
11.endif 11.endif
12 12
13.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
14 14
15PLIST_VARS+= dbus x11 15PLIST_VARS+= dbus x11
16 16
17.if !empty(PKG_OPTIONS:Mdbus) 17.if !empty(PKG_OPTIONS:Mdbus)
18CONFIGURE_ARGS+= --enable-dbus 18CONFIGURE_ARGS+= --enable-dbus
19PLIST.dbus= yes 19PLIST.dbus= yes
20PYTHON_FOR_BUILD_ONLY= tool 20PYTHON_FOR_BUILD_ONLY= tool
21. include "../../lang/python/tool.mk" 21. include "../../lang/python/tool.mk"
22. include "../../sysutils/dbus/buildlink3.mk" 22. include "../../sysutils/dbus/buildlink3.mk"
23. include "../../sysutils/dbus-glib/buildlink3.mk" 23. include "../../sysutils/dbus-glib/buildlink3.mk"
24.endif 24.endif
25 25
26.if !empty(PKG_OPTIONS:Mgtkspell) 26.if !empty(PKG_OPTIONS:Mgtkspell)
27CONFIGURE_ARGS+= --enable-gtkspell 27CONFIGURE_ARGS+= --enable-gtkspell
28. include "../../textproc/gtkspell/buildlink3.mk" 28. include "../../textproc/gtkspell/buildlink3.mk"
29.else 29.else
30CONFIGURE_ARGS+= --disable-gtkspell 30CONFIGURE_ARGS+= --disable-gtkspell
31.endif 31.endif
32 32
33.if !empty(PKG_OPTIONS:Mdebug) 33.if !empty(PKG_OPTIONS:Mdebug)
34CONFIGURE_ARGS+= --enable-debug 34CONFIGURE_ARGS+= --enable-debug
35.endif 35.endif
36 36
37.if !empty(PKG_OPTIONS:Mx11) 37.if !empty(PKG_OPTIONS:Mx11)
38PLIST.x11= yes 38PLIST.x11= yes
39.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 39.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
40.include "../../x11/libSM/buildlink3.mk" 40.include "../../x11/libSM/buildlink3.mk"
41.include "../../x11/libXScrnSaver/buildlink3.mk" 41.include "../../x11/libXScrnSaver/buildlink3.mk"
42.else 42.else
43CONFIGURE_ARGS+= --without-x 43CONFIGURE_ARGS+= --without-x
44.endif 44.endif