Update to pidgin-2.4.2.

* The typing notification in the conversation history can be disabled or
  customized (font, color etc.) in .gtkrc-2.0.
* Added a plugin (not installed by default) which adds a Send button back to
  the conversation window. People without physical keyboards have a hard time
  with the lack of the button.
* Clicking on the buddyicon in the conversation window toggles the size of the
  icon between small and large.
* The settings of a chat (e.g. Handle in an XMPP chat, or Exchange in an AIM
  chat) can be edited from its context menu in the buddy list.
* Add a "Present conversation window" preference to the Message Notification
  plugin; the "Raise conversation window" option does not unminimize windows
  or draw attention to them when they are on other workspaces--the "Present"
  option should.
* Add a preference to set Escape as the keyboard shortcut for closing the
  conversation window.
* Add an option in the context menu to disable smileys in the selected text
  in the conversation history/log viewer. This should help people who
  regularly paste code in conversations.
* Add a preference to choose the minimum size of the text input area in lines.
* Moved the "Local alias" field in the Modify Account dialog to be below the
  "User Options" heading on the "Basic" tab.
* Number of room occupants is now shown in chat tooltips where possible

4 files changed, 10 insertions, 14 deletions

diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 5a486dd27e6..888bf531cea 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/04/29 12:35:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/17 23:45:47 tnn Exp $
 #
 
 PKGNAME=		pidgin-${PIDGIN_VERSION}
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION=		2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -16,9 +15,7 @@ PKGCONFIG_OVERRIDE+=	gaim.pc.in
 PKGCONFIG_OVERRIDE+=	libpurple/purple.pc.in
 PKGCONFIG_OVERRIDE+=	pidgin/pidgin.pc.in
 
-CONFIGURE_ARGS+=	--disable-gevolution
 CONFIGURE_ARGS+=	--enable-gtkui
-CONFIGURE_ARGS+=	--disable-consoleui
 
 BUILD_DIRS=		pidgin
 
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index 20054fb77de..ae095186234 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/29 12:35:10 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/05/17 23:45:47 tnn Exp $
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
@@ -61,6 +61,7 @@ ${PLIST.dbus}lib/pidgin/musicmessaging.la
 lib/pidgin/notify.la
 lib/pidgin/pidginrc.la
 lib/pidgin/relnot.la
+lib/pidgin/sendbutton.la
 lib/pidgin/spellchk.la
 lib/pidgin/ticker.la
 lib/pidgin/timestamp.la
@@ -430,6 +431,8 @@ share/pixmaps/pidgin/status/48/log-out.png
 share/pixmaps/pidgin/status/48/offline.png
 share/pixmaps/pidgin/status/48/person.png
 share/pixmaps/pidgin/status/48/rtl/extended-away.png
+share/pixmaps/pidgin/status/48/rtl/login.png
+share/pixmaps/pidgin/status/48/rtl/logout.png
 share/pixmaps/pidgin/toolbar/16/change-bgcolor.png
 share/pixmaps/pidgin/toolbar/16/change-fgcolor.png
 share/pixmaps/pidgin/toolbar/16/emote-select.png
diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk
index b6b4c0b7526..e84aca840a6 100644
--- a/chat/pidgin/buildlink3.mk
+++ b/chat/pidgin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/04/05 02:27:53 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2008/05/17 23:45:47 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PIDGIN_BUILDLINK3_MK:=	${PIDGIN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	pidgin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pidgin
 
 .if ${PIDGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.4.1
+BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.4.2
 BUILDLINK_PKGSRCDIR.pidgin?=	../../chat/pidgin
 .endif	# PIDGIN_BUILDLINK3_MK
 
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index 46eefd0e02f..bb56ea9b257 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/04/29 12:35:10 jmmv Exp $
+# $NetBSD: options.mk,v 1.4 2008/05/17 23:45:47 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
 PKG_SUPPORTED_OPTIONS+=		dbus debug gstreamer gtkspell
@@ -13,24 +13,20 @@ 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)
+CONFIGURE_ARGS+=	--enable-gtkspell
 .  include "../../textproc/gtkspell/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-gtkspell
 .endif
 
 .if !empty(PKG_OPTIONS:Mgstreamer)
+CONFIGURE_ARGS+=	--enable-gstreamer
 .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gstreamer
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+= --enable-debug
-.else
-CONFIGURE_ARGS+= --disable-debug
 .endif