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)

7 files changed, 71 insertions, 52 deletions

diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index c1b09917c93..9480a06db19 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2007/08/30 17:13:15 gdt Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/15 14:55:01 tnn Exp $
 #
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
 COMMENT=	Multi-protocol Instant Messaging client backend
-PKGREVISION=	2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include		"../../chat/libpurple/Makefile.common"
 
-# for the pidgin intltool, see TODO
-DEPENDS+=		p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-
 CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 
-USE_TOOLS+=		msgfmt
+USE_TOOLS+=		msgfmt intltool
 ## #USE_DIRS+=		xdg-1.2
 
 GCONF2_SCHEMAS+=	purple.schemas
@@ -29,14 +25,11 @@ CONFIGURE_ARGS+=	--disable-consoleui
 
 .include "options.mk"
 
-BUILD_DIRS=	m4macros libpurple po
+BUILD_DIRS=	m4macros libpurple po share
 
 ## #post-build:
 ## #	cp ${WRKSRC}/libpurple/gconf/purple.schemas ${WRKSRC}/purple.schemas
 
-# XXX Use textproc/intltool instead of included intltool.
-# XXX On NetBSD 3.0: iconv: iconv_open(UTF-8, tis-620): Invalid argument
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 46b0e21dbe8..3288486869d 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2007/08/13 12:42:06 tnn Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/09/15 14:55:01 tnn Exp $
 #
 
-PIDGIN_VERSION=	2.1.0
+PIDGIN_VERSION=	2.2.0
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.pidgin.im/
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config gmake perl:run
+USE_TOOLS+=		pkg-config gmake
 USE_PKGLOCALEDIR=	yes
 
 PATCHDIR=		${.CURDIR}/../../chat/libpurple/patches
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 831dc28f495..bcec783a61e 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2007/08/13 22:18:58 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/09/15 14:55:02 tnn Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
 include/libpurple/buddyicon.h
+include/libpurple/certificate.h
 include/libpurple/cipher.h
 include/libpurple/circbuffer.h
 include/libpurple/cmds.h
@@ -61,6 +62,7 @@ lib/purple-2/libirc.la
 lib/purple-2/libjabber.la
 lib/purple-2/libmsn.la
 lib/purple-2/libnovell.la
+lib/purple-2/libmyspace.la
 lib/purple-2/liboscar.la
 lib/purple-2/libqq.la
 lib/purple-2/libsimple.la
@@ -81,6 +83,7 @@ share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
 share/locale/az/LC_MESSAGES/pidgin.mo
+share/locale/be@latin/LC_MESSAGES/pidgin.mo
 share/locale/bg/LC_MESSAGES/pidgin.mo
 share/locale/bn/LC_MESSAGES/pidgin.mo
 share/locale/bs/LC_MESSAGES/pidgin.mo
@@ -143,6 +146,15 @@ share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
 share/locale/zh_HK/LC_MESSAGES/pidgin.mo
 share/locale/zh_TW/LC_MESSAGES/pidgin.mo
+share/purple/ca-certs/Equifax_Secure_CA.pem
+share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
+share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
+share/sounds/purple/alert.wav
+share/sounds/purple/login.wav
+share/sounds/purple/logout.wav
+share/sounds/purple/receive.wav
+share/sounds/purple/send.wav
 ${DBUS}bin/purple-client-example
 ${DBUS}bin/purple-remote
 ${DBUS}bin/purple-send
@@ -157,3 +169,6 @@ ${DBUS}lib/libpurple-client.la
 ${DBUS}lib/purple-2/dbus-example.la
 @dirrm lib/purple-2
 @dirrm include/libpurple
+@dirrm share/purple/ca-certs
+@dirrm share/purple
+@dirrm share/sounds/purple
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 38f8a838e2a..ae6c65fb802 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2007/08/30 16:08:03 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/09/15 14:55:02 tnn Exp $
 
-SHA1 (pidgin-2.1.0.tar.bz2) = 33f78d07c3c7797a710bb7d2032a8d0bd89a6ab3
-RMD160 (pidgin-2.1.0.tar.bz2) = d04437251fbea8a1902621ebdf98f6fdc826a6d4
-Size (pidgin-2.1.0.tar.bz2) = 7772942 bytes
-SHA1 (patch-aa) = dadaf534f32384741edae7fa25eb7e3265121698
+SHA1 (pidgin-2.2.0.tar.bz2) = b6762d5d7865587bfe0d87f95285d60cd8c667a1
+RMD160 (pidgin-2.2.0.tar.bz2) = 7b99cee79cfcd3cd1536636f381830cc18d0b8f9
+Size (pidgin-2.2.0.tar.bz2) = 8101465 bytes
+SHA1 (patch-aa) = 39cabf6d8f4bf9519cd523519c8dd7851a0c72cd
 SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
 SHA1 (patch-ae) = 82cc41e44609480f30062f922ca6001d57336862
-SHA1 (patch-af) = 047d03f91ef386a92e302e7fa2c46ad2d08214e4
-SHA1 (patch-ag) = 0ec16d0937584f63cded37e3085425d0153c24ee
+SHA1 (patch-af) = 665d5207afdc3ec9b627ac7cc7f99e75d4382877
+SHA1 (patch-ag) = 79a9e88be709f351dd25507b7c588891ff97d99f
diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa
index 2798773d755..240c1b5fa69 100644
--- a/chat/libpurple/patches/patch-aa
+++ b/chat/libpurple/patches/patch-aa
@@ -1,8 +1,28 @@
-$NetBSD: patch-aa,v 1.5 2007/08/30 16:08:03 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2007/09/15 14:55:02 tnn Exp $
 
---- configure.orig	2007-08-30 15:40:54.000000000 +0000
+--- configure.orig	2007-09-14 09:31:39.000000000 +0200
 +++ configure
-@@ -28183,7 +28183,7 @@ if test "${ac_cv_lib_panel_update_panels
+@@ -20053,6 +20053,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+ 
+ 
+ 
++INTLTOOL_EXTRACT=intltool-extract
++INTLTOOL_MERGE=intltool-merge
++INTLTOOL_UPDATE=intltool-update
++# disable pidgin's builtin intltool
++if test -n ""; then
+ # Use the tools built into the package, not the ones that are installed.
+ INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+ 
+@@ -20123,6 +20128,7 @@ echo "$as_me: error: XML::Parser perl mo
+    { (exit 1); exit 1; }; }
+    fi
+ fi
++fi # pkgsrc
+ 
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ 
+@@ -28428,7 +28434,7 @@ if test "${ac_cv_lib_panel_update_panels
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +31,7 @@ $NetBSD: patch-aa,v 1.5 2007/08/30 16:08:03 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28239,7 +28239,7 @@ fi
+@@ -28484,7 +28490,7 @@ fi
  { echo "$as_me:$LINENO: result: $ac_cv_lib_panel_update_panels" >&5
  echo "${ECHO_T}$ac_cv_lib_panel_update_panels" >&6; }
  if test $ac_cv_lib_panel_update_panels = yes; then
diff --git a/chat/libpurple/patches/patch-af b/chat/libpurple/patches/patch-af
index 3de49c1d4ba..300851d47b4 100644
--- a/chat/libpurple/patches/patch-af
+++ b/chat/libpurple/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1.1.1 2007/07/28 12:10:45 gdt Exp $
+$NetBSD: patch-af,v 1.2 2007/09/15 14:55:02 tnn Exp $
 
   .desktop file only in the pidgin package
 
---- Makefile.in.orig	2007-06-03 14:36:13.000000000 +0200
+--- Makefile.in.orig	2007-09-14 09:31:38.000000000 +0200
 +++ Makefile.in
-@@ -449,7 +449,7 @@ noinst_HEADERS = config.h
+@@ -466,7 +466,7 @@ noinst_HEADERS = config.h
  #	cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common
  appsdir = $(datadir)/applications
  apps_in_files = pidgin.desktop.in
@@ -12,4 +12,4 @@ $NetBSD: patch-af,v 1.1.1.1 2007/07/28 12:10:45 gdt Exp $
 +@ENABLE_GTK_TRUE@apps_DATA = $(apps_in_files:.desktop.in=.desktop)
  @ENABLE_GTK_TRUE@GTK_DIR = pidgin
  @ENABLE_GNT_TRUE@GNT_DIR = finch
- SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po
+ SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po share
diff --git a/chat/libpurple/patches/patch-ag b/chat/libpurple/patches/patch-ag
index 83050c61902..9f630b461fd 100644
--- a/chat/libpurple/patches/patch-ag
+++ b/chat/libpurple/patches/patch-ag
@@ -1,26 +1,17 @@
-$NetBSD: patch-ag,v 1.1 2007/08/13 13:57:47 tnn Exp $
+$NetBSD: patch-ag,v 1.2 2007/09/15 14:55:02 tnn Exp $
 
---- finch/libgnt/wms/s.c.orig	2007-06-23 05:06:32.000000000 +0200
-+++ finch/libgnt/wms/s.c
-@@ -15,10 +15,10 @@
- 
- #define TYPE_S				(s_get_gtype())
+  The default rule has a broken syntax for some reason, when not using
+  the intltool that comes bundled with pidgin.
+
+--- libpurple/gconf/Makefile.in.orig	2007-09-15 15:41:50.000000000 +0200
++++ libpurple/gconf/Makefile.in
+@@ -593,7 +593,8 @@ uninstall-am: uninstall-info-am uninstal
+ 	ps ps-am uninstall uninstall-am uninstall-info-am \
+ 	uninstall-schemaDATA
  
--typedef struct _S
-+typedef struct _Sfoo
- {
- 	GntWM inherit;
--} S;
-+} Sfoo;
+-@INTLTOOL_SCHEMAS_RULE@
++%.schemas:   %.schemas.in
++	LC_ALL=C intltool-merge -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
  
- typedef struct _SClass
- {
-@@ -205,7 +205,7 @@ GType s_get_gtype(void)
- 			(GClassInitFunc)s_class_init,
- 			NULL,
- 			NULL,                   /* class_data		*/
--			sizeof(S),
-+			sizeof(Sfoo),
- 			0,                      /* n_preallocs		*/
- 			NULL,	            /* instance_init	*/
- 			NULL
+ @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
+ @GCONF_SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \