15 files changed, 179 insertions, 142 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 543cc462ef5a..6eb6dda1f934 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	finch
-PORTREVISION=	1
+PORTREVISION=	0
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index a583ef0c5e52..5a906cc1a281 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.6.6
-PORTREVISION?=	2
+PORTVERSION=	2.7.0
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT?=	Backend library for the Pidgin multi-protocol messaging client
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME?=	gnomeprefix gnomehack intlhack glib20 libxml2
+USE_GNOME?=	gnomeprefix gnomehack glib20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
 		--disable-consoleui \
@@ -167,9 +167,6 @@ PLIST_SUB+=	BONJOUR="@comment not installed: "
 .if defined(WITH_TCLTK)
 TCLTK_VER?=		8.4	# user can override it
 TCLTK_VER_NODOT=	${TCLTK_VER:S/.//}
-.if ${TCLTK_VER} != 8.3 && ${TCLTK_VER} != 8.4
-.error Currently Pidgin can only use Tcl/Tk 8.3 or 8.4
-.endif
 LIB_DEPENDS+=		tk${TCLTK_VER_NODOT}:${PORTSDIR}/x11-toolkits/tk${TCLTK_VER_NODOT}
 CONFIGURE_ARGS+=	--with-tclconfig=${LOCALBASE}/lib/tcl${TCLTK_VER} \
 			--with-tkconfig=${LOCALBASE}/lib/tk${TCLTK_VER}
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index d9519fb96c5c..099c29e236af 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.6.6.tar.bz2) = b37ab6c52db8355e8c70c044c2ba17c1
-SHA256 (pidgin-2.6.6.tar.bz2) = 6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9
-SIZE (pidgin-2.6.6.tar.bz2) = 9479337
+MD5 (pidgin-2.7.0.tar.bz2) = 63a36f91d29f5ac5a402ffd2d7dbbb72
+SHA256 (pidgin-2.7.0.tar.bz2) = dc59cbae75db8ecf2850c35e82fc11ac33bbf2542e901e6e1e4525688635783d
+SIZE (pidgin-2.7.0.tar.bz2) = 9795914
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 82bb209c209c..2cb9eb1043c5 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -32,6 +32,10 @@ include/libpurple/idle.h
 include/libpurple/imgstore.h
 include/libpurple/log.h
 include/libpurple/marshallers.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/media-gst.h
 include/libpurple/media.h
 include/libpurple/mediamanager.h
@@ -149,10 +153,10 @@ lib/purple-2/statenotify.so
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Purple.pm
 %%DBUS%%lib/libpurple-client.la
 %%DBUS%%lib/libpurple-client.so
-%%DBUS%%lib/libpurple-client.so.6
+%%DBUS%%lib/libpurple-client.so.7
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.6
+lib/libpurple.so.7
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/locale/af/LC_MESSAGES/pidgin.mo
@@ -301,4 +305,5 @@ share/sounds/purple/send.wav
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
 @dirrm lib/purple-2
+@dirrm include/libpurple/media
 @dirrm include/libpurple
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index 27caa747c260..f1c2602a0c7d 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	pidgin-birthday-reminder
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF/pidgin-birthday/pidgin-birthday/${PORTVERSION}
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	The birthday reminder for Pidgin
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
diff --git a/net-im/pidgin-bs/Makefile b/net-im/pidgin-bs/Makefile
index a81665a303ed..52981d27a4e5 100644
--- a/net-im/pidgin-bs/Makefile
+++ b/net-im/pidgin-bs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pidgin-bs
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/bot-sentry/${PORTVERSION}
 DISTNAME=	bot-sentry-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	bot-sentry-${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Pidgin plugin to prevent instant message spam
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 GNU_CONFIGURE=	yes
diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile
index f14f4cfe6fc7..5b48e02cb5b3 100644
--- a/net-im/pidgin-fetion/Makefile
+++ b/net-im/pidgin-fetion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fetion
 PORTVERSION=	0.98.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.logvinov.ru/files/dist/fetion/ \
 		LOCAL/avl
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	pidgin-
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Fetion protocol plugin for libpurple
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple
 
 MAKE_JOBS_SAFE=	yes
 
diff --git a/net-im/pidgin-hotkeys/Makefile b/net-im/pidgin-hotkeys/Makefile
index e1f204867390..1eb6c552c72e 100644
--- a/net-im/pidgin-hotkeys/Makefile
+++ b/net-im/pidgin-hotkeys/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	pidgin-hotkeys
 PORTVERSION=	0.2.4
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A pidgin plugin that allows user to assign global hotkeys
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index bd64f35e852c..e769c83c52e0 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libnotify
 PORTVERSION=	0.14
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
@@ -19,7 +19,7 @@ COMMENT=	This plugin adds a libnotify interface to Pidgin
 BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
     		${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify
 LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
-		purple.6:${PORTSDIR}/net-im/libpurple
+		purple.7:${PORTSDIR}/net-im/libpurple
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net-im/pidgin-msn-pecan/Makefile b/net-im/pidgin-msn-pecan/Makefile
index 5e518d52728a..1c90ad597eb0 100644
--- a/net-im/pidgin-msn-pecan/Makefile
+++ b/net-im/pidgin-msn-pecan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	msn-pecan
 PORTVERSION=	0.1.0.r1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	pidgin-
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	Alternative MSN protocol plugin for libpurple
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple
 
 PROJECTHOST=	msn-pecan
 USE_BZIP2=	yes
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index 87368ad7d2c3..b56fed5ef208 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pidgimpd
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im audio
 MASTER_SITES=	http://ayeon.org/projects/pidgimpd/
 PKGNAMEPREFIX=	pidgin-
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	pidgin-
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	PidgiMPD is a Pidgin plugin for monitoring/controlling MPD
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple \
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple \
 		mpd:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index 2b85bda2d486..3faba916a0af 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	pidgin-sipe
 PORTVERSION=	1.10.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF/sipe/sipe/${DISTNAME}
 
 MAINTAINER=	john.c.prather@gmail.com
 COMMENT=	A plugin for Pidgin to provide LCS/OCS connectivity
 
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 GNU_CONFIGURE=	yes
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 4ff40b3878b9..cc23b69d270e 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		purple.6:${PORTSDIR}/net-im/libpurple
+		purple.7:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/pidgin
@@ -31,18 +31,23 @@ USE_XORG=	xscrnsaver sm
 WANT_GNOME=	yes
 CONFIGURE_ARGS=	--disable-consoleui \
 		--disable-nm \
+		--enable-screensaver \
 		--with-dynamic_prpls=${PRPL_MODULES:S/,$//}
 
 MAN1=		pidgin.1
 
 post-build:
+.if !defined(WITHOUT_NLS)
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 	    	Makefile ${MAKE_ARGS} pidgin.desktop
+.endif
 
 post-install:
+.if !defined(WITHOUT_NLS)
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/pidgin.desktop \
 	    	${PREFIX}/share/applications/pidgin.desktop
+.endif
 	${INSTALL_MAN} ${WRKSRC}/doc/pidgin.1 ${MAN1PREFIX}/man/man1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 5c1df3382fbe..ccb1a34cea6e 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -1,16 +1,9 @@
 bin/pidgin
-include/pidgin/eggtrayicon.h
-include/pidgin/pidgincombobox.h
-include/pidgin/pidginstock.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
@@ -20,7 +13,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
@@ -55,6 +47,7 @@ include/pidgin/gtkutils.h
 include/pidgin/gtkwhiteboard.h
 include/pidgin/minidialog.h
 include/pidgin/pidgin.h
+include/pidgin/pidginstock.h
 include/pidgin/pidgintooltip.h
 %%CAP%%lib/pidgin/cap.la
 %%CAP%%lib/pidgin/cap.so
@@ -62,8 +55,6 @@ lib/pidgin/convcolors.la
 lib/pidgin/convcolors.so
 lib/pidgin/extplacement.la
 lib/pidgin/extplacement.so
-lib/pidgin/pidginrc.la
-lib/pidgin/pidginrc.so
 lib/pidgin/gestures.la
 lib/pidgin/gestures.so
 %%EVO%%lib/pidgin/gevolution.la
@@ -80,6 +71,8 @@ lib/pidgin/markerline.so
 %%DBUS%%lib/pidgin/musicmessaging.so
 lib/pidgin/notify.la
 lib/pidgin/notify.so
+lib/pidgin/pidginrc.la
+lib/pidgin/pidginrc.so
 lib/pidgin/relnot.la
 lib/pidgin/relnot.so
 lib/pidgin/sendbutton.la
@@ -101,7 +94,12 @@ lib/pidgin/xmppconsole.so
 lib/pidgin/xmppdisco.la
 lib/pidgin/xmppdisco.so
 libdata/pkgconfig/pidgin.pc
-share/applications/pidgin.desktop
+%%NLS%%share/applications/pidgin.desktop
+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
 share/icons/hicolor/scalable/apps/pidgin.svg
 share/pixmaps/pidgin/animations/16/connect0.png
 share/pixmaps/pidgin/animations/16/connect1.png
@@ -189,8 +187,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
@@ -206,8 +202,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
@@ -215,8 +209,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
@@ -271,8 +267,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
@@ -292,11 +288,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
@@ -309,7 +308,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
@@ -329,7 +327,7 @@ 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
@@ -359,7 +357,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
@@ -368,9 +366,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
@@ -382,7 +379,6 @@ 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
@@ -391,7 +387,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
@@ -404,14 +399,17 @@ 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/camera.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/confused.png
 share/pixmaps/pidgin/emotes/small/console.png
@@ -419,13 +417,20 @@ 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/embarrassed.png
+share/pixmaps/pidgin/emotes/small/excited.png
 share/pixmaps/pidgin/emotes/small/grin.png
+share/pixmaps/pidgin/emotes/small/happy.png
 share/pixmaps/pidgin/emotes/small/hug-left.png
 share/pixmaps/pidgin/emotes/small/hug-right.png
+share/pixmaps/pidgin/emotes/small/in_love.png
+share/pixmaps/pidgin/emotes/small/internet.png
 share/pixmaps/pidgin/emotes/small/kiss.png
-share/pixmaps/pidgin/emotes/small/love.png
 share/pixmaps/pidgin/emotes/small/meeting.png
+share/pixmaps/pidgin/emotes/small/mobile.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
@@ -433,21 +438,28 @@ share/pixmaps/pidgin/emotes/small/party.png
 share/pixmaps/pidgin/emotes/small/phone.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/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/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/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
@@ -571,12 +583,12 @@ share/pixmaps/pidgin/status/48/away.png
 share/pixmaps/pidgin/status/48/busy.png
 share/pixmaps/pidgin/status/48/chat.png
 share/pixmaps/pidgin/status/48/extended-away.png
+share/pixmaps/pidgin/status/48/invisible.png
 share/pixmaps/pidgin/status/48/log-in.png
 share/pixmaps/pidgin/status/48/log-out.png
 share/pixmaps/pidgin/status/48/offline.png
 share/pixmaps/pidgin/status/48/person.png
 share/pixmaps/pidgin/status/48/rtl/extended-away.png
-share/pixmaps/pidgin/status/48/invisible.png
 share/pixmaps/pidgin/status/48/rtl/log-in.png
 share/pixmaps/pidgin/status/48/rtl/log-out.png
 share/pixmaps/pidgin/toolbar/11/message-new.png
@@ -587,6 +599,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
@@ -611,89 +624,104 @@ 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/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
-@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
-@dirrm share/pixmaps/pidgin/toolbar/48
-@dirrm share/pixmaps/pidgin/toolbar/32
-@dirrm share/pixmaps/pidgin/toolbar/22
-@dirrm share/pixmaps/pidgin/toolbar/16
-@dirrm share/pixmaps/pidgin/toolbar/11
-@dirrm share/pixmaps/pidgin/toolbar
-@dirrm share/pixmaps/pidgin/status/48/rtl
-@dirrm share/pixmaps/pidgin/status/48
-@dirrm share/pixmaps/pidgin/status/32/rtl
-@dirrm share/pixmaps/pidgin/status/32
-@dirrm share/pixmaps/pidgin/status/22/rtl
-@dirrm share/pixmaps/pidgin/status/22
-@dirrm share/pixmaps/pidgin/status/16/rtl
-@dirrm share/pixmaps/pidgin/status/16
+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
+@dirrm include/pidgin
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm share/pixmaps/pidgin/animations/16
+@dirrm share/pixmaps/pidgin/animations
+@dirrm share/pixmaps/pidgin/buttons
+@dirrm share/pixmaps/pidgin/dialogs/16
+@dirrm share/pixmaps/pidgin/dialogs/64
+@dirrm share/pixmaps/pidgin/dialogs/scalable
+@dirrm share/pixmaps/pidgin/dialogs
+@dirrm share/pixmaps/pidgin/emblems/16
+@dirrm share/pixmaps/pidgin/emblems/scalable
+@dirrm share/pixmaps/pidgin/emblems
+@dirrm share/pixmaps/pidgin/emotes/default
+@dirrm share/pixmaps/pidgin/emotes/none
+@dirrm share/pixmaps/pidgin/emotes/small
+@dirrm share/pixmaps/pidgin/emotes
+@dirrm share/pixmaps/pidgin/protocols/16
+@dirrm share/pixmaps/pidgin/protocols/22
+@dirrm share/pixmaps/pidgin/protocols/48
+@dirrm share/pixmaps/pidgin/protocols/scalable
+@dirrm share/pixmaps/pidgin/protocols
 @dirrm share/pixmaps/pidgin/status/11/rtl
 @dirrm share/pixmaps/pidgin/status/11
+@dirrm share/pixmaps/pidgin/status/16/rtl
+@dirrm share/pixmaps/pidgin/status/16
+@dirrm share/pixmaps/pidgin/status/22/rtl
+@dirrm share/pixmaps/pidgin/status/22
+@dirrm share/pixmaps/pidgin/status/32/rtl
+@dirrm share/pixmaps/pidgin/status/32
+@dirrm share/pixmaps/pidgin/status/48/rtl
+@dirrm share/pixmaps/pidgin/status/48
 @dirrm share/pixmaps/pidgin/status
-@dirrm share/pixmaps/pidgin/protocols/scalable
-@dirrm share/pixmaps/pidgin/protocols/48
-@dirrm share/pixmaps/pidgin/protocols/22
-@dirrm share/pixmaps/pidgin/protocols/16
-@dirrm share/pixmaps/pidgin/protocols
-@dirrm share/pixmaps/pidgin/emotes/small
-@dirrm share/pixmaps/pidgin/emotes/none
-@dirrm share/pixmaps/pidgin/emotes/default
-@dirrm share/pixmaps/pidgin/emotes
-@dirrm share/pixmaps/pidgin/emblems/scalable
-@dirrm share/pixmaps/pidgin/emblems/16
-@dirrm share/pixmaps/pidgin/emblems
-@dirrm share/pixmaps/pidgin/dialogs/scalable
-@dirrm share/pixmaps/pidgin/dialogs/64
-@dirrm share/pixmaps/pidgin/dialogs/16
-@dirrm share/pixmaps/pidgin/dialogs
-@dirrm share/pixmaps/pidgin/buttons
-@dirrm share/pixmaps/pidgin/animations/16
-@dirrm share/pixmaps/pidgin/animations
+@dirrm share/pixmaps/pidgin/toolbar/11
+@dirrm share/pixmaps/pidgin/toolbar/16
+@dirrm share/pixmaps/pidgin/toolbar/22
+@dirrm share/pixmaps/pidgin/toolbar/32
+@dirrm share/pixmaps/pidgin/toolbar/48
+@dirrm share/pixmaps/pidgin/toolbar
+@dirrm share/pixmaps/pidgin/tray/16
+@dirrm share/pixmaps/pidgin/tray/hicolor/16x16/status
+@dirrm share/pixmaps/pidgin/tray/hicolor/16x16
+@dirrm share/pixmaps/pidgin/tray/hicolor/22x22/status
+@dirrm share/pixmaps/pidgin/tray/hicolor/22x22
+@dirrm share/pixmaps/pidgin/tray/hicolor/32x32/status
+@dirrm share/pixmaps/pidgin/tray/hicolor/32x32
+@dirrm share/pixmaps/pidgin/tray/hicolor/48x48/status
+@dirrm share/pixmaps/pidgin/tray/hicolor/48x48
+@dirrm share/pixmaps/pidgin/tray/hicolor
+@dirrm share/pixmaps/pidgin/tray
 @dirrm share/pixmaps/pidgin
-@dirrmtry share/applications
 @dirrmtry lib/pidgin
-@dirrm include/pidgin
+@dirrmtry share/applications
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index 4a67229a1975..e88053b79769 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	haze
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-haze/
 PKGNAMEPREFIX=	telepathy-
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libpurple connection manager for telepathy
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple \
+LIB_DEPENDS=	purple.7:${PORTSDIR}/net-im/libpurple \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
 
 USE_GNOME=	pkgconfig