Update the pidgin IM suite to version 2.2.0.

The intltool that comes bundled with libpurple doesn't like NetBSD's
/usr/bin/iconv, so switch libpurple to use intltool from pkgsrc.

ChangeLog:

Version 2.2.0 (09/13/2007):
http://developer.pidgin.im/query?status=closed&milestone=2.2.0

Libpurple:
* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
  Code)
* XMPP enhancements. See
	  http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas
  Monitzer, Google Summer of Code for Adium)
* Certificate management. Libpurple will validate certificates on
  SSL-encrypted protocols (William Ehlhardt, Google Summer of Code)
* Some adjustments were made to fix sending messages when using
  the MSN HTTP method. (Laszlo Pandy)
* Yahoo! Chat is fixed.
* Some AIM file transfer issues between Pidgin and other clients
  have been fixed. (Kyryll A Mirnenko)
* Properly restore idle status and time for AIM and ICQ accounts
  when they reconnect after being disconnected.

Pidgin:
* Insert Horizontal Rules and Strikethrough text from toolbar.
* Option to show protocol icons in the buddy list, from the
  Buddies > Show menu. (Justin Heiner)
* Ability to build with native, non-X11 GTK+ on OSX. (Anders
  Hasselqvist)
* Remember the 'Enable Sounds' setting for a conversation.
* Right-clicking the empty space in the formatting toolbar
  allows you to toggle back to the old "ungrouped" version.
* Protocols supporting account registration via Pidgin now show
  a descriptive checkbox instead of a vague "Register" button.
* Fixed a bug where a tab would be shown on single conversations
  when tabs were disabled.

Finch:
* Per-conversation mute and logging options (accessible from the menu).

Version 2.1.1 (08/20/2007):
Yahoo:
* Added an account action to open your inbox in the yahoo prpl.
* Added support for Unicode status messages in Yahoo.
* Server-stored aliases for Yahoo. (John Moody)
* Fixed support for Yahoo! doodling.
* Limited support for MSN Messenger contacts

Bonjour:
* Bonjour plugin uses native Avahi instead of Howl
* Bonjour plugin supports Buddy Icons

XMPP:
* Only report conversation close when 'send typing notifications'
  preference is turned on (Bob Rossi)

Pidgin:
* Show current outgoing conversation formatting on the font label on
  the toolbar
* Slim new redesign of conversation tabs to maximize number of
  conversations that can fit in a window
* Tab bar is not visible when only one conversation is open. You can
  drag and drop conversations from the infopane.
* Moved "Reset Formatting" toolbar button to Font menu.
* Double click on the infopane to alias buddies and set topics
  on chats
* New smiley style

Finch:
* Sound support (Eric Polino)

3 files changed, 42 insertions, 14 deletions

diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 30766d9f1ac..ce1bf594eb6 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/08/30 17:20:06 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/15 14:55:02 tnn Exp $
 #
 
 PKGNAME=		pidgin-${PIDGIN_VERSION}
-PKGREVISION=		1
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -20,7 +19,7 @@ CONFIGURE_ARGS+=	--disable-gevolution
 CONFIGURE_ARGS+=	--enable-gtkui
 CONFIGURE_ARGS+=	--disable-consoleui
 
-BUILD_DIRS=pidgin
+BUILD_DIRS=		pidgin
 
 # includes "Arguments to configure" as string
 CHECK_WRKREF_SKIP=	bin/pidgin
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index 930070a3b1e..d4204b4df71 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/13 13:22:23 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/09/15 14:55:02 tnn Exp $
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
@@ -8,6 +8,7 @@ include/pidgin/gtkcellrendererexpander.h
 include/pidgin/gtkcellrendererprogress.h
 include/pidgin/gtkcellview.h
 include/pidgin/gtkcellviewmenuitem.h
+include/pidgin/gtkcertmgr.h
 include/pidgin/gtkconn.h
 include/pidgin/gtkconv.h
 include/pidgin/gtkconvwin.h
@@ -64,6 +65,7 @@ lib/pidgin/timestamp_format.la
 lib/pidgin/xmppconsole.la
 lib/pkgconfig/pidgin.pc
 share/icons/hicolor/16x16/apps/pidgin.png
+share/icons/hicolor/22x22/apps/pidgin.png
 share/icons/hicolor/24x24/apps/pidgin.png
 share/icons/hicolor/32x32/apps/pidgin.png
 share/icons/hicolor/48x48/apps/pidgin.png
@@ -88,6 +90,7 @@ share/pixmaps/pidgin/arrow-left.xpm
 share/pixmaps/pidgin/arrow-right.xpm
 share/pixmaps/pidgin/arrow-up.xpm
 share/pixmaps/pidgin/buttons/edit.png
+share/pixmaps/pidgin/buttons/info.png
 share/pixmaps/pidgin/buttons/pause.png
 share/pixmaps/pidgin/dialogs/16/auth.png
 share/pixmaps/pidgin/dialogs/16/error.png
@@ -138,6 +141,7 @@ share/pixmaps/pidgin/emotes/default/bomb.png
 share/pixmaps/pidgin/emotes/default/bowl.png
 share/pixmaps/pidgin/emotes/default/boy.png
 share/pixmaps/pidgin/emotes/default/brb.png
+share/pixmaps/pidgin/emotes/default/bulgy-eyes.png
 share/pixmaps/pidgin/emotes/default/bye.png
 share/pixmaps/pidgin/emotes/default/cake.png
 share/pixmaps/pidgin/emotes/default/call-me.png
@@ -162,6 +166,7 @@ share/pixmaps/pidgin/emotes/default/crying.png
 share/pixmaps/pidgin/emotes/default/curl-lip.png
 share/pixmaps/pidgin/emotes/default/curse.png
 share/pixmaps/pidgin/emotes/default/cute.png
+share/pixmaps/pidgin/emotes/default/cyclops.png
 share/pixmaps/pidgin/emotes/default/dance.png
 share/pixmaps/pidgin/emotes/default/dazed.png
 share/pixmaps/pidgin/emotes/default/desire.png
@@ -198,25 +203,31 @@ share/pixmaps/pidgin/emotes/default/handshake.png
 share/pixmaps/pidgin/emotes/default/highfive.png
 share/pixmaps/pidgin/emotes/default/hug-left.png
 share/pixmaps/pidgin/emotes/default/hug-right.png
-share/pixmaps/pidgin/emotes/default/hungry.png
 share/pixmaps/pidgin/emotes/default/hypnotized.png
 share/pixmaps/pidgin/emotes/default/in-love.png
 share/pixmaps/pidgin/emotes/default/island.png
 share/pixmaps/pidgin/emotes/default/jump.png
 share/pixmaps/pidgin/emotes/default/kiss.png
+share/pixmaps/pidgin/emotes/default/kissed.png
+share/pixmaps/pidgin/emotes/default/kissing.png
 share/pixmaps/pidgin/emotes/default/knife.png
 share/pixmaps/pidgin/emotes/default/lamp.png
 share/pixmaps/pidgin/emotes/default/lashes.png
 share/pixmaps/pidgin/emotes/default/laugh.png
 share/pixmaps/pidgin/emotes/default/liquor.png
+share/pixmaps/pidgin/emotes/default/loser.png
 share/pixmaps/pidgin/emotes/default/love-over.png
 share/pixmaps/pidgin/emotes/default/love.png
 share/pixmaps/pidgin/emotes/default/lying.png
 share/pixmaps/pidgin/emotes/default/mad-tongue.png
 share/pixmaps/pidgin/emotes/default/mail.png
+share/pixmaps/pidgin/emotes/default/male-fighter1.png
+share/pixmaps/pidgin/emotes/default/male-fighter2.png
 share/pixmaps/pidgin/emotes/default/mean.png
 share/pixmaps/pidgin/emotes/default/meeting.png
+share/pixmaps/pidgin/emotes/default/messed.png
 share/pixmaps/pidgin/emotes/default/mobile.png
+share/pixmaps/pidgin/emotes/default/mohawk.png
 share/pixmaps/pidgin/emotes/default/moneymouth.png
 share/pixmaps/pidgin/emotes/default/monkey.png
 share/pixmaps/pidgin/emotes/default/moon.png
@@ -224,6 +235,7 @@ share/pixmaps/pidgin/emotes/default/msn-away.png
 share/pixmaps/pidgin/emotes/default/msn-busy.png
 share/pixmaps/pidgin/emotes/default/msn.png
 share/pixmaps/pidgin/emotes/default/msn_online.png
+share/pixmaps/pidgin/emotes/default/music.png
 share/pixmaps/pidgin/emotes/default/musical-note.png
 share/pixmaps/pidgin/emotes/default/nailbiting.png
 share/pixmaps/pidgin/emotes/default/neutral.png
@@ -233,6 +245,7 @@ share/pixmaps/pidgin/emotes/default/peace.png
 share/pixmaps/pidgin/emotes/default/phone.png
 share/pixmaps/pidgin/emotes/default/pig.png
 share/pixmaps/pidgin/emotes/default/pill.png
+share/pixmaps/pidgin/emotes/default/pirate.png
 share/pixmaps/pidgin/emotes/default/pissed-off.png
 share/pixmaps/pidgin/emotes/default/pizza.png
 share/pixmaps/pidgin/emotes/default/plate.png
@@ -258,8 +271,10 @@ share/pixmaps/pidgin/emotes/default/shock.png
 share/pixmaps/pidgin/emotes/default/shout.png
 share/pixmaps/pidgin/emotes/default/shut-mouth.png
 share/pixmaps/pidgin/emotes/default/sick.png
+share/pixmaps/pidgin/emotes/default/sidefrown.png
 share/pixmaps/pidgin/emotes/default/sigarette.png
 share/pixmaps/pidgin/emotes/default/silly.png
+share/pixmaps/pidgin/emotes/default/sinister.png
 share/pixmaps/pidgin/emotes/default/skeleton.png
 share/pixmaps/pidgin/emotes/default/skywalker.png
 share/pixmaps/pidgin/emotes/default/sleepy.png
@@ -273,9 +288,11 @@ share/pixmaps/pidgin/emotes/default/soccerball.png
 share/pixmaps/pidgin/emotes/default/soldier.png
 share/pixmaps/pidgin/emotes/default/star.png
 share/pixmaps/pidgin/emotes/default/starving.png
+share/pixmaps/pidgin/emotes/default/stop.png
 share/pixmaps/pidgin/emotes/default/struggle.png
 share/pixmaps/pidgin/emotes/default/sun.png
 share/pixmaps/pidgin/emotes/default/sweat.png
+share/pixmaps/pidgin/emotes/default/talktohand.png
 share/pixmaps/pidgin/emotes/default/teeth.png
 share/pixmaps/pidgin/emotes/default/terror.png
 share/pixmaps/pidgin/emotes/default/theme
@@ -291,6 +308,7 @@ share/pixmaps/pidgin/emotes/default/vampire.png
 share/pixmaps/pidgin/emotes/default/victory.png
 share/pixmaps/pidgin/emotes/default/waiting.png
 share/pixmaps/pidgin/emotes/default/watermelon.png
+share/pixmaps/pidgin/emotes/default/waving.png
 share/pixmaps/pidgin/emotes/default/weep.png
 share/pixmaps/pidgin/emotes/default/wilt.png
 share/pixmaps/pidgin/emotes/default/wink.png
@@ -308,6 +326,7 @@ share/pixmaps/pidgin/protocols/16/irc.png
 share/pixmaps/pidgin/protocols/16/jabber.png
 share/pixmaps/pidgin/protocols/16/meanwhile.png
 share/pixmaps/pidgin/protocols/16/msn.png
+share/pixmaps/pidgin/protocols/16/myspace.png
 share/pixmaps/pidgin/protocols/16/novell.png
 share/pixmaps/pidgin/protocols/16/qq.png
 share/pixmaps/pidgin/protocols/16/silc.png
@@ -323,6 +342,7 @@ share/pixmaps/pidgin/protocols/22/irc.png
 share/pixmaps/pidgin/protocols/22/jabber.png
 share/pixmaps/pidgin/protocols/22/meanwhile.png
 share/pixmaps/pidgin/protocols/22/msn.png
+share/pixmaps/pidgin/protocols/22/myspace.png
 share/pixmaps/pidgin/protocols/22/novell.png
 share/pixmaps/pidgin/protocols/22/qq.png
 share/pixmaps/pidgin/protocols/22/silc.png
@@ -337,12 +357,22 @@ share/pixmaps/pidgin/protocols/48/irc.png
 share/pixmaps/pidgin/protocols/48/jabber.png
 share/pixmaps/pidgin/protocols/48/meanwhile.png
 share/pixmaps/pidgin/protocols/48/msn.png
+share/pixmaps/pidgin/protocols/48/myspace.png
 share/pixmaps/pidgin/protocols/48/novell.png
 share/pixmaps/pidgin/protocols/48/qq.png
 share/pixmaps/pidgin/protocols/48/silc.png
 share/pixmaps/pidgin/protocols/48/simple.png
 share/pixmaps/pidgin/protocols/48/yahoo.png
 share/pixmaps/pidgin/protocols/48/zephyr.png
+share/pixmaps/pidgin/status/11/available.png
+share/pixmaps/pidgin/status/11/away.png
+share/pixmaps/pidgin/status/11/busy.png
+share/pixmaps/pidgin/status/11/chat.png
+share/pixmaps/pidgin/status/11/extended-away.png
+share/pixmaps/pidgin/status/11/invisible.png
+share/pixmaps/pidgin/status/11/offline.png
+share/pixmaps/pidgin/status/11/person.png
+share/pixmaps/pidgin/status/11/rtl/extended-away.png
 share/pixmaps/pidgin/status/16/available.png
 share/pixmaps/pidgin/status/16/away.png
 share/pixmaps/pidgin/status/16/busy.png
@@ -351,10 +381,11 @@ share/pixmaps/pidgin/status/16/extended-away.png
 share/pixmaps/pidgin/status/16/invisible.png
 share/pixmaps/pidgin/status/16/log-in.png
 share/pixmaps/pidgin/status/16/log-out.png
-share/pixmaps/pidgin/status/16/message-pending.png
 share/pixmaps/pidgin/status/16/offline.png
 share/pixmaps/pidgin/status/16/person.png
 share/pixmaps/pidgin/status/16/rtl/extended-away.png
+share/pixmaps/pidgin/status/16/rtl/log-in.png
+share/pixmaps/pidgin/status/16/rtl/log-out.png
 share/pixmaps/pidgin/status/22/available.png
 share/pixmaps/pidgin/status/22/away.png
 share/pixmaps/pidgin/status/22/busy.png
@@ -366,6 +397,8 @@ share/pixmaps/pidgin/status/22/log-out.png
 share/pixmaps/pidgin/status/22/offline.png
 share/pixmaps/pidgin/status/22/person.png
 share/pixmaps/pidgin/status/22/rtl/extended-away.png
+share/pixmaps/pidgin/status/22/rtl/log-in.png
+share/pixmaps/pidgin/status/22/rtl/log-out.png
 share/pixmaps/pidgin/status/32/available.png
 share/pixmaps/pidgin/status/32/away.png
 share/pixmaps/pidgin/status/32/busy.png
@@ -376,6 +409,8 @@ share/pixmaps/pidgin/status/32/log-in.png
 share/pixmaps/pidgin/status/32/log-out.png
 share/pixmaps/pidgin/status/32/offline.png
 share/pixmaps/pidgin/status/32/person.png
+share/pixmaps/pidgin/status/32/rtl/log-in.png
+share/pixmaps/pidgin/status/32/rtl/log-out.png
 share/pixmaps/pidgin/status/32/rtl/extended-away.png
 share/pixmaps/pidgin/status/48/available.png
 share/pixmaps/pidgin/status/48/away.png
@@ -535,12 +570,6 @@ share/pixmaps/purple/buddy_icons/qq/qq_96.png
 share/pixmaps/purple/buddy_icons/qq/qq_97.png
 share/pixmaps/purple/buddy_icons/qq/qq_98.png
 share/pixmaps/purple/buddy_icons/qq/qq_99.png
-share/sounds/pidgin/alert.wav
-share/sounds/pidgin/login.wav
-share/sounds/pidgin/logout.wav
-share/sounds/pidgin/receive.wav
-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
@@ -559,6 +588,8 @@ share/sounds/pidgin/send.wav
 @dirrm share/pixmaps/pidgin/status/22
 @dirrm share/pixmaps/pidgin/status/16/rtl
 @dirrm share/pixmaps/pidgin/status/16
+@dirrm share/pixmaps/pidgin/status/11/rtl
+@dirrm share/pixmaps/pidgin/status/11
 @dirrm share/pixmaps/pidgin/status
 @dirrm share/pixmaps/pidgin/protocols/48
 @dirrm share/pixmaps/pidgin/protocols/22
diff --git a/chat/pidgin/TODO b/chat/pidgin/TODO
index 21e04ac5dbb..17b08c3697a 100644
--- a/chat/pidgin/TODO
+++ b/chat/pidgin/TODO
@@ -1,7 +1,5 @@
 + 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