Changes 2.7.3:

* Lots of little incremental bug fixes and enhancements in this release.
* Finally got some fixes out there for you Yahoo users behind some
  particularly annoying firewalls and proxies, among other fixes.  Enjoy!

Changes 2.7.2:
* We discovered a security issue in Pidgin 2.7.0 and 2.7.1 and decided to
  release a patched version quickly.  This release contains the fix for that
  crash, and a few other minor fixes.

12 files changed, 154 insertions, 145 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 348c2b3c882..4808a782674 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2010/06/13 22:43:56 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.22 2010/08/30 11:18:02 adam Exp $
 
 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	2
 
 COMMENT=	Multi-protocol Instant Messaging client console frontend
 
@@ -33,6 +31,7 @@ CONFIGURE_ARGS+=	--with-ncurses-headers=${BUILDLINK_DIR}/include
 USE_NCURSES=		yes # force ncurses, for libpanel
 
 BUILD_DIRS=		finch
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 .include "options.mk"
 
@@ -43,9 +42,8 @@ pre-build:
 	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple
 
 post-install:
-	${INSTALL_MAN_DIR} ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/finch.1 \
-		${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 58b0ae15fdf..34ec3be68b4 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2010/04/03 21:00:42 gdt Exp $
-#
+# $NetBSD: Makefile,v 1.21 2010/08/30 11:18:01 adam Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	3
 COMMENT=	Multi-protocol Instant Messaging client backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include		"../../chat/libpurple/Makefile.common"
 
+USE_TOOLS+=		msgfmt intltool
 CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 
-USE_TOOLS+=		msgfmt intltool
-
 PKGCONFIG_OVERRIDE+=	gaim.pc.in
 PKGCONFIG_OVERRIDE+=	libpurple/purple.pc.in
 
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 6d01614a33f..1ff53227ff0 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2009/12/08 12:45:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.31 2010/08/30 11:18:01 adam 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.6.2
+PIDGIN_VERSION=	2.7.3
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index ec06d029cd6..419b67498b8 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2010/02/26 09:48:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2010/08/30 11:18:01 adam Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -24,6 +24,10 @@ include/libpurple/log.h
 include/libpurple/marshallers.h
 include/libpurple/media-gst.h
 include/libpurple/media.h
+include/libpurple/media/backend-iface.h
+include/libpurple/media/candidate.h
+include/libpurple/media/codec.h
+include/libpurple/media/enum-types.h
 include/libpurple/mediamanager.h
 include/libpurple/mime.h
 include/libpurple/nat-pmp.h
@@ -74,6 +78,7 @@ lib/purple-2/libicq.la
 lib/purple-2/libirc.la
 lib/purple-2/libjabber.la
 lib/purple-2/libmsn.la
+lib/purple-2/libmxit.la
 lib/purple-2/libmyspace.la
 lib/purple-2/libnovell.la
 lib/purple-2/liboscar.la
@@ -102,6 +107,7 @@ 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/bn_IN/LC_MESSAGES/pidgin.mo
 share/locale/bs/LC_MESSAGES/pidgin.mo
 share/locale/ca/LC_MESSAGES/pidgin.mo
 share/locale/ca@valencia/LC_MESSAGES/pidgin.mo
@@ -139,12 +145,15 @@ share/locale/lo/LC_MESSAGES/pidgin.mo
 share/locale/lt/LC_MESSAGES/pidgin.mo
 share/locale/mk/LC_MESSAGES/pidgin.mo
 share/locale/mn/LC_MESSAGES/pidgin.mo
+share/locale/mr/LC_MESSAGES/pidgin.mo
+share/locale/ms_MY/LC_MESSAGES/pidgin.mo
 share/locale/my_MM/LC_MESSAGES/pidgin.mo
 share/locale/nb/LC_MESSAGES/pidgin.mo
 share/locale/ne/LC_MESSAGES/pidgin.mo
 share/locale/nl/LC_MESSAGES/pidgin.mo
 share/locale/nn/LC_MESSAGES/pidgin.mo
 share/locale/oc/LC_MESSAGES/pidgin.mo
+share/locale/or/LC_MESSAGES/pidgin.mo
 share/locale/pa/LC_MESSAGES/pidgin.mo
 share/locale/pl/LC_MESSAGES/pidgin.mo
 share/locale/ps/LC_MESSAGES/pidgin.mo
@@ -175,6 +184,7 @@ share/purple/ca-certs/AOL_Member_CA.pem
 share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 share/purple/ca-certs/CAcert_Class3.pem
 share/purple/ca-certs/CAcert_Root.pem
+share/purple/ca-certs/Entrust.net_Secure_Server_CA.pem
 share/purple/ca-certs/Equifax_Secure_CA.pem
 share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
 share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
@@ -183,6 +193,7 @@ share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
 share/purple/ca-certs/StartCom_Certification_Authority.pem
 share/purple/ca-certs/StartCom_Free_SSL_CA.pem
 share/purple/ca-certs/Thawte_Premium_Server_CA.pem
+share/purple/ca-certs/ValiCert_Class_2_VA.pem
 share/purple/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
 share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
 share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 33bbc8aa583..b1b20537e04 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.25 2009/12/08 12:45:42 wiz Exp $
+$NetBSD: distinfo,v 1.26 2010/08/30 11:18:01 adam Exp $
 
-SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
-RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
-Size (pidgin-2.6.2.tar.bz2) = 9093010 bytes
+SHA1 (pidgin-2.7.3.tar.bz2) = 81b9b5591ddbdf36aa656ddd90ff935ae090e940
+RMD160 (pidgin-2.7.3.tar.bz2) = 276fb19abf6505f9d56120c7412987002511fcb3
+Size (pidgin-2.7.3.tar.bz2) = 9746117 bytes
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 6f2bd9a246b..b222786234f 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2010/04/03 21:00:42 gdt Exp $
+# $NetBSD: options.mk,v 1.16 2010/08/30 11:18:01 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		avahi dbus debug farsight gnome gnutls
@@ -10,13 +10,13 @@ PKG_SUGGESTED_OPTIONS+=		avahi dbus farsight gnome gnutls gstreamer
 PLIST_VARS+=		avahi dbus gnome gnutls nss perl tcl
 
 .if !empty(PKG_OPTIONS:Mavahi)
-PLIST.avahi=            yes
+PLIST.avahi=		yes
 CONFIGURE_ARGS+=	--enable-avahi
 .  include "../../net/avahi/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
-PLIST.gnome= 		yes
+PLIST.gnome=		yes
 .  include "../../devel/GConf/schemas.mk"
 GCONF_SCHEMAS+=		purple.schemas
 .endif
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index ae9fe07876d..e6fc31a6ff4 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/06/13 22:43:58 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.11 2010/08/30 11:18:02 adam Exp $
 
-PKGNAME=		pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=		2
-COMMENT=		Lotus Sametime plugin for the Pidgin instant messenger
+PKGNAME=	pidgin-sametime-${PIDGIN_VERSION}
+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 e618366f1f6..aaf5c27544f 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:58 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2010/08/30 11:18:02 adam Exp $
 
-PKGNAME=		pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=		2
-COMMENT=		SILC plugin for the Pidgin instant messenger
+PKGNAME=	pidgin-silc-${PIDGIN_VERSION}
+COMMENT=	SILC plugin for the Pidgin instant messenger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -13,42 +11,12 @@ USE_TOOLS+=		msgfmt perl intltool
 
 BUILD_DIRS=		libpurple/protocols/silc
 
-# Because pkgsrc's silc-toolkit is too old, we have to jump through some very,
-# very, VERY nasty hoops to build this package. Hopefully this hack can be
-# removed soon.
-
-BUNDLE_SILC=yes
-.if defined(BUNDLE_SILC)
-
-DISTINFO_FILE=		${.CURDIR}/../../chat/pidgin-silc/distinfo
-SITES.silc-toolkit-1.1.7.tar.gz= \
-			http://www.silcnet.org/download/toolkit/sources/
-DISTFILES+=		pidgin-${PIDGIN_VERSION}.tar.bz2 silc-toolkit-1.1.7.tar.gz
-CFLAGS+=		-fPIC
-pre-configure:
-	# Build libsilc statically and install it into the buildlink dir
-	cd ${WRKDIR}/silc-toolkit-1.1.7 && ${SETENV} ${CONFIGURE_ENV} \
-	./configure --disable-asm --enable-static --disable-shared \
-	--without-libtoolfix --prefix=${BUILDLINK_DIR} && \
-	${SETENV} ${MAKE_ENV} gmake && \
-	${SETENV} ${MAKE_ENV} gmake install && \
-	cp ${WRKDIR}/silc-toolkit-1.1.7/lib/.libs/*.a \
-	${WRKSRC}/libpurple/protocols/silc
-
-SUBST_CLASSES+=		linkage
-SUBST_STAGE.linkage=	post-configure
-SUBST_MESSAGE.linkage=	Fixing static linkage
-SUBST_FILES.linkage=	libpurple/protocols/silc/Makefile
-SUBST_SED.linkage=	-e 's/-lsilcclient -lsilc/-Wl,--whole-archive,libsilcclient.a,libsilc.a,--no-whole-archive/'
-
-.endif
-
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
-#.include "../../devel/silc-toolkit/buildlink3.mk"
+.include "../../devel/silc-toolkit/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index ccf0ba2a57c..710a1b40a69 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/06/13 22:43:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/08/30 11:18:02 adam Exp $
 #
 # XXX appease pkglint
 #PKGNAME=		pidgin-${PIDGIN_VERSION}
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION=		3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index 4e1f5fe239d..16066dac3e5 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST,v 1.15 2009/12/08 12:45:42 wiz Exp $
+${PLIST.dbus}lib/pidgin/musicmessaging.la
+${PLIST.dbus}share/pixmaps/pidgin/buttons/music.png
+${PLIST.vv}lib/pidgin/vvconfig.la
+@comment $NetBSD: PLIST,v 1.16 2010/08/30 11:18:02 adam Exp $
 bin/pidgin
-include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
 include/pidgin/gtkblist-theme-loader.h
 include/pidgin/gtkblist-theme.h
 include/pidgin/gtkblist.h
-include/pidgin/gtkcelllayout.h
 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
@@ -19,7 +17,6 @@ include/pidgin/gtkdialogs.h
 include/pidgin/gtkdnd-hints.h
 include/pidgin/gtkdocklet.h
 include/pidgin/gtkeventloop.h
-include/pidgin/gtkexpander.h
 include/pidgin/gtkft.h
 include/pidgin/gtkgaim-compat.h
 include/pidgin/gtkicon-theme-loader.h
@@ -54,7 +51,6 @@ include/pidgin/gtkutils.h
 include/pidgin/gtkwhiteboard.h
 include/pidgin/minidialog.h
 include/pidgin/pidgin.h
-include/pidgin/pidgincombobox.h
 include/pidgin/pidginstock.h
 include/pidgin/pidgintooltip.h
 lib/pidgin/convcolors.la
@@ -64,7 +60,6 @@ lib/pidgin/gtkbuddynote.la
 lib/pidgin/history.la
 lib/pidgin/iconaway.la
 lib/pidgin/markerline.la
-${PLIST.dbus}lib/pidgin/musicmessaging.la
 lib/pidgin/notify.la
 lib/pidgin/pidginrc.la
 lib/pidgin/relnot.la
@@ -74,7 +69,6 @@ lib/pidgin/themeedit.la
 lib/pidgin/ticker.la
 lib/pidgin/timestamp.la
 lib/pidgin/timestamp_format.la
-${PLIST.vv}lib/pidgin/vvconfig.la
 lib/pidgin/xmppconsole.la
 lib/pidgin/xmppdisco.la
 lib/pkgconfig/pidgin.pc
@@ -94,18 +88,6 @@ share/pixmaps/pidgin/animations/16/connect5.png
 share/pixmaps/pidgin/animations/16/connect6.png
 share/pixmaps/pidgin/animations/16/connect7.png
 share/pixmaps/pidgin/animations/16/connect8.png
-share/pixmaps/pidgin/animations/16/typing0.png
-share/pixmaps/pidgin/animations/16/typing1.png
-share/pixmaps/pidgin/animations/16/typing2.png
-share/pixmaps/pidgin/animations/16/typing3.png
-share/pixmaps/pidgin/animations/16/typing4.png
-share/pixmaps/pidgin/animations/16/typing5.png
-share/pixmaps/pidgin/arrow-down.xpm
-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/animations/16/process-working0.png
 share/pixmaps/pidgin/animations/16/process-working1.png
 share/pixmaps/pidgin/animations/16/process-working10.png
@@ -137,7 +119,18 @@ share/pixmaps/pidgin/animations/16/process-working6.png
 share/pixmaps/pidgin/animations/16/process-working7.png
 share/pixmaps/pidgin/animations/16/process-working8.png
 share/pixmaps/pidgin/animations/16/process-working9.png
-${PLIST.dbus}share/pixmaps/pidgin/buttons/music.png
+share/pixmaps/pidgin/animations/16/typing0.png
+share/pixmaps/pidgin/animations/16/typing1.png
+share/pixmaps/pidgin/animations/16/typing2.png
+share/pixmaps/pidgin/animations/16/typing3.png
+share/pixmaps/pidgin/animations/16/typing4.png
+share/pixmaps/pidgin/animations/16/typing5.png
+share/pixmaps/pidgin/arrow-down.xpm
+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
@@ -171,8 +164,6 @@ share/pixmaps/pidgin/emblems/16/game.png
 share/pixmaps/pidgin/emblems/16/half-operator.png
 share/pixmaps/pidgin/emblems/16/hiptop.png
 share/pixmaps/pidgin/emblems/16/male.png
-share/pixmaps/pidgin/emblems/16/mobile.png
-share/pixmaps/pidgin/emblems/16/music.png
 share/pixmaps/pidgin/emblems/16/not-authorized.png
 share/pixmaps/pidgin/emblems/16/operator.png
 share/pixmaps/pidgin/emblems/16/qq-member.png
@@ -188,8 +179,6 @@ share/pixmaps/pidgin/emblems/scalable/female.svg
 share/pixmaps/pidgin/emblems/scalable/free-for-chat.svg
 share/pixmaps/pidgin/emblems/scalable/game.svg
 share/pixmaps/pidgin/emblems/scalable/male.svg
-share/pixmaps/pidgin/emblems/scalable/mobile.svg
-share/pixmaps/pidgin/emblems/scalable/music.svg
 share/pixmaps/pidgin/emblems/scalable/not-authorized.svg
 share/pixmaps/pidgin/emblems/scalable/qq-member.svg
 share/pixmaps/pidgin/emblems/scalable/secure.svg
@@ -197,8 +186,10 @@ share/pixmaps/pidgin/emblems/scalable/unavailable.svg
 share/pixmaps/pidgin/emblems/scalable/video.svg
 share/pixmaps/pidgin/emblems/scalable/voice.svg
 share/pixmaps/pidgin/emotes/default/act-up.png
+share/pixmaps/pidgin/emotes/default/afraid.png
 share/pixmaps/pidgin/emotes/default/airplane.png
 share/pixmaps/pidgin/emotes/default/alien.png
+share/pixmaps/pidgin/emotes/default/amorous.png
 share/pixmaps/pidgin/emotes/default/angel.png
 share/pixmaps/pidgin/emotes/default/angry.png
 share/pixmaps/pidgin/emotes/default/arrogant.png
@@ -210,6 +201,7 @@ share/pixmaps/pidgin/emotes/default/beauty.png
 share/pixmaps/pidgin/emotes/default/beer.png
 share/pixmaps/pidgin/emotes/default/blowkiss.png
 share/pixmaps/pidgin/emotes/default/bomb.png
+share/pixmaps/pidgin/emotes/default/bored.png
 share/pixmaps/pidgin/emotes/default/bowl.png
 share/pixmaps/pidgin/emotes/default/boy.png
 share/pixmaps/pidgin/emotes/default/brb.png
@@ -223,6 +215,7 @@ share/pixmaps/pidgin/emotes/default/can.png
 share/pixmaps/pidgin/emotes/default/car.png
 share/pixmaps/pidgin/emotes/default/cat.png
 share/pixmaps/pidgin/emotes/default/chicken.png
+share/pixmaps/pidgin/emotes/default/chilli.png
 share/pixmaps/pidgin/emotes/default/cigarette.png
 share/pixmaps/pidgin/emotes/default/clap.png
 share/pixmaps/pidgin/emotes/default/clock.png
@@ -231,6 +224,7 @@ share/pixmaps/pidgin/emotes/default/clover.png
 share/pixmaps/pidgin/emotes/default/clown.png
 share/pixmaps/pidgin/emotes/default/coffee.png
 share/pixmaps/pidgin/emotes/default/coins.png
+share/pixmaps/pidgin/emotes/default/cold.png
 share/pixmaps/pidgin/emotes/default/computer.png
 share/pixmaps/pidgin/emotes/default/confused.png
 share/pixmaps/pidgin/emotes/default/console.png
@@ -253,8 +247,8 @@ share/pixmaps/pidgin/emotes/default/doh.png
 share/pixmaps/pidgin/emotes/default/dont-know.png
 share/pixmaps/pidgin/emotes/default/drink.png
 share/pixmaps/pidgin/emotes/default/drool.png
-share/pixmaps/pidgin/emotes/default/eat.png
 share/pixmaps/pidgin/emotes/default/embarrassed.png
+share/pixmaps/pidgin/emotes/default/excited.png
 share/pixmaps/pidgin/emotes/default/excruciating.png
 share/pixmaps/pidgin/emotes/default/eyeroll.png
 share/pixmaps/pidgin/emotes/default/female-fighter.png
@@ -274,11 +268,14 @@ share/pixmaps/pidgin/emotes/default/good.png
 share/pixmaps/pidgin/emotes/default/hammer.png
 share/pixmaps/pidgin/emotes/default/handcuffs.png
 share/pixmaps/pidgin/emotes/default/handshake.png
+share/pixmaps/pidgin/emotes/default/happy.png
 share/pixmaps/pidgin/emotes/default/highfive.png
+share/pixmaps/pidgin/emotes/default/hot.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/in_love.png
 share/pixmaps/pidgin/emotes/default/island.png
 share/pixmaps/pidgin/emotes/default/jump.png
 share/pixmaps/pidgin/emotes/default/kiss.png
@@ -291,7 +288,6 @@ 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
@@ -305,13 +301,14 @@ 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
+share/pixmaps/pidgin/emotes/default/mrgreen.png
 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/nervous.png
 share/pixmaps/pidgin/emotes/default/neutral.png
 share/pixmaps/pidgin/emotes/default/on-the-phone.png
 share/pixmaps/pidgin/emotes/default/party.png
@@ -341,7 +338,7 @@ share/pixmaps/pidgin/emotes/default/search.png
 share/pixmaps/pidgin/emotes/default/secret.png
 share/pixmaps/pidgin/emotes/default/shame.png
 share/pixmaps/pidgin/emotes/default/sheep.png
-share/pixmaps/pidgin/emotes/default/shock.png
+share/pixmaps/pidgin/emotes/default/shocked.png
 share/pixmaps/pidgin/emotes/default/shout.png
 share/pixmaps/pidgin/emotes/default/shut-mouth.png
 share/pixmaps/pidgin/emotes/default/sick.png
@@ -350,9 +347,8 @@ 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/sleeping.png
 share/pixmaps/pidgin/emotes/default/sleepy.png
-share/pixmaps/pidgin/emotes/default/smile-big.png
-share/pixmaps/pidgin/emotes/default/smile.png
 share/pixmaps/pidgin/emotes/default/smirk.png
 share/pixmaps/pidgin/emotes/default/snail.png
 share/pixmaps/pidgin/emotes/default/snicker.png
@@ -362,9 +358,9 @@ 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/stressed.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
@@ -373,7 +369,6 @@ 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
 share/pixmaps/pidgin/emotes/default/tv.png
 share/pixmaps/pidgin/emotes/default/umbrella.png
@@ -386,50 +381,88 @@ share/pixmaps/pidgin/emotes/default/weep.png
 share/pixmaps/pidgin/emotes/default/wilt.png
 share/pixmaps/pidgin/emotes/default/wink.png
 share/pixmaps/pidgin/emotes/default/worship.png
-share/pixmaps/pidgin/emotes/default/yawn.png
 share/pixmaps/pidgin/emotes/default/yin-yang.png
 share/pixmaps/pidgin/emotes/none/theme
+share/pixmaps/pidgin/emotes/small/afraid.png
+share/pixmaps/pidgin/emotes/small/amorous.png
 share/pixmaps/pidgin/emotes/small/angel.png
 share/pixmaps/pidgin/emotes/small/angry.png
+share/pixmaps/pidgin/emotes/small/bathing.png
 share/pixmaps/pidgin/emotes/small/beer.png
+share/pixmaps/pidgin/emotes/small/bored.png
+share/pixmaps/pidgin/emotes/small/boy.png
 share/pixmaps/pidgin/emotes/small/camera.png
+share/pixmaps/pidgin/emotes/small/chilli.png
 share/pixmaps/pidgin/emotes/small/cigarette.png
+share/pixmaps/pidgin/emotes/small/cinema.png
 share/pixmaps/pidgin/emotes/small/coffee.png
+share/pixmaps/pidgin/emotes/small/cold.png
 share/pixmaps/pidgin/emotes/small/confused.png
 share/pixmaps/pidgin/emotes/small/console.png
 share/pixmaps/pidgin/emotes/small/cool.png
 share/pixmaps/pidgin/emotes/small/cross.png
 share/pixmaps/pidgin/emotes/small/crying.png
 share/pixmaps/pidgin/emotes/small/devil.png
+share/pixmaps/pidgin/emotes/small/disappointed.png
 share/pixmaps/pidgin/emotes/small/dont-know.png
+share/pixmaps/pidgin/emotes/small/drool.png
+share/pixmaps/pidgin/emotes/small/embarrassed.png
+share/pixmaps/pidgin/emotes/small/excited.png
+share/pixmaps/pidgin/emotes/small/excruciating.png
+share/pixmaps/pidgin/emotes/small/eyeroll.png
+share/pixmaps/pidgin/emotes/small/girl.png
 share/pixmaps/pidgin/emotes/small/grin.png
+share/pixmaps/pidgin/emotes/small/grumpy.png
+share/pixmaps/pidgin/emotes/small/happy.png
+share/pixmaps/pidgin/emotes/small/hot.png
 share/pixmaps/pidgin/emotes/small/hug-left.png
 share/pixmaps/pidgin/emotes/small/hug-right.png
+share/pixmaps/pidgin/emotes/small/hungry.png
+share/pixmaps/pidgin/emotes/small/in_love.png
+share/pixmaps/pidgin/emotes/small/internet.png
+share/pixmaps/pidgin/emotes/small/invincible.png
 share/pixmaps/pidgin/emotes/small/kiss.png
-share/pixmaps/pidgin/emotes/small/love.png
+share/pixmaps/pidgin/emotes/small/lamp.png
+share/pixmaps/pidgin/emotes/small/lying.png
 share/pixmaps/pidgin/emotes/small/meeting.png
+share/pixmaps/pidgin/emotes/small/mobile.png
+share/pixmaps/pidgin/emotes/small/mrgreen.png
+share/pixmaps/pidgin/emotes/small/music.png
 share/pixmaps/pidgin/emotes/small/musical-note.png
 share/pixmaps/pidgin/emotes/small/nerdy.png
 share/pixmaps/pidgin/emotes/small/neutral.png
 share/pixmaps/pidgin/emotes/small/party.png
 share/pixmaps/pidgin/emotes/small/phone.png
+share/pixmaps/pidgin/emotes/small/pirate.png
+share/pixmaps/pidgin/emotes/small/pissed-off.png
 share/pixmaps/pidgin/emotes/small/plate.png
 share/pixmaps/pidgin/emotes/small/question.png
+share/pixmaps/pidgin/emotes/small/restroom.png
+share/pixmaps/pidgin/emotes/small/rose.png
 share/pixmaps/pidgin/emotes/small/sad.png
+share/pixmaps/pidgin/emotes/small/search.png
 share/pixmaps/pidgin/emotes/small/shame.png
-share/pixmaps/pidgin/emotes/small/shock.png
+share/pixmaps/pidgin/emotes/small/shocked.png
+share/pixmaps/pidgin/emotes/small/shopping.png
+share/pixmaps/pidgin/emotes/small/shut-mouth.png
 share/pixmaps/pidgin/emotes/small/sick.png
 share/pixmaps/pidgin/emotes/small/silent.png
+share/pixmaps/pidgin/emotes/small/sleeping.png
 share/pixmaps/pidgin/emotes/small/sleepy.png
-share/pixmaps/pidgin/emotes/small/smile-big.png
-share/pixmaps/pidgin/emotes/small/smile.png
+share/pixmaps/pidgin/emotes/small/star.png
+share/pixmaps/pidgin/emotes/small/stressed.png
+share/pixmaps/pidgin/emotes/small/studying.png
+share/pixmaps/pidgin/emotes/small/suit.png
+share/pixmaps/pidgin/emotes/small/surfing.png
 share/pixmaps/pidgin/emotes/small/theme
 share/pixmaps/pidgin/emotes/small/thinking.png
 share/pixmaps/pidgin/emotes/small/tongue.png
 share/pixmaps/pidgin/emotes/small/tv.png
+share/pixmaps/pidgin/emotes/small/typing.png
 share/pixmaps/pidgin/emotes/small/uhm-yeah.png
 share/pixmaps/pidgin/emotes/small/wink.png
-share/pixmaps/pidgin/emotes/small/yawn.png
+share/pixmaps/pidgin/emotes/small/working.png
+share/pixmaps/pidgin/emotes/small/writing.png
 share/pixmaps/pidgin/logo.png
 share/pixmaps/pidgin/protocols/16/aim.png
 share/pixmaps/pidgin/protocols/16/bonjour.png
@@ -440,6 +473,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/mxit.png
 share/pixmaps/pidgin/protocols/16/myspace.png
 share/pixmaps/pidgin/protocols/16/novell.png
 share/pixmaps/pidgin/protocols/16/qq.png
@@ -471,6 +505,7 @@ 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/mxit.png
 share/pixmaps/pidgin/protocols/48/myspace.png
 share/pixmaps/pidgin/protocols/48/novell.png
 share/pixmaps/pidgin/protocols/48/qq.png
@@ -487,6 +522,7 @@ share/pixmaps/pidgin/protocols/scalable/irc.svg
 share/pixmaps/pidgin/protocols/scalable/jabber.svg
 share/pixmaps/pidgin/protocols/scalable/meanwhile.svg
 share/pixmaps/pidgin/protocols/scalable/msn.svg
+share/pixmaps/pidgin/protocols/scalable/mxit.svg
 share/pixmaps/pidgin/protocols/scalable/novell.svg
 share/pixmaps/pidgin/protocols/scalable/qq.svg
 share/pixmaps/pidgin/protocols/scalable/silc.svg
@@ -566,6 +602,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/get-attention.png
 share/pixmaps/pidgin/toolbar/16/insert-image.png
 share/pixmaps/pidgin/toolbar/16/insert-link.png
 share/pixmaps/pidgin/toolbar/16/insert.png
@@ -590,39 +627,40 @@ share/pixmaps/pidgin/tray/16/extended-away_4bit.ico
 share/pixmaps/pidgin/tray/16/invisible_4bit.ico
 share/pixmaps/pidgin/tray/16/message_4bit.ico
 share/pixmaps/pidgin/tray/16/offline_4bit.ico
-share/pixmaps/pidgin/tray/16/tray-away.png
-share/pixmaps/pidgin/tray/16/tray-busy.png
-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
-share/pixmaps/pidgin/tray/22/tray-busy.png
-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-message.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-message.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/pidgin/tray/hicolor/16x16/status/pidgin-tray-available.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-away.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-busy.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-connect.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-email.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-invisible.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-offline.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-pending.png
+share/pixmaps/pidgin/tray/hicolor/16x16/status/pidgin-tray-xa.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-available.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-away.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-busy.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-connect.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-email.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-invisible.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-offline.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-pending.png
+share/pixmaps/pidgin/tray/hicolor/22x22/status/pidgin-tray-xa.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-available.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-away.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-busy.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-connect.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-email.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-invisible.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-offline.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-pending.png
+share/pixmaps/pidgin/tray/hicolor/32x32/status/pidgin-tray-xa.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-available.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-away.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-busy.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-connect.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-email.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-invisible.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-offline.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-pending.png
+share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-xa.png
+share/pixmaps/pidgin/tray/hicolor/index.theme
diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk
index a23f24f460d..fec507b6d80 100644
--- a/chat/pidgin/buildlink3.mk
+++ b/chat/pidgin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:43:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/08/30 11:18:02 adam Exp $
 
 BUILDLINK_TREE+=	pidgin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	pidgin
 PIDGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.5.1
-BUILDLINK_ABI_DEPENDS.pidgin?=	pidgin>=2.6.2nb3
+BUILDLINK_ABI_DEPENDS.pidgin+=	pidgin>=2.6.2nb3
 BUILDLINK_PKGSRCDIR.pidgin?=	../../chat/pidgin
 
 .include "../../chat/libpurple/buildlink3.mk"
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index 58aa0110f3f..e711253c6ad 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.9 2009/12/22 06:54:28 dsainty Exp $
+# $NetBSD: options.mk,v 1.10 2010/08/30 11:18:02 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
 PKG_SUPPORTED_OPTIONS+=		dbus debug farsight gstreamer gtkspell
-PKG_SUGGESTED_OPTIONS+=		gtkspell dbus farsight gstreamer
+PKG_SUGGESTED_OPTIONS+=		dbus gtkspell farsight gstreamer
 
 .include "../../mk/bsd.options.mk"