[pkgsrc/trunk]: pkgsrc/chat Move the avahi option to libpurple where it belongs.

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e1cf0ce82a5
branches:  trunk
changeset: 551955:8e1cf0ce82a5
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Sun Dec 21 14:08:39 2008 +0000

description:
Move the avahi option to libpurple where it belongs.
Bump.

diffstat:

 chat/libpurple/Makefile.common |   4 ++--
 chat/libpurple/PLIST           |   3 ++-
 chat/libpurple/options.mk      |  13 +++++++++----
 chat/pidgin/options.mk         |  11 +++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

diffs (87 lines):

diff -r 7aa73004d85f -r 8e1cf0ce82a5 chat/libpurple/Makefile.common
--- a/chat/libpurple/Makefile.common    Sun Dec 21 14:02:59 2008 +0000
+++ b/chat/libpurple/Makefile.common    Sun Dec 21 14:08:39 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2008/12/21 00:12:10 ahoka Exp $
+# $NetBSD: Makefile.common,v 1.23 2008/12/21 14:08:39 ahoka Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-silc/Makefile
 
 PIDGIN_VERSION=        2.5.1
-PKGREVISION=   1
+PKGREVISION=   2
 DISTNAME=      pidgin-${PIDGIN_VERSION}
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff -r 7aa73004d85f -r 8e1cf0ce82a5 chat/libpurple/PLIST
--- a/chat/libpurple/PLIST      Sun Dec 21 14:02:59 2008 +0000
+++ b/chat/libpurple/PLIST      Sun Dec 21 14:08:39 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2008/09/16 19:54:21 abs Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/12/21 14:08:39 ahoka Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -58,6 +58,7 @@
 lib/purple-2/idle.la
 lib/purple-2/joinpart.la
 lib/purple-2/libaim.la
+${PLIST.avahi}lib/purple-2/libbonjour.la
 lib/purple-2/libgg.la
 lib/purple-2/libicq.la
 lib/purple-2/libirc.la
diff -r 7aa73004d85f -r 8e1cf0ce82a5 chat/libpurple/options.mk
--- a/chat/libpurple/options.mk Sun Dec 21 14:02:59 2008 +0000
+++ b/chat/libpurple/options.mk Sun Dec 21 14:08:39 2008 +0000
@@ -1,12 +1,17 @@
-# $NetBSD: options.mk,v 1.9 2008/12/21 00:12:10 ahoka Exp $
+# $NetBSD: options.mk,v 1.10 2008/12/21 14:08:39 ahoka Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libpurple
-PKG_SUPPORTED_OPTIONS+=                gnutls perl tcl debug dbus sasl
-PKG_SUGGESTED_OPTIONS+=                gnutls dbus
+PKG_SUPPORTED_OPTIONS+=                gnutls perl tcl debug dbus sasl avahi
+PKG_SUGGESTED_OPTIONS+=                gnutls dbus avahi
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           dbus
+PLIST_VARS+=           dbus avahi
+
+.if !empty(PKG_OPTIONS:Mavahi)
+PLIST.avahi=            yes
+.  include "../../net/avahi/buildlink3.mk"
+.endif
 
 .if !empty(PKG_OPTIONS:Mgnutls)
 CONFIGURE_ARGS+=       --enable-gnutls
diff -r 7aa73004d85f -r 8e1cf0ce82a5 chat/pidgin/options.mk
--- a/chat/pidgin/options.mk    Sun Dec 21 14:02:59 2008 +0000
+++ b/chat/pidgin/options.mk    Sun Dec 21 14:08:39 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2008/12/21 00:12:10 ahoka Exp $
+# $NetBSD: options.mk,v 1.6 2008/12/21 14:08:39 ahoka Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.pidgin
-PKG_SUPPORTED_OPTIONS+=                dbus debug gstreamer gtkspell avahi
-PKG_SUGGESTED_OPTIONS+=                gtkspell dbus gstreamer avahi
+PKG_SUPPORTED_OPTIONS+=                dbus debug gstreamer gtkspell
+PKG_SUGGESTED_OPTIONS+=                gtkspell dbus gstreamer
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,11 +15,6 @@
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mavahi)
-PLIST.avahi=           yes
-.  include "../../net/avahi/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mgtkspell)
 CONFIGURE_ARGS+=       --enable-gtkspell
 .  include "../../textproc/gtkspell/buildlink3.mk"