From ce69f44e734f7c8e75034b04352895bda4d44b4c Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Tue, 29 Apr 2008 12:35:10 +0000
Subject: Fix build when dbus is installed

Add an option to select whether dbus support should be enabled or not and
use it to control the installation of the musicmessaging plugin.  Fixes the
package when dbus is already installed.  Bump PKGREVISION to 2.

Ew.  Conditional builds.
---
 chat/pidgin/Makefile   |  4 ++--
 chat/pidgin/PLIST      |  4 +++-
 chat/pidgin/options.mk | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 5f3a563f699..5a486dd27e6 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/04/14 05:45:23 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/29 12:35:10 jmmv Exp $
 #
 
 PKGNAME=		pidgin-${PIDGIN_VERSION}
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION=		1
+PKGREVISION=		2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index dc41600c6b8..20054fb77de 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/04/14 05:45:23 tnn Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/29 12:35:10 jmmv Exp $
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
@@ -57,6 +57,7 @@ lib/pidgin/gtkbuddynote.la
 lib/pidgin/history.la
 lib/pidgin/iconaway.la
 lib/pidgin/markerline.la
+${PLIST.dbus}lib/pidgin/musicmessaging.la
 lib/pidgin/notify.la
 lib/pidgin/pidginrc.la
 lib/pidgin/relnot.la
@@ -93,6 +94,7 @@ share/pixmaps/pidgin/arrow-right.xpm
 share/pixmaps/pidgin/arrow-up.xpm
 share/pixmaps/pidgin/buttons/edit.png
 share/pixmaps/pidgin/buttons/info.png
+${PLIST.dbus}share/pixmaps/pidgin/buttons/music.png
 share/pixmaps/pidgin/buttons/pause.png
 share/pixmaps/pidgin/dialogs/16/auth.png
 share/pixmaps/pidgin/dialogs/16/error.png
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index 4acda327b3e..46eefd0e02f 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,11 +1,22 @@
-# $NetBSD: options.mk,v 1.2 2007/08/04 14:01:38 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/29 12:35:10 jmmv Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
-PKG_SUPPORTED_OPTIONS+=		gtkspell gstreamer debug
+PKG_SUPPORTED_OPTIONS+=		dbus debug gstreamer gtkspell
 PKG_SUGGESTED_OPTIONS+=		gtkspell
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		dbus
+
+.if !empty(PKG_OPTIONS:Mdbus)
+CONFIGURE_ARGS+=	--enable-dbus
+PLIST.dbus=		yes
+.  include "../../sysutils/dbus/buildlink3.mk"
+.  include "../../sysutils/dbus-glib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
 .if !empty(PKG_OPTIONS:Mgtkspell)
 .  include "../../textproc/gtkspell/buildlink3.mk"
 .else
-- 
cgit v1.2.3