Update pidgin to 2.10.4.

version 2.10.4 (05/06/2012):
	General:
	* Support building against Farstream in addition to Farsight.
	  (Olivier Crete) (#14936)

	IRC:
	* Disable periodic WHO timer.  IRC channel user lists will no
	  longer automatically display away status, but libpurple will be
	  much kinder to the network.
	* Print unknown numerics to channel windows if we can associate
	  them.  Thanks to Marien Zwart. (#15090)

	MSN:
	* Fix a possible crash when receiving messages with certain characters
	  or character encodings.  Thanks to Fabian Yamaguchi for reporting
	  this!

	XMPP:
	* Fix a possible crash when receiving a series of specially crafted
	  file transfer requests.  Thanks to José Valentín Gutiérrez for
	  reporting this!  (CVE-2012-2214)

	Windows-Specific Changes:
	* Words added to spell check dictionaries are saved across restarts of
	  Pidgin (#11886)

7 files changed, 14 insertions, 16 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 4ab3f1540e1..1a5172d7c22 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2012/04/27 12:31:34 obache Exp $
+# $NetBSD: Makefile,v 1.41 2012/05/15 13:07:28 obache Exp $
 
 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	Multi-protocol Instant Messaging client console frontend
 
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 4698ff28bbb..271401eaf82 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2012/04/27 12:31:35 obache Exp $
+# $NetBSD: Makefile,v 1.42 2012/05/15 13:07:28 obache Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	1
+
 COMMENT=	Multi-protocol Instant Messaging client backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index cc65073a4b2..89f126c775a 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2012/04/04 13:20:06 obache Exp $
+# $NetBSD: Makefile.common,v 1.38 2012/05/15 13:07:28 obache Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile
 
-PIDGIN_VERSION=	2.10.3
+PIDGIN_VERSION=	2.10.4
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 33b4ffb54ba..ba441b22e20 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.34 2012/04/25 16:27:50 drochner Exp $
+$NetBSD: distinfo,v 1.35 2012/05/15 13:07:28 obache Exp $
 
-SHA1 (pidgin-2.10.3.tar.bz2) = 7dfeabdb1ade4311c91ac9c9f988276f67ead6ee
-RMD160 (pidgin-2.10.3.tar.bz2) = 10af4caee9f22a251f867e3befebcc659e2b42f3
-Size (pidgin-2.10.3.tar.bz2) = 9970676 bytes
+SHA1 (pidgin-2.10.4.tar.bz2) = f9ce34e69f97bcd1bb216aefb6d687b5b47f0796
+RMD160 (pidgin-2.10.4.tar.bz2) = 5193a7f5dbd122198d474bd7e11dc9bf307befb3
+Size (pidgin-2.10.4.tar.bz2) = 9970850 bytes
 SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29
 SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 7f89fd913aa..d08fb0e092f 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2012/04/27 12:31:36 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/05/15 13:07:28 obache Exp $
 
 PKGNAME=	pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=	1
+
 COMMENT=	Lotus Sametime plugin for the Pidgin instant messenger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index ebb3567edce..7e441b6cd52 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2012/04/27 12:31:37 obache Exp $
+# $NetBSD: Makefile,v 1.31 2012/05/15 13:07:28 obache Exp $
 
 PKGNAME=	pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=	1
+
 COMMENT=	SILC plugin for the Pidgin instant messenger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 8750f6ea229..29e002483a4 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.40 2012/04/27 12:31:35 obache Exp $
+# $NetBSD: Makefile,v 1.41 2012/05/15 13:07:28 obache Exp $
 
-PKGREVISION=		1
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
 
 PKG_DESTDIR_SUPPORT=	user-destdir