7 files changed, 117 insertions, 14 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index f5f862fde64d..a387fd2fb63c 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	0
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
 
-LIB_DEPENDS=	purple.5:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.6:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/finch/pkg-plist b/net-im/finch/pkg-plist
index f187e5fdc2e6..ae1ffbadadfb 100644
--- a/net-im/finch/pkg-plist
+++ b/net-im/finch/pkg-plist
@@ -9,10 +9,12 @@ include/finch/gntdebug.h
 include/finch/gntft.h
 include/finch/gntidle.h
 include/finch/gntlog.h
+include/finch/gntmedia.h
 include/finch/gntnotify.h
 include/finch/gntplugin.h
 include/finch/gntpounce.h
 include/finch/gntprefs.h
+include/gnt/gntprogressbar.h
 include/finch/gntrequest.h
 include/finch/gntroomlist.h
 include/finch/gntstatus.h
@@ -52,6 +54,8 @@ lib/finch/gnthistory.la
 lib/finch/gnthistory.so
 lib/finch/gntlastlog.la
 lib/finch/gntlastlog.so
+lib/finch/gnttinyurl.la
+lib/finch/gnttinyurl.so
 lib/finch/grouping.la
 lib/finch/grouping.so
 lib/gnt/irssi.la
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index f84fcd85d9f5..6b1186b1a711 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.5.8
-PORTREVISION?=	2
+PORTVERSION=	2.6.1
+PORTREVISION?=	0
 CATEGORIES?=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pidgin
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_PROJECT}
+MASTER_SITE_SUBDIR=	pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
 
 MAINTAINER?=	marcus@FreeBSD.org
@@ -52,6 +52,8 @@ OPTIONS=	BONJOUR "Enable mDNS support" on \
 		GNUTLS "GNUTLS encryption support" off \
 		NSS "Mozilla NSS encryption support" on \
 		SASL "Cyrus SASL support (for jabberd)" off \
+		GSTREAMER "Use GStreamer for playing sounds" on \
+		VV "Enable video and voice support" on \
 		PERL "Perl scripting" off \
 		TCLTK "Tcl/Tk scripting" off \
 		SAMETIME "The Lotus Sametime chat protocol" off \
@@ -70,7 +72,6 @@ OPTIONS=	BONJOUR "Enable mDNS support" on \
 
 .if defined(WITH_GTKUI)
 OPTIONS+=	GTKSPELL "Spell checking support" on \
-		GSTREAMER "Use GStreamer for playing sounds" on \
 		CAP "Enable Contact Availability Prediction plugin" on
 .endif
 
@@ -98,12 +99,18 @@ CONFIGURE_ARGS+=	--disable-gevolution
 PLIST_SUB+=		EVO="@comment not installed: "
 .endif
 
-.if defined(WITH_GTKUI) && !defined(WITHOUT_GSTREAMER)
+.if !defined(WITHOUT_GSTREAMER)
 USE_GSTREAMER+=	core good
 .else
 CONFIGURE_ARGS+=--disable-gstreamer
 .endif
 
+.if !defined(WITHOUT_VV)
+LIB_DEPENDS+=	gstfarsight-0.10.0:${PORTSDIR}/net-im/farsight2
+.else
+CONFIGURE_ARGS+=--disable-vv
+.endif
+
 .if defined(WITH_GTKUI) && !defined(WITHOUT_CAP)
 LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=--enable-cap
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index a56493231bee..7c6dce3a8459 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.5.8.tar.bz2) = c207407dca71c6357c82135875e472f0
-SHA256 (pidgin-2.5.8.tar.bz2) = 2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21
-SIZE (pidgin-2.5.8.tar.bz2) = 8246538
+MD5 (pidgin-2.6.1.tar.bz2) = 306b6b60aefa9c5d5bffb08c576aa955
+SHA256 (pidgin-2.6.1.tar.bz2) = b8f14ce127ea614ad4872eacfda5666090dcae122a2a6d79b6725fbbe7f9bf83
+SIZE (pidgin-2.6.1.tar.bz2) = 8964827
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index d127b77f23c2..eceb796e24a3 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -31,6 +31,10 @@ include/libpurple/gaim-compat.h
 include/libpurple/idle.h
 include/libpurple/imgstore.h
 include/libpurple/log.h
+include/libpurple/marshallers.h
+include/libpurple/media-gst.h
+include/libpurple/media.h
+include/libpurple/mediamanager.h
 include/libpurple/mime.h
 include/libpurple/nat-pmp.h
 include/libpurple/network.h
@@ -51,12 +55,18 @@ include/libpurple/server.h
 include/libpurple/signals.h
 include/libpurple/smiley.h
 include/libpurple/sound.h
+include/libpurple/sound-theme-loader.h
+include/libpurple/sound-theme.h
 include/libpurple/sslconn.h
 include/libpurple/status.h
 include/libpurple/stringref.h
 include/libpurple/stun.h
+include/libpurple/theme-loader.h
+include/libpurple/theme-manager.h
+include/libpurple/theme.h
 include/libpurple/upnp.h
 include/libpurple/util.h
+include/libpurple/valgrind.h
 include/libpurple/value.h
 include/libpurple/version.h
 include/libpurple/whiteboard.h
@@ -105,6 +115,11 @@ lib/purple-2/joinpart.so
 %%JABBER%%lib/purple-2/libxmpp.so
 %%YAHOO%%lib/purple-2/libyahoo.la
 %%YAHOO%%lib/purple-2/libyahoo.so
+%%YAHOO%%lib/purple-2/libyahoojp.la
+%%YAHOO%%lib/purple-2/libyahoojp.so
+%%YAHOO%%lib/purple-2/libymsg.la
+%%YAHOO%%lib/purple-2/libymsg.so
+%%YAHOO%%lib/purple-2/libymsg.so.0
 %%ZEPHYR%%lib/purple-2/libzephyr.la
 %%ZEPHYR%%lib/purple-2/libzephyr.so
 lib/purple-2/log_reader.la
@@ -134,10 +149,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.5
+%%DBUS%%lib/libpurple-client.so.6
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.5
+lib/libpurple.so.6
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/locale/af/LC_MESSAGES/pidgin.mo
@@ -171,6 +186,7 @@ share/locale/gu/LC_MESSAGES/pidgin.mo
 share/locale/he/LC_MESSAGES/pidgin.mo
 share/locale/hi/LC_MESSAGES/pidgin.mo
 share/locale/hu/LC_MESSAGES/pidgin.mo
+share/locale/hy/LC_MESSAGES/pidgin.mo
 share/locale/id/LC_MESSAGES/pidgin.mo
 share/locale/it/LC_MESSAGES/pidgin.mo
 share/locale/ja/LC_MESSAGES/pidgin.mo
@@ -203,6 +219,7 @@ share/locale/sq/LC_MESSAGES/pidgin.mo
 share/locale/sr/LC_MESSAGES/pidgin.mo
 share/locale/sr@latin/LC_MESSAGES/pidgin.mo
 share/locale/sv/LC_MESSAGES/pidgin.mo
+share/locale/sw/LC_MESSAGES/pidgin.mo
 share/locale/ta/LC_MESSAGES/pidgin.mo
 share/locale/te/LC_MESSAGES/pidgin.mo
 share/locale/th/LC_MESSAGES/pidgin.mo
@@ -219,12 +236,17 @@ 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/Equifax_Secure_CA.pem
+share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
 share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
 share/purple/ca-certs/Microsoft_Internet_Authority.pem
 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/VeriSign_Class3_Extended_Validation_CA.pem
 share/purple/ca-certs/Verisign_Class3_Primary_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
 share/purple/ca-certs/VeriSign_International_Server_Class_3_CA.pem
 share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
 share/sounds/purple/alert.wav
@@ -244,6 +266,8 @@ share/sounds/purple/send.wav
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sw/LC_MESSAGES
+@dirrmtry share/locale/sw
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
@@ -260,6 +284,8 @@ share/sounds/purple/send.wav
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index a49c86630967..aa5c48cce2c1 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	pidgin
-PORTREVISION=	1
+PORTREVISION=	0
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		purple.5:${PORTSDIR}/net-im/libpurple
+		purple.6:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/pidgin
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index affa5bc236de..0788e7ebb449 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -3,6 +3,8 @@ 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
@@ -21,10 +23,13 @@ include/pidgin/gtkeventloop.h
 include/pidgin/gtkexpander.h
 include/pidgin/gtkft.h
 include/pidgin/gtkgaim-compat.h
+include/pidgin/gtkicon-theme-loader.h
+include/pidgin/gtkicon-theme.h
 include/pidgin/gtkidle.h
 include/pidgin/gtkimhtml.h
 include/pidgin/gtkimhtmltoolbar.h
 include/pidgin/gtklog.h
+include/pidgin/gtkmedia.h
 include/pidgin/gtkmenutray.h
 include/pidgin/gtknickcolors.h
 include/pidgin/gtknotify.h
@@ -43,6 +48,7 @@ include/pidgin/gtksound.h
 include/pidgin/gtksourceiter.h
 include/pidgin/gtksourceundomanager.h
 include/pidgin/gtksourceview-marshal.h
+include/pidgin/gtkstatus-icon-theme.h
 include/pidgin/gtkstatusbox.h
 include/pidgin/gtkthemes.h
 include/pidgin/gtkutils.h
@@ -80,6 +86,8 @@ lib/pidgin/sendbutton.la
 lib/pidgin/sendbutton.so
 lib/pidgin/spellchk.la
 lib/pidgin/spellchk.so
+lib/pidgin/themeedit.la
+lib/pidgin/themeedit.so
 lib/pidgin/ticker.la
 lib/pidgin/ticker.so
 lib/pidgin/timestamp.la
@@ -88,8 +96,11 @@ lib/pidgin/timestamp_format.la
 lib/pidgin/timestamp_format.so
 lib/pidgin/xmppconsole.la
 lib/pidgin/xmppconsole.so
+lib/pidgin/xmppdisco.la
+lib/pidgin/xmppdisco.so
 libdata/pkgconfig/pidgin.pc
 share/applications/pidgin.desktop
+share/icons/hicolor/scalable/apps/pidgin.svg
 share/pixmaps/pidgin/animations/16/connect0.png
 share/pixmaps/pidgin/animations/16/connect1.png
 share/pixmaps/pidgin/animations/16/connect2.png
@@ -157,6 +168,13 @@ share/pixmaps/pidgin/dialogs/64/info.png
 share/pixmaps/pidgin/dialogs/64/mail.png
 share/pixmaps/pidgin/dialogs/64/question.png
 share/pixmaps/pidgin/dialogs/64/warning.png
+share/pixmaps/pidgin/dialogs/scalable/auth.svg
+share/pixmaps/pidgin/dialogs/scalable/cool.svg
+share/pixmaps/pidgin/dialogs/scalable/dialog.svg
+share/pixmaps/pidgin/dialogs/scalable/error.svg
+share/pixmaps/pidgin/dialogs/scalable/info.svg
+share/pixmaps/pidgin/dialogs/scalable/question.svg
+share/pixmaps/pidgin/dialogs/scalable/warning.svg
 share/pixmaps/pidgin/emblems/16/aol-client.png
 share/pixmaps/pidgin/emblems/16/birthday.png
 share/pixmaps/pidgin/emblems/16/blocked.png
@@ -178,6 +196,22 @@ share/pixmaps/pidgin/emblems/16/secure.png
 share/pixmaps/pidgin/emblems/16/unavailable.png
 share/pixmaps/pidgin/emblems/16/video.png
 share/pixmaps/pidgin/emblems/16/voice.png
+share/pixmaps/pidgin/emblems/scalable/aol-client.svg
+share/pixmaps/pidgin/emblems/scalable/blocked.svg
+share/pixmaps/pidgin/emblems/scalable/bot.svg
+share/pixmaps/pidgin/emblems/scalable/external.svg
+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
+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/airplane.png
 share/pixmaps/pidgin/emotes/default/alien.png
@@ -460,6 +494,21 @@ 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/protocols/scalable/aim.svg
+share/pixmaps/pidgin/protocols/scalable/bonjour.svg
+share/pixmaps/pidgin/protocols/scalable/gadu-gadu.svg
+share/pixmaps/pidgin/protocols/scalable/google-talk.svg
+share/pixmaps/pidgin/protocols/scalable/icq.svg
+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/novell.svg
+share/pixmaps/pidgin/protocols/scalable/qq.svg
+share/pixmaps/pidgin/protocols/scalable/silc.svg
+share/pixmaps/pidgin/protocols/scalable/simple.svg
+share/pixmaps/pidgin/protocols/scalable/yahoo.svg
+share/pixmaps/pidgin/protocols/scalable/zephyr.svg
 share/pixmaps/pidgin/status/11/available.png
 share/pixmaps/pidgin/status/11/away.png
 share/pixmaps/pidgin/status/11/busy.png
@@ -525,6 +574,8 @@ 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
+share/pixmaps/pidgin/toolbar/16/audio-call.png
 share/pixmaps/pidgin/toolbar/16/change-bgcolor.png
 share/pixmaps/pidgin/toolbar/16/change-fgcolor.png
 share/pixmaps/pidgin/toolbar/16/emote-select.png
@@ -539,7 +590,14 @@ share/pixmaps/pidgin/toolbar/16/plugins.png
 share/pixmaps/pidgin/toolbar/16/send-file.png
 share/pixmaps/pidgin/toolbar/16/transfer.png
 share/pixmaps/pidgin/toolbar/16/unblock.png
+share/pixmaps/pidgin/toolbar/16/video-call.png
 share/pixmaps/pidgin/toolbar/22/select-avatar.png
+share/pixmaps/pidgin/toolbar/22/video-call.png
+share/pixmaps/pidgin/toolbar/22/voice-call.png
+share/pixmaps/pidgin/toolbar/32/video-call.png
+share/pixmaps/pidgin/toolbar/32/voice-call.png
+share/pixmaps/pidgin/toolbar/48/video-call.png
+share/pixmaps/pidgin/toolbar/48/voice-call.png
 share/pixmaps/pidgin/tray/16/available_4bit.ico
 share/pixmaps/pidgin/tray/16/away_4bit.ico
 share/pixmaps/pidgin/tray/16/busy_4bit.ico
@@ -571,6 +629,7 @@ 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
@@ -579,6 +638,7 @@ 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
@@ -592,8 +652,11 @@ share/icons/hicolor/48x48/apps/pidgin.png
 @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
@@ -606,6 +669,7 @@ share/icons/hicolor/48x48/apps/pidgin.png
 @dirrm share/pixmaps/pidgin/status/11/rtl
 @dirrm share/pixmaps/pidgin/status/11
 @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
@@ -614,8 +678,10 @@ share/icons/hicolor/48x48/apps/pidgin.png
 @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