Update to pidgin-2.1.0:

version 2.1.0 (07/28/2007):
Pidgin:
 * Ensure only one copy of Pidgin is running with a given configuration
   directory.  The net effect of this is that trying to start Pidgin a
   second time will raise the buddy list.  (Gabriel Schulhof)
 * Undo capability in the conversation window
 * The formatting toolbar has been reorganized to be more concise.
 * A new status area has been added to the top of conversations to
   provide additional detail about the buddy, including buddy icon,
   protocol and status message.
 * Show idle times in the buddy list as days, hours, seconds

version 2.0.2 (06/14/2007):
Pidgin:
 * Added a custom conversation font option to preferences
 * Fixed smiley ordering in the insert smiley popup to be more intuitive
 * Conversation->More menu items work for Chats as well as Buddies,
   including those not on your buddy list
 * newline plugin should work better with conversation colors plugin now
 * Get Info on users now provides immediate feedback that something is
   happening
 * Aliasing a buddy will not be interrupted by other buddy list activity
 * Using the -l option to log in to a specific account works better

3 files changed, 33 insertions, 4 deletions

diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index ec90c22e307..ff2a249bdb9 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/08/04 14:01:38 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/13 13:22:23 tnn Exp $
 #
 
-PKGNAME=		pidgin-${VERSION}
+PKGNAME=		pidgin-${PIDGIN_VERSION}
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION=		1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index c3ed7fe9e4b..930070a3b1e 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/28 12:12:33 gdt Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/08/13 13:22:23 tnn Exp $
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
@@ -38,6 +38,8 @@ include/pidgin/gtkscrollbook.h
 include/pidgin/gtksession.h
 include/pidgin/gtksound.h
 include/pidgin/gtksourceiter.h
+include/pidgin/gtksourceundomanager.h
+include/pidgin/gtksourceview-marshal.h
 include/pidgin/gtkstatusbox.h
 include/pidgin/gtkthemes.h
 include/pidgin/gtkutils.h
@@ -48,6 +50,7 @@ include/pidgin/pidginstock.h
 lib/pidgin/convcolors.la
 lib/pidgin/extplacement.la
 lib/pidgin/gestures.la
+lib/pidgin/gtkbuddynote.la
 lib/pidgin/history.la
 lib/pidgin/iconaway.la
 lib/pidgin/markerline.la
@@ -124,6 +127,7 @@ share/pixmaps/pidgin/emotes/default/alien.png
 share/pixmaps/pidgin/emotes/default/angel.png
 share/pixmaps/pidgin/emotes/default/angry.png
 share/pixmaps/pidgin/emotes/default/arrogant.png
+share/pixmaps/pidgin/emotes/default/at-wits-end.png
 share/pixmaps/pidgin/emotes/default/bad.png
 share/pixmaps/pidgin/emotes/default/bashful.png
 share/pixmaps/pidgin/emotes/default/beat-up.png
@@ -174,6 +178,7 @@ share/pixmaps/pidgin/emotes/default/eat.png
 share/pixmaps/pidgin/emotes/default/embarrassed.png
 share/pixmaps/pidgin/emotes/default/excruciating.png
 share/pixmaps/pidgin/emotes/default/eyeroll.png
+share/pixmaps/pidgin/emotes/default/female-fighter.png
 share/pixmaps/pidgin/emotes/default/film.png
 share/pixmaps/pidgin/emotes/default/fingers-crossed.png
 share/pixmaps/pidgin/emotes/default/flag.png
@@ -222,6 +227,7 @@ share/pixmaps/pidgin/emotes/default/msn_online.png
 share/pixmaps/pidgin/emotes/default/musical-note.png
 share/pixmaps/pidgin/emotes/default/nailbiting.png
 share/pixmaps/pidgin/emotes/default/neutral.png
+share/pixmaps/pidgin/emotes/default/on-the-phone.png
 share/pixmaps/pidgin/emotes/default/party.png
 share/pixmaps/pidgin/emotes/default/peace.png
 share/pixmaps/pidgin/emotes/default/phone.png
@@ -275,6 +281,7 @@ share/pixmaps/pidgin/emotes/default/terror.png
 share/pixmaps/pidgin/emotes/default/theme
 share/pixmaps/pidgin/emotes/default/thinking.png
 share/pixmaps/pidgin/emotes/default/thunder.png
+share/pixmaps/pidgin/emotes/default/time-out.png
 share/pixmaps/pidgin/emotes/default/tongue.png
 share/pixmaps/pidgin/emotes/default/tremble.png
 share/pixmaps/pidgin/emotes/default/turtle.png
@@ -386,6 +393,7 @@ share/pixmaps/pidgin/toolbar/16/emote-select.png
 share/pixmaps/pidgin/toolbar/16/font-face.png
 share/pixmaps/pidgin/toolbar/16/font-size-down.png
 share/pixmaps/pidgin/toolbar/16/font-size-up.png
+share/pixmaps/pidgin/toolbar/16/insert.png
 share/pixmaps/pidgin/toolbar/16/insert-image.png
 share/pixmaps/pidgin/toolbar/16/insert-link.png
 share/pixmaps/pidgin/toolbar/16/message-new.png
@@ -399,6 +407,7 @@ share/pixmaps/pidgin/tray/16/tray-connecting.png
 share/pixmaps/pidgin/tray/16/tray-extended-away.png
 share/pixmaps/pidgin/tray/16/tray-invisible.png
 share/pixmaps/pidgin/tray/16/tray-message.png
+share/pixmaps/pidgin/tray/16/tray-new-im.png
 share/pixmaps/pidgin/tray/16/tray-offline.png
 share/pixmaps/pidgin/tray/16/tray-online.png
 share/pixmaps/pidgin/tray/22/tray-away.png
@@ -407,8 +416,25 @@ share/pixmaps/pidgin/tray/22/tray-connecting.png
 share/pixmaps/pidgin/tray/22/tray-extended-away.png
 share/pixmaps/pidgin/tray/22/tray-invisible.png
 share/pixmaps/pidgin/tray/22/tray-message.png
+share/pixmaps/pidgin/tray/22/tray-new-im.png
 share/pixmaps/pidgin/tray/22/tray-offline.png
 share/pixmaps/pidgin/tray/22/tray-online.png
+share/pixmaps/pidgin/tray/32/tray-away.png
+share/pixmaps/pidgin/tray/32/tray-busy.png
+share/pixmaps/pidgin/tray/32/tray-connecting.png
+share/pixmaps/pidgin/tray/32/tray-extended-away.png
+share/pixmaps/pidgin/tray/32/tray-invisible.png
+share/pixmaps/pidgin/tray/32/tray-new-im.png
+share/pixmaps/pidgin/tray/32/tray-offline.png
+share/pixmaps/pidgin/tray/32/tray-online.png
+share/pixmaps/pidgin/tray/48/tray-away.png
+share/pixmaps/pidgin/tray/48/tray-busy.png
+share/pixmaps/pidgin/tray/48/tray-connecting.png
+share/pixmaps/pidgin/tray/48/tray-extended-away.png
+share/pixmaps/pidgin/tray/48/tray-invisible.png
+share/pixmaps/pidgin/tray/48/tray-new-im.png
+share/pixmaps/pidgin/tray/48/tray-offline.png
+share/pixmaps/pidgin/tray/48/tray-online.png
 share/pixmaps/purple/buddy_icons/qq/qq_1.png
 share/pixmaps/purple/buddy_icons/qq/qq_10.png
 share/pixmaps/purple/buddy_icons/qq/qq_100.png
@@ -517,6 +543,8 @@ share/sounds/pidgin/send.wav
 @dirrm share/sounds/pidgin
 @dirrm share/pixmaps/purple/buddy_icons/qq
 @dirrm share/pixmaps/purple/buddy_icons
+@dirrm share/pixmaps/pidgin/tray/48
+@dirrm share/pixmaps/pidgin/tray/32
 @dirrm share/pixmaps/pidgin/tray/22
 @dirrm share/pixmaps/pidgin/tray/16
 @dirrm share/pixmaps/pidgin/tray
diff --git a/chat/pidgin/TODO b/chat/pidgin/TODO
index 17b08c3697a..21e04ac5dbb 100644
--- a/chat/pidgin/TODO
+++ b/chat/pidgin/TODO
@@ -1,5 +1,7 @@
 + Builds and installs. Works so with IRC.
 
+- Remove silc and sametime options from libpurple and instead provide plugin
+  packages e.g. chat/pidgin-silc or chat/libpurple-silc
 - does not install pidgin.1 in doc/Makefile. Why? finch does it.
 - options.mk: is this sufficient?
 - gstreamer should be a suggested option