CVS commit: pkgsrc/chat/pidgin

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Jan 20 21:37:12 UTC 2023

Modified Files:
        pkgsrc/chat/pidgin: Makefile options.mk

Log Message:
pidgin: Revert conditional for Darwin

pkgsrc changes:
---------------
  * Building fails on Darwin when x11 option is enabled and x11/gtk2 is
    built with quartz option. It successes otherwise. Without any option
    customization, x11/gtk2 is built with quartz (and then without x11). It
    seems safe to simply disable x11 for ${OPSYS} == "Drawin".


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/chat/pidgin/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/chat/pidgin/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/pidgin/Makefile
diff -u pkgsrc/chat/pidgin/Makefile:1.100 pkgsrc/chat/pidgin/Makefile:1.101
--- pkgsrc/chat/pidgin/Makefile:1.100   Fri Jan 20 14:56:51 2023
+++ pkgsrc/chat/pidgin/Makefile Fri Jan 20 21:37:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2023/01/20 14:56:51 triaxx Exp $
+# $NetBSD: Makefile,v 1.101 2023/01/20 21:37:11 triaxx Exp $
 
 COMMENT=               Multi-protocol GTK instant messaging client
 PKGREVISION=           2
@@ -36,4 +36,5 @@ INSTALL_DIRS=         pidgin doc
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/pidgin/options.mk
diff -u pkgsrc/chat/pidgin/options.mk:1.20 pkgsrc/chat/pidgin/options.mk:1.21
--- pkgsrc/chat/pidgin/options.mk:1.20  Fri Jan 20 14:49:18 2023
+++ pkgsrc/chat/pidgin/options.mk       Fri Jan 20 21:37:11 2023
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.20 2023/01/20 14:49:18 triaxx Exp $
+# $NetBSD: options.mk,v 1.21 2023/01/20 21:37:11 triaxx Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.pidgin
 PKG_SUPPORTED_OPTIONS+=                dbus debug gtkspell
 PKG_SUGGESTED_OPTIONS+=                dbus gtkspell
 
-.include "../../x11/gtk2/buildlink3.mk"
-.if ${PKG_BUILD_OPTIONS.gtk2:Mx11}
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
 PKG_SUPPORTED_OPTIONS+=                x11
 PKG_SUGGESTED_OPTIONS+=                x11
 .endif