Update to 2.0.0 Beta 6. This release fixes a bunch of crashes, some UI

changes, some new plug-ins, and other goodies.

10 files changed, 266 insertions, 214 deletions

diff --git a/net-im/gaim-devel/Makefile b/net-im/gaim-devel/Makefile
index 7580b92395c6..e98207713267 100644
--- a/net-im/gaim-devel/Makefile
+++ b/net-im/gaim-devel/Makefile
@@ -7,7 +7,6 @@
 #
 
 PORTNAME=	gaim
-PORTREVISION=	1
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-devel
 
diff --git a/net-im/gaim-devel/pkg-plist b/net-im/gaim-devel/pkg-plist
index afa79032b432..93b2aaa4fc10 100644
--- a/net-im/gaim-devel/pkg-plist
+++ b/net-im/gaim-devel/pkg-plist
@@ -35,6 +35,7 @@ include/gaim/gtkprivacy.h
 include/gaim/gtkrequest.h
 include/gaim/gtkroomlist.h
 include/gaim/gtksavedstatuses.h
+include/gaim/gtkscrollbook.h
 include/gaim/gtksession.h
 include/gaim/gtksound.h
 include/gaim/gtksourceiter.h
@@ -44,6 +45,8 @@ include/gaim/gtkutils.h
 include/gaim/gtkwhiteboard.h
 %%CAP%%lib/gaim/cap.la
 %%CAP%%lib/gaim/cap.so
+lib/gaim/convcolors.la
+lib/gaim/convcolors.so
 lib/gaim/extplacement.la
 lib/gaim/extplacement.so
 lib/gaim/gaimrc.la
@@ -56,6 +59,8 @@ lib/gaim/history.la
 lib/gaim/history.so
 lib/gaim/iconaway.la
 lib/gaim/iconaway.so
+lib/gaim/markerline.la
+lib/gaim/markerline.so
 %%DBUS%%lib/gaim/musicmessaging.la
 %%DBUS%%lib/gaim/musicmessaging.so
 lib/gaim/notify.la
@@ -70,8 +75,110 @@ lib/gaim/timestamp.la
 lib/gaim/timestamp.so
 lib/gaim/timestamp_format.la
 lib/gaim/timestamp_format.so
+lib/gaim/xmppconsole.la
+lib/gaim/xmppconsole.so
 share/gnome/pixmaps/gaim.png
 share/gnome/pixmaps/gaim.svg
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_1.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_10.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_100.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_11.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_12.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_13.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_14.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_15.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_16.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_17.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_18.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_19.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_2.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_20.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_21.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_22.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_23.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_24.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_25.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_26.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_27.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_28.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_29.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_3.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_30.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_31.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_32.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_33.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_34.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_35.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_36.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_37.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_38.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_39.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_4.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_40.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_41.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_42.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_43.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_44.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_45.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_46.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_47.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_48.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_49.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_5.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_50.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_51.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_52.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_53.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_54.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_55.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_56.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_57.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_58.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_59.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_6.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_60.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_61.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_62.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_63.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_64.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_65.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_66.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_67.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_68.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_69.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_7.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_70.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_71.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_72.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_73.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_74.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_75.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_76.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_77.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_78.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_79.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_8.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_80.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_81.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_82.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_83.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_84.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_85.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_86.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_87.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_88.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_89.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_9.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_90.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_91.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_92.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_93.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_94.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_95.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_96.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_97.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_98.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_99.png
 share/gnome/pixmaps/gaim/buttons/about_menu.png
 share/gnome/pixmaps/gaim/buttons/accounts.png
 share/gnome/pixmaps/gaim/buttons/change-bgcolor-small.png
@@ -432,106 +539,6 @@ share/gnome/pixmaps/gaim/status/default/offline.png
 share/gnome/pixmaps/gaim/status/default/op.png
 share/gnome/pixmaps/gaim/status/default/pending.png
 share/gnome/pixmaps/gaim/status/default/qq.png
-share/gnome/pixmaps/gaim/status/default/qq_1.png
-share/gnome/pixmaps/gaim/status/default/qq_10.png
-share/gnome/pixmaps/gaim/status/default/qq_100.png
-share/gnome/pixmaps/gaim/status/default/qq_11.png
-share/gnome/pixmaps/gaim/status/default/qq_12.png
-share/gnome/pixmaps/gaim/status/default/qq_13.png
-share/gnome/pixmaps/gaim/status/default/qq_14.png
-share/gnome/pixmaps/gaim/status/default/qq_15.png
-share/gnome/pixmaps/gaim/status/default/qq_16.png
-share/gnome/pixmaps/gaim/status/default/qq_17.png
-share/gnome/pixmaps/gaim/status/default/qq_18.png
-share/gnome/pixmaps/gaim/status/default/qq_19.png
-share/gnome/pixmaps/gaim/status/default/qq_2.png
-share/gnome/pixmaps/gaim/status/default/qq_20.png
-share/gnome/pixmaps/gaim/status/default/qq_21.png
-share/gnome/pixmaps/gaim/status/default/qq_22.png
-share/gnome/pixmaps/gaim/status/default/qq_23.png
-share/gnome/pixmaps/gaim/status/default/qq_24.png
-share/gnome/pixmaps/gaim/status/default/qq_25.png
-share/gnome/pixmaps/gaim/status/default/qq_26.png
-share/gnome/pixmaps/gaim/status/default/qq_27.png
-share/gnome/pixmaps/gaim/status/default/qq_28.png
-share/gnome/pixmaps/gaim/status/default/qq_29.png
-share/gnome/pixmaps/gaim/status/default/qq_3.png
-share/gnome/pixmaps/gaim/status/default/qq_30.png
-share/gnome/pixmaps/gaim/status/default/qq_31.png
-share/gnome/pixmaps/gaim/status/default/qq_32.png
-share/gnome/pixmaps/gaim/status/default/qq_33.png
-share/gnome/pixmaps/gaim/status/default/qq_34.png
-share/gnome/pixmaps/gaim/status/default/qq_35.png
-share/gnome/pixmaps/gaim/status/default/qq_36.png
-share/gnome/pixmaps/gaim/status/default/qq_37.png
-share/gnome/pixmaps/gaim/status/default/qq_38.png
-share/gnome/pixmaps/gaim/status/default/qq_39.png
-share/gnome/pixmaps/gaim/status/default/qq_4.png
-share/gnome/pixmaps/gaim/status/default/qq_40.png
-share/gnome/pixmaps/gaim/status/default/qq_41.png
-share/gnome/pixmaps/gaim/status/default/qq_42.png
-share/gnome/pixmaps/gaim/status/default/qq_43.png
-share/gnome/pixmaps/gaim/status/default/qq_44.png
-share/gnome/pixmaps/gaim/status/default/qq_45.png
-share/gnome/pixmaps/gaim/status/default/qq_46.png
-share/gnome/pixmaps/gaim/status/default/qq_47.png
-share/gnome/pixmaps/gaim/status/default/qq_48.png
-share/gnome/pixmaps/gaim/status/default/qq_49.png
-share/gnome/pixmaps/gaim/status/default/qq_5.png
-share/gnome/pixmaps/gaim/status/default/qq_50.png
-share/gnome/pixmaps/gaim/status/default/qq_51.png
-share/gnome/pixmaps/gaim/status/default/qq_52.png
-share/gnome/pixmaps/gaim/status/default/qq_53.png
-share/gnome/pixmaps/gaim/status/default/qq_54.png
-share/gnome/pixmaps/gaim/status/default/qq_55.png
-share/gnome/pixmaps/gaim/status/default/qq_56.png
-share/gnome/pixmaps/gaim/status/default/qq_57.png
-share/gnome/pixmaps/gaim/status/default/qq_58.png
-share/gnome/pixmaps/gaim/status/default/qq_59.png
-share/gnome/pixmaps/gaim/status/default/qq_6.png
-share/gnome/pixmaps/gaim/status/default/qq_60.png
-share/gnome/pixmaps/gaim/status/default/qq_61.png
-share/gnome/pixmaps/gaim/status/default/qq_62.png
-share/gnome/pixmaps/gaim/status/default/qq_63.png
-share/gnome/pixmaps/gaim/status/default/qq_64.png
-share/gnome/pixmaps/gaim/status/default/qq_65.png
-share/gnome/pixmaps/gaim/status/default/qq_66.png
-share/gnome/pixmaps/gaim/status/default/qq_67.png
-share/gnome/pixmaps/gaim/status/default/qq_68.png
-share/gnome/pixmaps/gaim/status/default/qq_69.png
-share/gnome/pixmaps/gaim/status/default/qq_7.png
-share/gnome/pixmaps/gaim/status/default/qq_70.png
-share/gnome/pixmaps/gaim/status/default/qq_71.png
-share/gnome/pixmaps/gaim/status/default/qq_72.png
-share/gnome/pixmaps/gaim/status/default/qq_73.png
-share/gnome/pixmaps/gaim/status/default/qq_74.png
-share/gnome/pixmaps/gaim/status/default/qq_75.png
-share/gnome/pixmaps/gaim/status/default/qq_76.png
-share/gnome/pixmaps/gaim/status/default/qq_77.png
-share/gnome/pixmaps/gaim/status/default/qq_78.png
-share/gnome/pixmaps/gaim/status/default/qq_79.png
-share/gnome/pixmaps/gaim/status/default/qq_8.png
-share/gnome/pixmaps/gaim/status/default/qq_80.png
-share/gnome/pixmaps/gaim/status/default/qq_81.png
-share/gnome/pixmaps/gaim/status/default/qq_82.png
-share/gnome/pixmaps/gaim/status/default/qq_83.png
-share/gnome/pixmaps/gaim/status/default/qq_84.png
-share/gnome/pixmaps/gaim/status/default/qq_85.png
-share/gnome/pixmaps/gaim/status/default/qq_86.png
-share/gnome/pixmaps/gaim/status/default/qq_87.png
-share/gnome/pixmaps/gaim/status/default/qq_88.png
-share/gnome/pixmaps/gaim/status/default/qq_89.png
-share/gnome/pixmaps/gaim/status/default/qq_9.png
-share/gnome/pixmaps/gaim/status/default/qq_90.png
-share/gnome/pixmaps/gaim/status/default/qq_91.png
-share/gnome/pixmaps/gaim/status/default/qq_92.png
-share/gnome/pixmaps/gaim/status/default/qq_93.png
-share/gnome/pixmaps/gaim/status/default/qq_94.png
-share/gnome/pixmaps/gaim/status/default/qq_95.png
-share/gnome/pixmaps/gaim/status/default/qq_96.png
-share/gnome/pixmaps/gaim/status/default/qq_97.png
-share/gnome/pixmaps/gaim/status/default/qq_98.png
-share/gnome/pixmaps/gaim/status/default/qq_99.png
 share/gnome/pixmaps/gaim/status/default/secure.png
 share/gnome/pixmaps/gaim/status/default/silc.png
 share/gnome/pixmaps/gaim/status/default/simple.png
@@ -560,4 +567,6 @@ share/gnome/sounds/gaim/send.wav
 @dirrm share/gnome/pixmaps/gaim/icons
 @dirrm share/gnome/pixmaps/gaim/dialogs
 @dirrm share/gnome/pixmaps/gaim/buttons
+@dirrm share/gnome/pixmaps/gaim/buddy_icons/qq
+@dirrm share/gnome/pixmaps/gaim/buddy_icons
 @dirrm share/gnome/pixmaps/gaim
diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile
index 2f69103631fd..fa968fc66798 100644
--- a/net-im/libgaim/Makefile
+++ b/net-im/libgaim/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	2.0.0.b5
-PORTREVISION?=	1
+PORTVERSION=	2.0.0.b6
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX?=	lib
-DISTNAME=	${PORTNAME}-2.0.0beta5
+DISTNAME=	${PORTNAME}-2.0.0beta6
 
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Gaim multi-protocol messaging client
diff --git a/net-im/libgaim/distinfo b/net-im/libgaim/distinfo
index 78652a0a9b26..3c4115064589 100644
--- a/net-im/libgaim/distinfo
+++ b/net-im/libgaim/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-2.0.0beta5.tar.bz2) = 84099216123de25402fa7e904ceca437
-SHA256 (gaim-2.0.0beta5.tar.bz2) = d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
-SIZE (gaim-2.0.0beta5.tar.bz2) = 6489271
+MD5 (gaim-2.0.0beta6.tar.bz2) = 404dcec261f911bcb56f69e5ea192583
+SHA256 (gaim-2.0.0beta6.tar.bz2) = fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82
+SIZE (gaim-2.0.0beta6.tar.bz2) = 6667700
diff --git a/net-im/libgaim/pkg-plist b/net-im/libgaim/pkg-plist
index 5a2ab69c4b6c..d2f88ac08da1 100644
--- a/net-im/libgaim/pkg-plist
+++ b/net-im/libgaim/pkg-plist
@@ -56,10 +56,20 @@ include/gaim/value.h
 include/gaim/version.h
 include/gaim/whiteboard.h
 include/gaim/xmlnode.h
+lib/gaim/autoaccept.la
+lib/gaim/autoaccept.so
+lib/gaim/autoreply.la
+lib/gaim/autoreply.so
+lib/gaim/buddynote.la
+lib/gaim/buddynote.so
 %%DBUS%%lib/gaim/dbus-example.la
 %%DBUS%%lib/gaim/dbus-example.so
 lib/gaim/idle.la
 lib/gaim/idle.so
+lib/gaim/libaim.la
+lib/gaim/libaim.so
+lib/gaim/libicq.la
+lib/gaim/libicq.so
 %%PERL:%%lib/gaim/libgaimperl.la
 %%PERL:%%lib/gaim/libgaimperl.so
 %%BONJOUR%%lib/gaim/libbonjour.la
@@ -76,6 +86,7 @@ lib/gaim/libnovell.la
 lib/gaim/libnovell.so
 lib/gaim/liboscar.la
 lib/gaim/liboscar.so
+lib/gaim/liboscar.so.0
 %%SILC%%lib/gaim/libsilcgaim.la
 %%SILC%%lib/gaim/libsilcgaim.so
 lib/gaim/libqq.la
@@ -90,6 +101,10 @@ lib/gaim/libzephyr.la
 lib/gaim/libzephyr.so
 lib/gaim/log_reader.la
 lib/gaim/log_reader.so
+lib/gaim/newline.la
+lib/gaim/newline.so
+lib/gaim/offlinemsg.la
+lib/gaim/offlinemsg.so
 lib/gaim/psychic.la
 lib/gaim/psychic.so
 lib/gaim/ssl-gnutls.la
@@ -128,6 +143,7 @@ share/locale/ca@valencia/LC_MESSAGES/gaim.mo
 share/locale/cs/LC_MESSAGES/gaim.mo
 share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/dz/LC_MESSAGES/gaim.mo
 share/locale/el/LC_MESSAGES/gaim.mo
 share/locale/en_AU/LC_MESSAGES/gaim.mo
 share/locale/en_CA/LC_MESSAGES/gaim.mo
@@ -217,6 +233,8 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/en_AU
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 2f69103631fd..fa968fc66798 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	2.0.0.b5
-PORTREVISION?=	1
+PORTVERSION=	2.0.0.b6
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX?=	lib
-DISTNAME=	${PORTNAME}-2.0.0beta5
+DISTNAME=	${PORTNAME}-2.0.0beta6
 
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Gaim multi-protocol messaging client
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 78652a0a9b26..3c4115064589 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-2.0.0beta5.tar.bz2) = 84099216123de25402fa7e904ceca437
-SHA256 (gaim-2.0.0beta5.tar.bz2) = d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
-SIZE (gaim-2.0.0beta5.tar.bz2) = 6489271
+MD5 (gaim-2.0.0beta6.tar.bz2) = 404dcec261f911bcb56f69e5ea192583
+SHA256 (gaim-2.0.0beta6.tar.bz2) = fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82
+SIZE (gaim-2.0.0beta6.tar.bz2) = 6667700
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 5a2ab69c4b6c..d2f88ac08da1 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -56,10 +56,20 @@ include/gaim/value.h
 include/gaim/version.h
 include/gaim/whiteboard.h
 include/gaim/xmlnode.h
+lib/gaim/autoaccept.la
+lib/gaim/autoaccept.so
+lib/gaim/autoreply.la
+lib/gaim/autoreply.so
+lib/gaim/buddynote.la
+lib/gaim/buddynote.so
 %%DBUS%%lib/gaim/dbus-example.la
 %%DBUS%%lib/gaim/dbus-example.so
 lib/gaim/idle.la
 lib/gaim/idle.so
+lib/gaim/libaim.la
+lib/gaim/libaim.so
+lib/gaim/libicq.la
+lib/gaim/libicq.so
 %%PERL:%%lib/gaim/libgaimperl.la
 %%PERL:%%lib/gaim/libgaimperl.so
 %%BONJOUR%%lib/gaim/libbonjour.la
@@ -76,6 +86,7 @@ lib/gaim/libnovell.la
 lib/gaim/libnovell.so
 lib/gaim/liboscar.la
 lib/gaim/liboscar.so
+lib/gaim/liboscar.so.0
 %%SILC%%lib/gaim/libsilcgaim.la
 %%SILC%%lib/gaim/libsilcgaim.so
 lib/gaim/libqq.la
@@ -90,6 +101,10 @@ lib/gaim/libzephyr.la
 lib/gaim/libzephyr.so
 lib/gaim/log_reader.la
 lib/gaim/log_reader.so
+lib/gaim/newline.la
+lib/gaim/newline.so
+lib/gaim/offlinemsg.la
+lib/gaim/offlinemsg.so
 lib/gaim/psychic.la
 lib/gaim/psychic.so
 lib/gaim/ssl-gnutls.la
@@ -128,6 +143,7 @@ share/locale/ca@valencia/LC_MESSAGES/gaim.mo
 share/locale/cs/LC_MESSAGES/gaim.mo
 share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/dz/LC_MESSAGES/gaim.mo
 share/locale/el/LC_MESSAGES/gaim.mo
 share/locale/en_AU/LC_MESSAGES/gaim.mo
 share/locale/en_CA/LC_MESSAGES/gaim.mo
@@ -217,6 +233,8 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/en_AU
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 7580b92395c6..e98207713267 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -7,7 +7,6 @@
 #
 
 PORTNAME=	gaim
-PORTREVISION=	1
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-devel
 
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index afa79032b432..93b2aaa4fc10 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -35,6 +35,7 @@ include/gaim/gtkprivacy.h
 include/gaim/gtkrequest.h
 include/gaim/gtkroomlist.h
 include/gaim/gtksavedstatuses.h
+include/gaim/gtkscrollbook.h
 include/gaim/gtksession.h
 include/gaim/gtksound.h
 include/gaim/gtksourceiter.h
@@ -44,6 +45,8 @@ include/gaim/gtkutils.h
 include/gaim/gtkwhiteboard.h
 %%CAP%%lib/gaim/cap.la
 %%CAP%%lib/gaim/cap.so
+lib/gaim/convcolors.la
+lib/gaim/convcolors.so
 lib/gaim/extplacement.la
 lib/gaim/extplacement.so
 lib/gaim/gaimrc.la
@@ -56,6 +59,8 @@ lib/gaim/history.la
 lib/gaim/history.so
 lib/gaim/iconaway.la
 lib/gaim/iconaway.so
+lib/gaim/markerline.la
+lib/gaim/markerline.so
 %%DBUS%%lib/gaim/musicmessaging.la
 %%DBUS%%lib/gaim/musicmessaging.so
 lib/gaim/notify.la
@@ -70,8 +75,110 @@ lib/gaim/timestamp.la
 lib/gaim/timestamp.so
 lib/gaim/timestamp_format.la
 lib/gaim/timestamp_format.so
+lib/gaim/xmppconsole.la
+lib/gaim/xmppconsole.so
 share/gnome/pixmaps/gaim.png
 share/gnome/pixmaps/gaim.svg
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_1.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_10.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_100.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_11.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_12.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_13.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_14.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_15.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_16.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_17.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_18.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_19.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_2.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_20.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_21.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_22.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_23.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_24.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_25.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_26.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_27.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_28.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_29.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_3.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_30.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_31.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_32.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_33.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_34.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_35.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_36.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_37.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_38.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_39.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_4.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_40.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_41.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_42.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_43.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_44.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_45.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_46.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_47.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_48.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_49.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_5.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_50.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_51.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_52.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_53.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_54.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_55.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_56.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_57.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_58.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_59.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_6.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_60.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_61.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_62.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_63.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_64.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_65.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_66.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_67.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_68.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_69.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_7.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_70.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_71.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_72.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_73.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_74.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_75.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_76.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_77.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_78.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_79.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_8.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_80.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_81.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_82.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_83.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_84.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_85.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_86.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_87.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_88.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_89.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_9.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_90.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_91.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_92.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_93.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_94.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_95.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_96.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_97.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_98.png
+share/gnome/pixmaps/gaim/buddy_icons/qq/qq_99.png
 share/gnome/pixmaps/gaim/buttons/about_menu.png
 share/gnome/pixmaps/gaim/buttons/accounts.png
 share/gnome/pixmaps/gaim/buttons/change-bgcolor-small.png
@@ -432,106 +539,6 @@ share/gnome/pixmaps/gaim/status/default/offline.png
 share/gnome/pixmaps/gaim/status/default/op.png
 share/gnome/pixmaps/gaim/status/default/pending.png
 share/gnome/pixmaps/gaim/status/default/qq.png
-share/gnome/pixmaps/gaim/status/default/qq_1.png
-share/gnome/pixmaps/gaim/status/default/qq_10.png
-share/gnome/pixmaps/gaim/status/default/qq_100.png
-share/gnome/pixmaps/gaim/status/default/qq_11.png
-share/gnome/pixmaps/gaim/status/default/qq_12.png
-share/gnome/pixmaps/gaim/status/default/qq_13.png
-share/gnome/pixmaps/gaim/status/default/qq_14.png
-share/gnome/pixmaps/gaim/status/default/qq_15.png
-share/gnome/pixmaps/gaim/status/default/qq_16.png
-share/gnome/pixmaps/gaim/status/default/qq_17.png
-share/gnome/pixmaps/gaim/status/default/qq_18.png
-share/gnome/pixmaps/gaim/status/default/qq_19.png
-share/gnome/pixmaps/gaim/status/default/qq_2.png
-share/gnome/pixmaps/gaim/status/default/qq_20.png
-share/gnome/pixmaps/gaim/status/default/qq_21.png
-share/gnome/pixmaps/gaim/status/default/qq_22.png
-share/gnome/pixmaps/gaim/status/default/qq_23.png
-share/gnome/pixmaps/gaim/status/default/qq_24.png
-share/gnome/pixmaps/gaim/status/default/qq_25.png
-share/gnome/pixmaps/gaim/status/default/qq_26.png
-share/gnome/pixmaps/gaim/status/default/qq_27.png
-share/gnome/pixmaps/gaim/status/default/qq_28.png
-share/gnome/pixmaps/gaim/status/default/qq_29.png
-share/gnome/pixmaps/gaim/status/default/qq_3.png
-share/gnome/pixmaps/gaim/status/default/qq_30.png
-share/gnome/pixmaps/gaim/status/default/qq_31.png
-share/gnome/pixmaps/gaim/status/default/qq_32.png
-share/gnome/pixmaps/gaim/status/default/qq_33.png
-share/gnome/pixmaps/gaim/status/default/qq_34.png
-share/gnome/pixmaps/gaim/status/default/qq_35.png
-share/gnome/pixmaps/gaim/status/default/qq_36.png
-share/gnome/pixmaps/gaim/status/default/qq_37.png
-share/gnome/pixmaps/gaim/status/default/qq_38.png
-share/gnome/pixmaps/gaim/status/default/qq_39.png
-share/gnome/pixmaps/gaim/status/default/qq_4.png
-share/gnome/pixmaps/gaim/status/default/qq_40.png
-share/gnome/pixmaps/gaim/status/default/qq_41.png
-share/gnome/pixmaps/gaim/status/default/qq_42.png
-share/gnome/pixmaps/gaim/status/default/qq_43.png
-share/gnome/pixmaps/gaim/status/default/qq_44.png
-share/gnome/pixmaps/gaim/status/default/qq_45.png
-share/gnome/pixmaps/gaim/status/default/qq_46.png
-share/gnome/pixmaps/gaim/status/default/qq_47.png
-share/gnome/pixmaps/gaim/status/default/qq_48.png
-share/gnome/pixmaps/gaim/status/default/qq_49.png
-share/gnome/pixmaps/gaim/status/default/qq_5.png
-share/gnome/pixmaps/gaim/status/default/qq_50.png
-share/gnome/pixmaps/gaim/status/default/qq_51.png
-share/gnome/pixmaps/gaim/status/default/qq_52.png
-share/gnome/pixmaps/gaim/status/default/qq_53.png
-share/gnome/pixmaps/gaim/status/default/qq_54.png
-share/gnome/pixmaps/gaim/status/default/qq_55.png
-share/gnome/pixmaps/gaim/status/default/qq_56.png
-share/gnome/pixmaps/gaim/status/default/qq_57.png
-share/gnome/pixmaps/gaim/status/default/qq_58.png
-share/gnome/pixmaps/gaim/status/default/qq_59.png
-share/gnome/pixmaps/gaim/status/default/qq_6.png
-share/gnome/pixmaps/gaim/status/default/qq_60.png
-share/gnome/pixmaps/gaim/status/default/qq_61.png
-share/gnome/pixmaps/gaim/status/default/qq_62.png
-share/gnome/pixmaps/gaim/status/default/qq_63.png
-share/gnome/pixmaps/gaim/status/default/qq_64.png
-share/gnome/pixmaps/gaim/status/default/qq_65.png
-share/gnome/pixmaps/gaim/status/default/qq_66.png
-share/gnome/pixmaps/gaim/status/default/qq_67.png
-share/gnome/pixmaps/gaim/status/default/qq_68.png
-share/gnome/pixmaps/gaim/status/default/qq_69.png
-share/gnome/pixmaps/gaim/status/default/qq_7.png
-share/gnome/pixmaps/gaim/status/default/qq_70.png
-share/gnome/pixmaps/gaim/status/default/qq_71.png
-share/gnome/pixmaps/gaim/status/default/qq_72.png
-share/gnome/pixmaps/gaim/status/default/qq_73.png
-share/gnome/pixmaps/gaim/status/default/qq_74.png
-share/gnome/pixmaps/gaim/status/default/qq_75.png
-share/gnome/pixmaps/gaim/status/default/qq_76.png
-share/gnome/pixmaps/gaim/status/default/qq_77.png
-share/gnome/pixmaps/gaim/status/default/qq_78.png
-share/gnome/pixmaps/gaim/status/default/qq_79.png
-share/gnome/pixmaps/gaim/status/default/qq_8.png
-share/gnome/pixmaps/gaim/status/default/qq_80.png
-share/gnome/pixmaps/gaim/status/default/qq_81.png
-share/gnome/pixmaps/gaim/status/default/qq_82.png
-share/gnome/pixmaps/gaim/status/default/qq_83.png
-share/gnome/pixmaps/gaim/status/default/qq_84.png
-share/gnome/pixmaps/gaim/status/default/qq_85.png
-share/gnome/pixmaps/gaim/status/default/qq_86.png
-share/gnome/pixmaps/gaim/status/default/qq_87.png
-share/gnome/pixmaps/gaim/status/default/qq_88.png
-share/gnome/pixmaps/gaim/status/default/qq_89.png
-share/gnome/pixmaps/gaim/status/default/qq_9.png
-share/gnome/pixmaps/gaim/status/default/qq_90.png
-share/gnome/pixmaps/gaim/status/default/qq_91.png
-share/gnome/pixmaps/gaim/status/default/qq_92.png
-share/gnome/pixmaps/gaim/status/default/qq_93.png
-share/gnome/pixmaps/gaim/status/default/qq_94.png
-share/gnome/pixmaps/gaim/status/default/qq_95.png
-share/gnome/pixmaps/gaim/status/default/qq_96.png
-share/gnome/pixmaps/gaim/status/default/qq_97.png
-share/gnome/pixmaps/gaim/status/default/qq_98.png
-share/gnome/pixmaps/gaim/status/default/qq_99.png
 share/gnome/pixmaps/gaim/status/default/secure.png
 share/gnome/pixmaps/gaim/status/default/silc.png
 share/gnome/pixmaps/gaim/status/default/simple.png
@@ -560,4 +567,6 @@ share/gnome/sounds/gaim/send.wav
 @dirrm share/gnome/pixmaps/gaim/icons
 @dirrm share/gnome/pixmaps/gaim/dialogs
 @dirrm share/gnome/pixmaps/gaim/buttons
+@dirrm share/gnome/pixmaps/gaim/buddy_icons/qq
+@dirrm share/gnome/pixmaps/gaim/buddy_icons
 @dirrm share/gnome/pixmaps/gaim