Add libgaim 2.0.0.b4 after a repo-copy from net-im/gaim-devel. libgaim

is the backend library and protocols for the Gaim instance messenger
client.  This backend can support a number of client frontends.

8 files changed, 308 insertions, 858 deletions

diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile
index a5dffa2099c3..e42f40fd0f1f 100644
--- a/net-im/libgaim/Makefile
+++ b/net-im/libgaim/Makefile
@@ -3,53 +3,82 @@
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/gaim-devel/Makefile,v 1.5 2006/10/13 05:45:01 mezz Exp $
+#   $MCom: ports-stable/net-im/libgaim/Makefile,v 1.4 2006/10/29 18:55:28 marcus Exp $
 #
 
 PORTNAME=	gaim
-PORTVERSION=	2.0.0.b3.1
-PORTREVISION=	3
+PORTVERSION=	2.0.0.b4
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	-devel
-DISTNAME=	gaim-2.0.0beta3.1
+PKGNAMEPREFIX?=	lib
+DISTNAME=	gaim-2.0.0beta4
 
-MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	Multi-protocol instant messaging client
-
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+MAINTAINER?=	marcus@FreeBSD.org
+COMMENT?=	Backend library for the Gaim multi-protocol messaging client
 
 CONFLICTS?=	ja-gaim-[0-9]* gaim-1*
 
-USE_XLIB=	yes
-USE_PYTHON=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
-WANT_GNOME=	yes
 USE_BZIP2=	yes
-USE_LDCONFIG=	yes
+USE_GMAKE=	yes
+USE_GNOME?=	gnomeprefix gnomehack intlhack glib20
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS?=--disable-gtkui \
+		--disable-consoleui \
+		--with-dynamic_prpls=${PRPL_MODULES}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIB="${PTHREAD_LIBS}"
 
-MAN1=		gaim.1
+.if !defined(GAIM_SLAVE)
+# Gaim slave ports that require the following functionality, must explicitly
+# set these macros themselves.
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+WANT_GNOME=	yes
+USE_PYTHON=	yes
+
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
+MAN1=		gaim.1 gaim-text.1
+
+.endif
+
+PRPL_MODULES=	gg,irc,jabber,msn,novell,oscar,qq,simple,yahoo,zephyr
 
 OPTIONS=	SILC "Secure Internet Live Conferencing support" off \
-		GTKSPELL "Spell checking support" on \
 		AUDIO "Audio support" on \
 		GNUTLS "GNUTLS encryption support" off \
 		NSS "Mozilla NSS encryption support" on \
 		SASL "Cyrus SASL support (for jabberd)" off \
 		DBUS "Enable DBUS bindings" on \
 		PERL "Perl scripting" off \
-		TCLTK "Tcl/Tk scripting" off \
+		BONJOUR "Enable mDNS support" on \
+		SAMETIME "Enable Sametime client support" off \
+		TCLTK "Tcl/Tk scripting" off
+
+.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
+
+CONFIGURE_ARGS+=--disable-doxygen
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+.if !defined(GAIM_SLAVE)
+.if ${HAVE_GNOME:Mgconf2}!="" || exists(${LOCALBASE}/bin/gconftool-2)
+USE_GNOME+=	gconf2
+GCONF_SCHEMAS=	gaim.schemas
+.endif
+.endif
+
+.if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!=""
 USE_GNOME+=		evolutiondataserver
 PLIST_SUB+=		EVO=""
 .else
@@ -57,6 +86,20 @@ CONFIGURE_ARGS+=	--disable-gevolution
 PLIST_SUB+=		EVO="@comment not installed: "
 .endif
 
+.if defined(WITH_GTKUI) && !defined(WITHOUT_GSTREAMER)
+LIB_DEPENDS+=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer
+.else
+CONFIGURE_ARGS+=--disable-gstreamer
+.endif
+
+.if defined(WITH_GTKUI) && !defined(WITHOUT_CAP)
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+PLIST_SUB+=	CAP=""
+.else
+CONFIGURE_ARGS+=--disable-cap
+PLIST_SUB+=	CAP="@comment not installed: "
+.endif
+
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls=yes
@@ -64,14 +107,6 @@ CONFIGURE_ARGS+=	--enable-gnutls=yes
 CONFIGURE_ARGS+=	--enable-gnutls=no
 .endif
 
-.if defined(WITH_SILC)
-LIB_DEPENDS+=		silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
-CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc
-PLIST_SUB+=		SILC=""
-.else
-PLIST_SUB+=		SILC="@comment not installed: "
-.endif
-
 .if !defined(WITHOUT_NSS)
 LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss
 CONFIGURE_ARGS+=	--enable-nss=yes \
@@ -88,31 +123,29 @@ LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .endif
 
-.if defined(WITH_DBUS)
-LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
-CONFIGURE_ARGS+=	--enable-dbus
-PLIST_SUB+=		DBUS=""
+.if defined(WITH_SILC)
+LIB_DEPENDS+=		silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
+CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc
+PLIST_SUB+=		SILC=""
+PRPL_MODULES:=		${PRPL_MODULES},silc
 .else
-CONFIGURE_ARGS+=	--disable-dbus
-PLIST_SUB+=		DBUS="@comment not installed: "
+PLIST_SUB+=		SILC="@comment not installed: "
 .endif
 
-.if defined(WITH_PERL) && ${PERL_LEVEL} >= 500800
-USE_PERL5=		yes
-CONFIGURE_ARGS+=	--with-perl-lib=site
-PLIST_SUB+=		PERL:=""
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3+=			Gaim.3
+.if !defined(WITHOUT_BONJOUR)
+LIB_DEPENDS+=	avahi-core.4:${PORTSDIR}/net/avahi
+PLIST_SUB+=	BONJOUR=""
+PRPL_MODULES:=	${PRPL_MODULES},bonjour
 .else
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=		PERL:="@comment not installed: "
+PLIST_SUB+=	BONJOUR="@comment not installed: "
 .endif
 
-.if !defined(WITHOUT_GTKSPELL)
-LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
+.if defined(WITH_SAMETIME)
+LIB_DEPENDS+=	meanwhile.1:${PORTSDIR}/net-im/meanwhile
+PLIST_SUB+=	SAMETIME=""
+PRPL_MODULES:=	${PRPL_MODULES},sametime
 .else
-CONFIGURE_ARGS+=	--disable-gtkspell
+PLIST_SUB+=	SAMETIME="@comment not installed: "
 .endif
 
 .if defined(WITH_TCLTK)
@@ -137,6 +170,37 @@ LIB_DEPENDS+=		ao.3:${PORTSDIR}/audio/libao \
 CONFIGURE_ARGS+=	--disable-audio
 .endif
 
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.if !defined(GAIM_SLAVE)
+RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
+.endif
+CONFIGURE_ARGS+=	--enable-dbus
+PLIST_SUB+=		DBUS=""
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+PLIST_SUB+=		DBUS="@comment not installed: "
+.endif
+
+.if defined(WITH_PERL) && ${PERL_LEVEL} >= 500800
+USE_PERL5=		yes
+CONFIGURE_ARGS+=	--with-perl-lib=site
+PLIST_SUB+=		PERL:=""
+.if !defined(GAIM_SLAVE)
+MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3+=			Gaim.3
+.endif
+.else
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=		PERL:="@comment not installed: "
+.endif
+
+.if defined(WITH_GTKUI) && !defined(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
+.else
+CONFIGURE_ARGS+=	--disable-gtkspell
+.endif
+
 pre-everything::
 .if defined(WITH_PERL) && ${PERL_LEVEL} < 500800
 	@${ECHO_MSG} "WARNING: Perl scripting disabled (Perl 5.8 requirement not met)."
@@ -148,6 +212,7 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|-lpanel |-lpanel -lncurses|g' \
 		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
 		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
 		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \
@@ -155,9 +220,13 @@ post-patch:
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|{exec_prefix}|${PREFIX}|' \
 			${WRKSRC}/gaim.service.in
-	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \
-			${WRKSRC}/src/gaim-remote.py
 	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
-			${WRKSRC}/src/gaim-send ${WRKSRC}/src/gaim-send-async
+			${WRKSRC}/libgaim/gaim-send \
+			${WRKSRC}/libgaim/gaim-send-async
+.if defined(GAIM_SLAVE)
+	@${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[$$][(]top_builddir[)]/libgaim/libgaim.la|${LOCALBASE}/lib/libgaim.la|g' \
+	    		${WRKSRC}/gtk/Makefile.in
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-im/libgaim/distinfo b/net-im/libgaim/distinfo
index ba30341f4adc..b61ac0541ba4 100644
--- a/net-im/libgaim/distinfo
+++ b/net-im/libgaim/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-2.0.0beta3.1.tar.bz2) = 202b9e6ee5171da90de14230b3037dc1
-SHA256 (gaim-2.0.0beta3.1.tar.bz2) = a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4
-SIZE (gaim-2.0.0beta3.1.tar.bz2) = 5445059
+MD5 (gaim-2.0.0beta4.tar.bz2) = ddf49cb3f95febdd26bf2214875446e6
+SHA256 (gaim-2.0.0beta4.tar.bz2) = 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820
+SIZE (gaim-2.0.0beta4.tar.bz2) = 6298151
diff --git a/net-im/libgaim/pkg-descr b/net-im/libgaim/pkg-descr
index d4901fdf0fae..3637ca410a07 100644
--- a/net-im/libgaim/pkg-descr
+++ b/net-im/libgaim/pkg-descr
@@ -18,4 +18,7 @@ and more.
 
 (Adapted from the About Gaim page.)
 
+Libgaim is a backend library and protocol modules needed for Gaim frontend
+frontends such as the GTK+ and console UIs.
+
 WWW: http://gaim.sourceforge.net/
diff --git a/net-im/libgaim/pkg-plist b/net-im/libgaim/pkg-plist
index c3cb70f7a50f..d6a446c271f6 100644
--- a/net-im/libgaim/pkg-plist
+++ b/net-im/libgaim/pkg-plist
@@ -1,72 +1,31 @@
-bin/gaim
 %%DBUS%%bin/gaim-client-example
-%%DBUS%%bin/gaim-notifications-example.py
-%%DBUS%%bin/gaim-remote.py
+%%DBUS%%bin/gaim-remote
 %%DBUS%%bin/gaim-send
 %%DBUS%%bin/gaim-send-async
+bin/gaim-url-handler
 include/gaim/account.h
 include/gaim/accountopt.h
 include/gaim/blist.h
 include/gaim/buddyicon.h
 include/gaim/cipher.h
+include/gaim/circbuffer.h
 include/gaim/cmds.h
-include/gaim/config.h
 include/gaim/connection.h
 include/gaim/conversation.h
 include/gaim/core.h
 %%DBUS%%include/gaim/dbus-bindings.h
 %%DBUS%%include/gaim/dbus-define-api.h
 %%DBUS%%include/gaim/dbus-gaim.h
-include/gaim/dbus-maybe.h
+%%DBUS%%include/gaim/dbus-maybe.h
 %%DBUS%%include/gaim/dbus-server.h
 %%DBUS%%include/gaim/dbus-useful.h
 include/gaim/debug.h
 include/gaim/desktopitem.h
+include/gaim/dnsquery.h
 include/gaim/dnssrv.h
 include/gaim/eventloop.h
 include/gaim/ft.h
 include/gaim/gaim.h
-include/gaim/gaim_buffer.h
-include/gaim/gtkaccount.h
-include/gaim/gtkblist.h
-include/gaim/gtkcelllayout.h
-include/gaim/gtkcellrendererprogress.h
-include/gaim/gtkcellview.h
-include/gaim/gtkcellviewmenuitem.h
-include/gaim/gtkcombobox.h
-include/gaim/gtkconn.h
-include/gaim/gtkconv.h
-include/gaim/gtkconvwin.h
-include/gaim/gtkdebug.h
-include/gaim/gtkdialogs.h
-include/gaim/gtkdnd-hints.h
-include/gaim/gtkeventloop.h
-include/gaim/gtkexpander.h
-include/gaim/gtkft.h
-include/gaim/gtkgaim.h
-include/gaim/gtkidle.h
-include/gaim/gtkimhtml.h
-include/gaim/gtkimhtmltoolbar.h
-include/gaim/gtklog.h
-include/gaim/gtkmenutray.h
-include/gaim/gtknickcolors.h
-include/gaim/gtknotify.h
-include/gaim/gtkplugin.h
-include/gaim/gtkpluginpref.h
-include/gaim/gtkpounce.h
-include/gaim/gtkprefs.h
-include/gaim/gtkprivacy.h
-include/gaim/gtkrequest.h
-include/gaim/gtkroomlist.h
-include/gaim/gtksavedstatuses.h
-include/gaim/gtksession.h
-include/gaim/gtksound.h
-include/gaim/gtksourceiter.h
-include/gaim/gtkstatusbox.h
-include/gaim/gtkstock.h
-include/gaim/gtkthemes.h
-include/gaim/gtkutils.h
-include/gaim/gtkwhiteboard.h
 include/gaim/idle.h
 include/gaim/imgstore.h
 include/gaim/log.h
@@ -99,24 +58,14 @@ include/gaim/whiteboard.h
 include/gaim/xmlnode.h
 %%DBUS%%lib/gaim/dbus-example.la
 %%DBUS%%lib/gaim/dbus-example.so
-lib/gaim/docklet.la
-lib/gaim/docklet.so
-lib/gaim/extplacement.la
-lib/gaim/extplacement.so
-lib/gaim/gaimrc.la
-lib/gaim/gaimrc.so
-lib/gaim/gestures.la
-lib/gaim/gestures.so
-%%EVO%%lib/gaim/gevolution.la
-%%EVO%%lib/gaim/gevolution.so
-lib/gaim/history.la
-lib/gaim/history.so
-lib/gaim/iconaway.la
-lib/gaim/iconaway.so
 lib/gaim/idle.la
 lib/gaim/idle.so
 %%PERL:%%lib/gaim/libgaimperl.la
 %%PERL:%%lib/gaim/libgaimperl.so
+%%BONJOUR%%lib/gaim/libbonjour.la
+%%BONJOUR%%lib/gaim/libbonjour.so
+lib/gaim/libgg.la
+lib/gaim/libgg.so
 lib/gaim/libirc.la
 lib/gaim/libirc.so
 lib/gaim/libjabber.la
@@ -129,24 +78,20 @@ lib/gaim/liboscar.la
 lib/gaim/liboscar.so
 %%SILC%%lib/gaim/libsilcgaim.la
 %%SILC%%lib/gaim/libsilcgaim.so
+lib/gaim/libqq.la
+lib/gaim/libqq.so
+%%SAMETIME%%lib/gaim/libsametime.la
+%%SAMETIME%%lib/gaim/libsametime.so
 lib/gaim/libsimple.la
 lib/gaim/libsimple.so
 lib/gaim/libyahoo.la
 lib/gaim/libyahoo.so
 lib/gaim/libzephyr.la
 lib/gaim/libzephyr.so
-%%DBUS%%lib/gaim/musicmessaging.la
-%%DBUS%%lib/gaim/musicmessaging.so
-lib/gaim/notify.la
-lib/gaim/notify.so
-%%PERL:%%lib/gaim/perl.la
-%%PERL:%%lib/gaim/perl.so
+lib/gaim/log_reader.la
+lib/gaim/log_reader.so
 lib/gaim/psychic.la
 lib/gaim/psychic.so
-lib/gaim/relnot.la
-lib/gaim/relnot.so
-lib/gaim/spellchk.la
-lib/gaim/spellchk.so
 lib/gaim/ssl-gnutls.la
 lib/gaim/ssl-gnutls.so
 lib/gaim/ssl-nss.la
@@ -157,12 +102,6 @@ lib/gaim/statenotify.la
 lib/gaim/statenotify.so
 %%TCL:%%lib/gaim/tcl.la
 %%TCL:%%lib/gaim/tcl.so
-lib/gaim/ticker.la
-lib/gaim/ticker.so
-lib/gaim/timestamp.la
-lib/gaim/timestamp.so
-lib/gaim/timestamp_format.la
-lib/gaim/timestamp_format.so
 %%DBUS%%lib/libgaim-client.la
 %%DBUS%%lib/libgaim-client.so
 %%DBUS%%lib/libgaim-client.so.0
@@ -171,302 +110,21 @@ lib/gaim/timestamp_format.so
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/.packlist
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Gaim.pm
+lib/libgaim.la
+lib/libgaim.so
+lib/libgaim.so.0
 libdata/pkgconfig/gaim.pc
 share/aclocal/gaim.m4
 %%DBUS%%share/dbus-1/services/gaim.service
 share/gnome/applications/gaim.desktop
-share/gnome/pixmaps/gaim.png
-share/gnome/pixmaps/gaim.svg
-share/gnome/pixmaps/gaim/buttons/about_menu.png
-share/gnome/pixmaps/gaim/buttons/accounts.png
-share/gnome/pixmaps/gaim/buttons/change-bgcolor-small.png
-share/gnome/pixmaps/gaim/buttons/change-fgcolor-small.png
-share/gnome/pixmaps/gaim/buttons/edit.png
-share/gnome/pixmaps/gaim/buttons/info.png
-share/gnome/pixmaps/gaim/buttons/insert-image-small.png
-share/gnome/pixmaps/gaim/buttons/insert-link-small.png
-share/gnome/pixmaps/gaim/buttons/insert-smiley-small.png
-%%DBUS%%share/gnome/pixmaps/gaim/buttons/music.png
-share/gnome/pixmaps/gaim/buttons/pause.png
-share/gnome/pixmaps/gaim/buttons/send-im.png
-share/gnome/pixmaps/gaim/buttons/text_bigger.png
-share/gnome/pixmaps/gaim/buttons/text_normal.png
-share/gnome/pixmaps/gaim/buttons/text_smaller.png
-share/gnome/pixmaps/gaim/dialogs/gaim_auth.png
-share/gnome/pixmaps/gaim/dialogs/gaim_cool.png
-share/gnome/pixmaps/gaim/dialogs/gaim_error.png
-share/gnome/pixmaps/gaim/dialogs/gaim_info.png
-share/gnome/pixmaps/gaim/dialogs/gaim_question.png
-share/gnome/pixmaps/gaim/dialogs/gaim_warning.png
-share/gnome/pixmaps/gaim/icons/away.png
-share/gnome/pixmaps/gaim/icons/connect.png
-share/gnome/pixmaps/gaim/icons/msgpend.png
-share/gnome/pixmaps/gaim/icons/msgunread.png
-share/gnome/pixmaps/gaim/icons/offline.png
-share/gnome/pixmaps/gaim/icons/online.png
-share/gnome/pixmaps/gaim/icons/stock_connect_16.png
-share/gnome/pixmaps/gaim/icons/stock_disconnect_16.png
-share/gnome/pixmaps/gaim/logo.png
-share/gnome/pixmaps/gaim/phone.png
-share/gnome/pixmaps/gaim/smileys/default/angel.png
-share/gnome/pixmaps/gaim/smileys/default/bigsmile.png
-share/gnome/pixmaps/gaim/smileys/default/burp.png
-share/gnome/pixmaps/gaim/smileys/default/cool.png
-share/gnome/pixmaps/gaim/smileys/default/crazy.png
-share/gnome/pixmaps/gaim/smileys/default/crossedlips.png
-share/gnome/pixmaps/gaim/smileys/default/cry.png
-share/gnome/pixmaps/gaim/smileys/default/download.png
-share/gnome/pixmaps/gaim/smileys/default/embarrassed.png
-share/gnome/pixmaps/gaim/smileys/default/farted.png
-share/gnome/pixmaps/gaim/smileys/default/kiss.png
-share/gnome/pixmaps/gaim/smileys/default/luke.png
-share/gnome/pixmaps/gaim/smileys/default/moneymouth.png
-share/gnome/pixmaps/gaim/smileys/default/mrt.png
-share/gnome/pixmaps/gaim/smileys/default/msn_angel.png
-share/gnome/pixmaps/gaim/smileys/default/msn_angry.png
-share/gnome/pixmaps/gaim/smileys/default/msn_away.png
-share/gnome/pixmaps/gaim/smileys/default/msn_bat.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_beer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_bowl.png
-share/gnome/pixmaps/gaim/smileys/default/msn_boy.png
-share/gnome/pixmaps/gaim/smileys/default/msn_brb.png
-share/gnome/pixmaps/gaim/smileys/default/msn_brheart.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cake.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_car.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cat.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cellphone.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cigarette.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_clock.png
-share/gnome/pixmaps/gaim/smileys/default/msn_coffee.png
-share/gnome/pixmaps/gaim/smileys/default/msn_coins.png
-share/gnome/pixmaps/gaim/smileys/default/msn_computer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cry.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_deadflower.png
-share/gnome/pixmaps/gaim/smileys/default/msn_devil.png
-share/gnome/pixmaps/gaim/smileys/default/msn_dog.png
-share/gnome/pixmaps/gaim/smileys/default/msn_dontknow.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_donttell.png
-share/gnome/pixmaps/gaim/smileys/default/msn_drink.png
-share/gnome/pixmaps/gaim/smileys/default/msn_email.png
-share/gnome/pixmaps/gaim/smileys/default/msn_embarrassed.png
-share/gnome/pixmaps/gaim/smileys/default/msn_eyeroll.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_film.png
-share/gnome/pixmaps/gaim/smileys/default/msn_fingerscrossed.png
-share/gnome/pixmaps/gaim/smileys/default/msn_flower.png
-share/gnome/pixmaps/gaim/smileys/default/msn_gift.png
-share/gnome/pixmaps/gaim/smileys/default/msn_girl.png
-share/gnome/pixmaps/gaim/smileys/default/msn_handcuffs.png
-share/gnome/pixmaps/gaim/smileys/default/msn_heart.png
-share/gnome/pixmaps/gaim/smileys/default/msn_highfive.png
-share/gnome/pixmaps/gaim/smileys/default/msn_hot.png
-share/gnome/pixmaps/gaim/smileys/default/msn_icon.png
-share/gnome/pixmaps/gaim/smileys/default/msn_idea.png
-share/gnome/pixmaps/gaim/smileys/default/msn_island.png
-share/gnome/pixmaps/gaim/smileys/default/msn_kiss.png
-share/gnome/pixmaps/gaim/smileys/default/msn_laugh.png
-share/gnome/pixmaps/gaim/smileys/default/msn_lightning.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_nerd.png
-share/gnome/pixmaps/gaim/smileys/default/msn_neutral.png
-share/gnome/pixmaps/gaim/smileys/default/msn_note.png
-share/gnome/pixmaps/gaim/smileys/default/msn_occ.png
-share/gnome/pixmaps/gaim/smileys/default/msn_online.png
-share/gnome/pixmaps/gaim/smileys/default/msn_ooooh.png
-share/gnome/pixmaps/gaim/smileys/default/msn_party.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_phone.png
-share/gnome/pixmaps/gaim/smileys/default/msn_photo.png
-share/gnome/pixmaps/gaim/smileys/default/msn_pizza.png
-share/gnome/pixmaps/gaim/smileys/default/msn_plane.png
-share/gnome/pixmaps/gaim/smileys/default/msn_plate.png
-share/gnome/pixmaps/gaim/smileys/default/msn_question.png
-share/gnome/pixmaps/gaim/smileys/default/msn_rainbow.png
-share/gnome/pixmaps/gaim/smileys/default/msn_run.png
-share/gnome/pixmaps/gaim/smileys/default/msn_runback.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sad.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sarcastic.png
-share/gnome/pixmaps/gaim/smileys/default/msn_secret.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sheep.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sick.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sleep.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sleepy.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_smiley.png
-share/gnome/pixmaps/gaim/smileys/default/msn_snail.png
-share/gnome/pixmaps/gaim/smileys/default/msn_soccer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_star.png
-share/gnome/pixmaps/gaim/smileys/default/msn_stormy.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sun.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sunglasses.png
-share/gnome/pixmaps/gaim/smileys/default/msn_teeth.png
-share/gnome/pixmaps/gaim/smileys/default/msn_think.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_thumbdown.png
-share/gnome/pixmaps/gaim/smileys/default/msn_thumbup.png
-share/gnome/pixmaps/gaim/smileys/default/msn_tongue.png
-share/gnome/pixmaps/gaim/smileys/default/msn_turtle.png
-share/gnome/pixmaps/gaim/smileys/default/msn_umbrella.png
-share/gnome/pixmaps/gaim/smileys/default/msn_weird.png
-share/gnome/pixmaps/gaim/smileys/default/msn_wink.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_xbox.png
-share/gnome/pixmaps/gaim/smileys/default/oneeye.png
-share/gnome/pixmaps/gaim/smileys/default/sad.png
-share/gnome/pixmaps/gaim/smileys/default/scream.png
-share/gnome/pixmaps/gaim/smileys/default/smile.png
-share/gnome/pixmaps/gaim/smileys/default/theme
-share/gnome/pixmaps/gaim/smileys/default/think.png
-share/gnome/pixmaps/gaim/smileys/default/tongue.png
-share/gnome/pixmaps/gaim/smileys/default/wink.png
-share/gnome/pixmaps/gaim/smileys/default/yahoo_alien.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_alien2.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_angel.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_angry.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_batting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_beatup.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_bigsmile.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_blush.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_brokenheart.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_bye.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_chicken.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_clap.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_clown.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_coffee.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cow.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cowboy.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cry.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_dance.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_devil.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_doh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_drool.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_eyebrow.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_eyeroll.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_femalefighter.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_flag.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_flower.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_frustrated.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_ghost.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_giggle.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_glasses.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_huggs.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_hypnotized.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_idea.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_kiss.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_laughloud.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_liar.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_loser.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_love.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_madtongue.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter1.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter2.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_mean.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_moneyeyes.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_monkey.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_nailbiting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_neutral.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_ooooh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_party.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_peace.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pig.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pray.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pumpkin.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_question.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_rotfl.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sad.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shame.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shamrock.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shhhh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sick.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sighing.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_silent.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_silly.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sleep.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_smiley.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_star.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sunglas.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sweating.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_talktohand.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_think.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_tired.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_tongue.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_waiting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_waving.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_whistling.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_wink.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_worried.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_worship.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_yingyang.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_youkiddingme.gif
-share/gnome/pixmaps/gaim/smileys/default/yell.png
-share/gnome/pixmaps/gaim/smileys/none/theme
-share/gnome/pixmaps/gaim/status-away.png
-share/gnome/pixmaps/gaim/status-connect0.png
-share/gnome/pixmaps/gaim/status-connect1.png
-share/gnome/pixmaps/gaim/status-connect2.png
-share/gnome/pixmaps/gaim/status-connect3.png
-share/gnome/pixmaps/gaim/status-invisible.png
-share/gnome/pixmaps/gaim/status-offline.png
-share/gnome/pixmaps/gaim/status-online.png
-share/gnome/pixmaps/gaim/status-typing0.png
-share/gnome/pixmaps/gaim/status-typing1.png
-share/gnome/pixmaps/gaim/status-typing2.png
-share/gnome/pixmaps/gaim/status-typing3.png
-share/gnome/pixmaps/gaim/status/default/activebuddy.png
-share/gnome/pixmaps/gaim/status/default/admin.png
-share/gnome/pixmaps/gaim/status/default/aim.png
-share/gnome/pixmaps/gaim/status/default/aol.png
-share/gnome/pixmaps/gaim/status/default/away.png
-share/gnome/pixmaps/gaim/status/default/blocked.png
-share/gnome/pixmaps/gaim/status/default/bonjour.png
-share/gnome/pixmaps/gaim/status/default/dnd.png
-share/gnome/pixmaps/gaim/status/default/extended_away.png
-share/gnome/pixmaps/gaim/status/default/external.png
-share/gnome/pixmaps/gaim/status/default/female.png
-share/gnome/pixmaps/gaim/status/default/founder.png
-share/gnome/pixmaps/gaim/status/default/freeforchat.png
-share/gnome/pixmaps/gaim/status/default/gadu-gadu.png
-share/gnome/pixmaps/gaim/status/default/game.png
-share/gnome/pixmaps/gaim/status/default/halfop.png
-share/gnome/pixmaps/gaim/status/default/hiptop.png
-share/gnome/pixmaps/gaim/status/default/icq.png
-share/gnome/pixmaps/gaim/status/default/ignored.png
-share/gnome/pixmaps/gaim/status/default/invisible.png
-share/gnome/pixmaps/gaim/status/default/irc.png
-share/gnome/pixmaps/gaim/status/default/jabber.png
-share/gnome/pixmaps/gaim/status/default/login.png
-share/gnome/pixmaps/gaim/status/default/logout.png
-share/gnome/pixmaps/gaim/status/default/male.png
-share/gnome/pixmaps/gaim/status/default/meanwhile.png
-share/gnome/pixmaps/gaim/status/default/msn.png
-share/gnome/pixmaps/gaim/status/default/napster.png
-share/gnome/pixmaps/gaim/status/default/notauthorized.png
-share/gnome/pixmaps/gaim/status/default/novell.png
-share/gnome/pixmaps/gaim/status/default/nr.png
-share/gnome/pixmaps/gaim/status/default/occupied.png
-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/secure.png
-share/gnome/pixmaps/gaim/status/default/silc.png
-share/gnome/pixmaps/gaim/status/default/simple.png
-share/gnome/pixmaps/gaim/status/default/unavailable.png
-share/gnome/pixmaps/gaim/status/default/voice.png
-share/gnome/pixmaps/gaim/status/default/wireless.png
-share/gnome/pixmaps/gaim/status/default/yahoo.png
-share/gnome/pixmaps/gaim/status/default/zephyr.png
-share/gnome/pixmaps/gaim/tb_drag_arrow_down.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_left.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_right.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_up.xpm
-share/gnome/pixmaps/gaim/typed.png
-share/gnome/pixmaps/gaim/typing.png
-share/gnome/sounds/gaim/alert.wav
-share/gnome/sounds/gaim/login.wav
-share/gnome/sounds/gaim/logout.wav
-share/gnome/sounds/gaim/receive.wav
-share/gnome/sounds/gaim/send.wav
 share/locale/am/LC_MESSAGES/gaim.mo
+share/locale/ar/LC_MESSAGES/gaim.mo
 share/locale/az/LC_MESSAGES/gaim.mo
 share/locale/bg/LC_MESSAGES/gaim.mo
 share/locale/bn/LC_MESSAGES/gaim.mo
 share/locale/bs/LC_MESSAGES/gaim.mo
 share/locale/ca/LC_MESSAGES/gaim.mo
-share/locale/ca_ES@valencian/LC_MESSAGES/gaim.mo
+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
@@ -476,6 +134,7 @@ share/locale/en_CA/LC_MESSAGES/gaim.mo
 share/locale/en_GB/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/et/LC_MESSAGES/gaim.mo
+share/locale/eu/LC_MESSAGES/gaim.mo
 share/locale/fa/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
@@ -493,6 +152,7 @@ share/locale/lt/LC_MESSAGES/gaim.mo
 share/locale/mk/LC_MESSAGES/gaim.mo
 share/locale/my_MM/LC_MESSAGES/gaim.mo
 share/locale/nb/LC_MESSAGES/gaim.mo
+share/locale/ne/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/nn/LC_MESSAGES/gaim.mo
 share/locale/pa/LC_MESSAGES/gaim.mo
@@ -509,25 +169,13 @@ share/locale/sr@Latn/LC_MESSAGES/gaim.mo
 share/locale/sv/LC_MESSAGES/gaim.mo
 share/locale/ta/LC_MESSAGES/gaim.mo
 share/locale/te/LC_MESSAGES/gaim.mo
+share/locale/th/LC_MESSAGES/gaim.mo
 share/locale/tr/LC_MESSAGES/gaim.mo
 share/locale/uk/LC_MESSAGES/gaim.mo
 share/locale/vi/LC_MESSAGES/gaim.mo
 share/locale/xh/LC_MESSAGES/gaim.mo
 share/locale/zh_CN/LC_MESSAGES/gaim.mo
 share/locale/zh_TW/LC_MESSAGES/gaim.mo
-@dirrm share/gnome/sounds/gaim
-@dirrm share/gnome/pixmaps/gaim/status/default
-@dirrm share/gnome/pixmaps/gaim/status
-@dirrm share/gnome/pixmaps/gaim/smileys/none
-@dirrm share/gnome/pixmaps/gaim/smileys/default
-@dirrm share/gnome/pixmaps/gaim/smileys
-@dirrm share/gnome/pixmaps/gaim/icons
-@dirrm share/gnome/pixmaps/gaim/dialogs
-@dirrm share/gnome/pixmaps/gaim/buttons
-@dirrm share/gnome/pixmaps/gaim
-%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
-@dirrm lib/gaim
-@dirrm include/gaim
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
@@ -552,6 +200,8 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/pl
 @dirrmtry share/locale/nn/LC_MESSAGES
 @dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/my_MM/LC_MESSAGES
 @dirrmtry share/locale/my_MM
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -568,7 +218,10 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/el
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
-@dirrmtry share/locale/ca_ES@valencian/LC_MESSAGES
-@dirrmtry share/locale/ca_ES@valencian
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
+@dirrm lib/gaim
+@dirrm include/gaim
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index a5dffa2099c3..e42f40fd0f1f 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -3,53 +3,82 @@
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/gaim-devel/Makefile,v 1.5 2006/10/13 05:45:01 mezz Exp $
+#   $MCom: ports-stable/net-im/libgaim/Makefile,v 1.4 2006/10/29 18:55:28 marcus Exp $
 #
 
 PORTNAME=	gaim
-PORTVERSION=	2.0.0.b3.1
-PORTREVISION=	3
+PORTVERSION=	2.0.0.b4
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	-devel
-DISTNAME=	gaim-2.0.0beta3.1
+PKGNAMEPREFIX?=	lib
+DISTNAME=	gaim-2.0.0beta4
 
-MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	Multi-protocol instant messaging client
-
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+MAINTAINER?=	marcus@FreeBSD.org
+COMMENT?=	Backend library for the Gaim multi-protocol messaging client
 
 CONFLICTS?=	ja-gaim-[0-9]* gaim-1*
 
-USE_XLIB=	yes
-USE_PYTHON=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
-WANT_GNOME=	yes
 USE_BZIP2=	yes
-USE_LDCONFIG=	yes
+USE_GMAKE=	yes
+USE_GNOME?=	gnomeprefix gnomehack intlhack glib20
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS?=--disable-gtkui \
+		--disable-consoleui \
+		--with-dynamic_prpls=${PRPL_MODULES}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIB="${PTHREAD_LIBS}"
 
-MAN1=		gaim.1
+.if !defined(GAIM_SLAVE)
+# Gaim slave ports that require the following functionality, must explicitly
+# set these macros themselves.
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+WANT_GNOME=	yes
+USE_PYTHON=	yes
+
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
+MAN1=		gaim.1 gaim-text.1
+
+.endif
+
+PRPL_MODULES=	gg,irc,jabber,msn,novell,oscar,qq,simple,yahoo,zephyr
 
 OPTIONS=	SILC "Secure Internet Live Conferencing support" off \
-		GTKSPELL "Spell checking support" on \
 		AUDIO "Audio support" on \
 		GNUTLS "GNUTLS encryption support" off \
 		NSS "Mozilla NSS encryption support" on \
 		SASL "Cyrus SASL support (for jabberd)" off \
 		DBUS "Enable DBUS bindings" on \
 		PERL "Perl scripting" off \
-		TCLTK "Tcl/Tk scripting" off \
+		BONJOUR "Enable mDNS support" on \
+		SAMETIME "Enable Sametime client support" off \
+		TCLTK "Tcl/Tk scripting" off
+
+.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
+
+CONFIGURE_ARGS+=--disable-doxygen
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+.if !defined(GAIM_SLAVE)
+.if ${HAVE_GNOME:Mgconf2}!="" || exists(${LOCALBASE}/bin/gconftool-2)
+USE_GNOME+=	gconf2
+GCONF_SCHEMAS=	gaim.schemas
+.endif
+.endif
+
+.if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!=""
 USE_GNOME+=		evolutiondataserver
 PLIST_SUB+=		EVO=""
 .else
@@ -57,6 +86,20 @@ CONFIGURE_ARGS+=	--disable-gevolution
 PLIST_SUB+=		EVO="@comment not installed: "
 .endif
 
+.if defined(WITH_GTKUI) && !defined(WITHOUT_GSTREAMER)
+LIB_DEPENDS+=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer
+.else
+CONFIGURE_ARGS+=--disable-gstreamer
+.endif
+
+.if defined(WITH_GTKUI) && !defined(WITHOUT_CAP)
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+PLIST_SUB+=	CAP=""
+.else
+CONFIGURE_ARGS+=--disable-cap
+PLIST_SUB+=	CAP="@comment not installed: "
+.endif
+
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls=yes
@@ -64,14 +107,6 @@ CONFIGURE_ARGS+=	--enable-gnutls=yes
 CONFIGURE_ARGS+=	--enable-gnutls=no
 .endif
 
-.if defined(WITH_SILC)
-LIB_DEPENDS+=		silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
-CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc
-PLIST_SUB+=		SILC=""
-.else
-PLIST_SUB+=		SILC="@comment not installed: "
-.endif
-
 .if !defined(WITHOUT_NSS)
 LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss
 CONFIGURE_ARGS+=	--enable-nss=yes \
@@ -88,31 +123,29 @@ LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .endif
 
-.if defined(WITH_DBUS)
-LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
-CONFIGURE_ARGS+=	--enable-dbus
-PLIST_SUB+=		DBUS=""
+.if defined(WITH_SILC)
+LIB_DEPENDS+=		silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
+CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc
+PLIST_SUB+=		SILC=""
+PRPL_MODULES:=		${PRPL_MODULES},silc
 .else
-CONFIGURE_ARGS+=	--disable-dbus
-PLIST_SUB+=		DBUS="@comment not installed: "
+PLIST_SUB+=		SILC="@comment not installed: "
 .endif
 
-.if defined(WITH_PERL) && ${PERL_LEVEL} >= 500800
-USE_PERL5=		yes
-CONFIGURE_ARGS+=	--with-perl-lib=site
-PLIST_SUB+=		PERL:=""
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3+=			Gaim.3
+.if !defined(WITHOUT_BONJOUR)
+LIB_DEPENDS+=	avahi-core.4:${PORTSDIR}/net/avahi
+PLIST_SUB+=	BONJOUR=""
+PRPL_MODULES:=	${PRPL_MODULES},bonjour
 .else
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=		PERL:="@comment not installed: "
+PLIST_SUB+=	BONJOUR="@comment not installed: "
 .endif
 
-.if !defined(WITHOUT_GTKSPELL)
-LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
+.if defined(WITH_SAMETIME)
+LIB_DEPENDS+=	meanwhile.1:${PORTSDIR}/net-im/meanwhile
+PLIST_SUB+=	SAMETIME=""
+PRPL_MODULES:=	${PRPL_MODULES},sametime
 .else
-CONFIGURE_ARGS+=	--disable-gtkspell
+PLIST_SUB+=	SAMETIME="@comment not installed: "
 .endif
 
 .if defined(WITH_TCLTK)
@@ -137,6 +170,37 @@ LIB_DEPENDS+=		ao.3:${PORTSDIR}/audio/libao \
 CONFIGURE_ARGS+=	--disable-audio
 .endif
 
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.if !defined(GAIM_SLAVE)
+RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
+.endif
+CONFIGURE_ARGS+=	--enable-dbus
+PLIST_SUB+=		DBUS=""
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+PLIST_SUB+=		DBUS="@comment not installed: "
+.endif
+
+.if defined(WITH_PERL) && ${PERL_LEVEL} >= 500800
+USE_PERL5=		yes
+CONFIGURE_ARGS+=	--with-perl-lib=site
+PLIST_SUB+=		PERL:=""
+.if !defined(GAIM_SLAVE)
+MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3+=			Gaim.3
+.endif
+.else
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=		PERL:="@comment not installed: "
+.endif
+
+.if defined(WITH_GTKUI) && !defined(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
+.else
+CONFIGURE_ARGS+=	--disable-gtkspell
+.endif
+
 pre-everything::
 .if defined(WITH_PERL) && ${PERL_LEVEL} < 500800
 	@${ECHO_MSG} "WARNING: Perl scripting disabled (Perl 5.8 requirement not met)."
@@ -148,6 +212,7 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|-lpanel |-lpanel -lncurses|g' \
 		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
 		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
 		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \
@@ -155,9 +220,13 @@ post-patch:
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|{exec_prefix}|${PREFIX}|' \
 			${WRKSRC}/gaim.service.in
-	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \
-			${WRKSRC}/src/gaim-remote.py
 	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
-			${WRKSRC}/src/gaim-send ${WRKSRC}/src/gaim-send-async
+			${WRKSRC}/libgaim/gaim-send \
+			${WRKSRC}/libgaim/gaim-send-async
+.if defined(GAIM_SLAVE)
+	@${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[$$][(]top_builddir[)]/libgaim/libgaim.la|${LOCALBASE}/lib/libgaim.la|g' \
+	    		${WRKSRC}/gtk/Makefile.in
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index ba30341f4adc..b61ac0541ba4 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-2.0.0beta3.1.tar.bz2) = 202b9e6ee5171da90de14230b3037dc1
-SHA256 (gaim-2.0.0beta3.1.tar.bz2) = a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4
-SIZE (gaim-2.0.0beta3.1.tar.bz2) = 5445059
+MD5 (gaim-2.0.0beta4.tar.bz2) = ddf49cb3f95febdd26bf2214875446e6
+SHA256 (gaim-2.0.0beta4.tar.bz2) = 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820
+SIZE (gaim-2.0.0beta4.tar.bz2) = 6298151
diff --git a/net-im/libpurple/pkg-descr b/net-im/libpurple/pkg-descr
index d4901fdf0fae..3637ca410a07 100644
--- a/net-im/libpurple/pkg-descr
+++ b/net-im/libpurple/pkg-descr
@@ -18,4 +18,7 @@ and more.
 
 (Adapted from the About Gaim page.)
 
+Libgaim is a backend library and protocol modules needed for Gaim frontend
+frontends such as the GTK+ and console UIs.
+
 WWW: http://gaim.sourceforge.net/
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index c3cb70f7a50f..d6a446c271f6 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -1,72 +1,31 @@
-bin/gaim
 %%DBUS%%bin/gaim-client-example
-%%DBUS%%bin/gaim-notifications-example.py
-%%DBUS%%bin/gaim-remote.py
+%%DBUS%%bin/gaim-remote
 %%DBUS%%bin/gaim-send
 %%DBUS%%bin/gaim-send-async
+bin/gaim-url-handler
 include/gaim/account.h
 include/gaim/accountopt.h
 include/gaim/blist.h
 include/gaim/buddyicon.h
 include/gaim/cipher.h
+include/gaim/circbuffer.h
 include/gaim/cmds.h
-include/gaim/config.h
 include/gaim/connection.h
 include/gaim/conversation.h
 include/gaim/core.h
 %%DBUS%%include/gaim/dbus-bindings.h
 %%DBUS%%include/gaim/dbus-define-api.h
 %%DBUS%%include/gaim/dbus-gaim.h
-include/gaim/dbus-maybe.h
+%%DBUS%%include/gaim/dbus-maybe.h
 %%DBUS%%include/gaim/dbus-server.h
 %%DBUS%%include/gaim/dbus-useful.h
 include/gaim/debug.h
 include/gaim/desktopitem.h
+include/gaim/dnsquery.h
 include/gaim/dnssrv.h
 include/gaim/eventloop.h
 include/gaim/ft.h
 include/gaim/gaim.h
-include/gaim/gaim_buffer.h
-include/gaim/gtkaccount.h
-include/gaim/gtkblist.h
-include/gaim/gtkcelllayout.h
-include/gaim/gtkcellrendererprogress.h
-include/gaim/gtkcellview.h
-include/gaim/gtkcellviewmenuitem.h
-include/gaim/gtkcombobox.h
-include/gaim/gtkconn.h
-include/gaim/gtkconv.h
-include/gaim/gtkconvwin.h
-include/gaim/gtkdebug.h
-include/gaim/gtkdialogs.h
-include/gaim/gtkdnd-hints.h
-include/gaim/gtkeventloop.h
-include/gaim/gtkexpander.h
-include/gaim/gtkft.h
-include/gaim/gtkgaim.h
-include/gaim/gtkidle.h
-include/gaim/gtkimhtml.h
-include/gaim/gtkimhtmltoolbar.h
-include/gaim/gtklog.h
-include/gaim/gtkmenutray.h
-include/gaim/gtknickcolors.h
-include/gaim/gtknotify.h
-include/gaim/gtkplugin.h
-include/gaim/gtkpluginpref.h
-include/gaim/gtkpounce.h
-include/gaim/gtkprefs.h
-include/gaim/gtkprivacy.h
-include/gaim/gtkrequest.h
-include/gaim/gtkroomlist.h
-include/gaim/gtksavedstatuses.h
-include/gaim/gtksession.h
-include/gaim/gtksound.h
-include/gaim/gtksourceiter.h
-include/gaim/gtkstatusbox.h
-include/gaim/gtkstock.h
-include/gaim/gtkthemes.h
-include/gaim/gtkutils.h
-include/gaim/gtkwhiteboard.h
 include/gaim/idle.h
 include/gaim/imgstore.h
 include/gaim/log.h
@@ -99,24 +58,14 @@ include/gaim/whiteboard.h
 include/gaim/xmlnode.h
 %%DBUS%%lib/gaim/dbus-example.la
 %%DBUS%%lib/gaim/dbus-example.so
-lib/gaim/docklet.la
-lib/gaim/docklet.so
-lib/gaim/extplacement.la
-lib/gaim/extplacement.so
-lib/gaim/gaimrc.la
-lib/gaim/gaimrc.so
-lib/gaim/gestures.la
-lib/gaim/gestures.so
-%%EVO%%lib/gaim/gevolution.la
-%%EVO%%lib/gaim/gevolution.so
-lib/gaim/history.la
-lib/gaim/history.so
-lib/gaim/iconaway.la
-lib/gaim/iconaway.so
 lib/gaim/idle.la
 lib/gaim/idle.so
 %%PERL:%%lib/gaim/libgaimperl.la
 %%PERL:%%lib/gaim/libgaimperl.so
+%%BONJOUR%%lib/gaim/libbonjour.la
+%%BONJOUR%%lib/gaim/libbonjour.so
+lib/gaim/libgg.la
+lib/gaim/libgg.so
 lib/gaim/libirc.la
 lib/gaim/libirc.so
 lib/gaim/libjabber.la
@@ -129,24 +78,20 @@ lib/gaim/liboscar.la
 lib/gaim/liboscar.so
 %%SILC%%lib/gaim/libsilcgaim.la
 %%SILC%%lib/gaim/libsilcgaim.so
+lib/gaim/libqq.la
+lib/gaim/libqq.so
+%%SAMETIME%%lib/gaim/libsametime.la
+%%SAMETIME%%lib/gaim/libsametime.so
 lib/gaim/libsimple.la
 lib/gaim/libsimple.so
 lib/gaim/libyahoo.la
 lib/gaim/libyahoo.so
 lib/gaim/libzephyr.la
 lib/gaim/libzephyr.so
-%%DBUS%%lib/gaim/musicmessaging.la
-%%DBUS%%lib/gaim/musicmessaging.so
-lib/gaim/notify.la
-lib/gaim/notify.so
-%%PERL:%%lib/gaim/perl.la
-%%PERL:%%lib/gaim/perl.so
+lib/gaim/log_reader.la
+lib/gaim/log_reader.so
 lib/gaim/psychic.la
 lib/gaim/psychic.so
-lib/gaim/relnot.la
-lib/gaim/relnot.so
-lib/gaim/spellchk.la
-lib/gaim/spellchk.so
 lib/gaim/ssl-gnutls.la
 lib/gaim/ssl-gnutls.so
 lib/gaim/ssl-nss.la
@@ -157,12 +102,6 @@ lib/gaim/statenotify.la
 lib/gaim/statenotify.so
 %%TCL:%%lib/gaim/tcl.la
 %%TCL:%%lib/gaim/tcl.so
-lib/gaim/ticker.la
-lib/gaim/ticker.so
-lib/gaim/timestamp.la
-lib/gaim/timestamp.so
-lib/gaim/timestamp_format.la
-lib/gaim/timestamp_format.so
 %%DBUS%%lib/libgaim-client.la
 %%DBUS%%lib/libgaim-client.so
 %%DBUS%%lib/libgaim-client.so.0
@@ -171,302 +110,21 @@ lib/gaim/timestamp_format.so
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/.packlist
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Gaim.pm
+lib/libgaim.la
+lib/libgaim.so
+lib/libgaim.so.0
 libdata/pkgconfig/gaim.pc
 share/aclocal/gaim.m4
 %%DBUS%%share/dbus-1/services/gaim.service
 share/gnome/applications/gaim.desktop
-share/gnome/pixmaps/gaim.png
-share/gnome/pixmaps/gaim.svg
-share/gnome/pixmaps/gaim/buttons/about_menu.png
-share/gnome/pixmaps/gaim/buttons/accounts.png
-share/gnome/pixmaps/gaim/buttons/change-bgcolor-small.png
-share/gnome/pixmaps/gaim/buttons/change-fgcolor-small.png
-share/gnome/pixmaps/gaim/buttons/edit.png
-share/gnome/pixmaps/gaim/buttons/info.png
-share/gnome/pixmaps/gaim/buttons/insert-image-small.png
-share/gnome/pixmaps/gaim/buttons/insert-link-small.png
-share/gnome/pixmaps/gaim/buttons/insert-smiley-small.png
-%%DBUS%%share/gnome/pixmaps/gaim/buttons/music.png
-share/gnome/pixmaps/gaim/buttons/pause.png
-share/gnome/pixmaps/gaim/buttons/send-im.png
-share/gnome/pixmaps/gaim/buttons/text_bigger.png
-share/gnome/pixmaps/gaim/buttons/text_normal.png
-share/gnome/pixmaps/gaim/buttons/text_smaller.png
-share/gnome/pixmaps/gaim/dialogs/gaim_auth.png
-share/gnome/pixmaps/gaim/dialogs/gaim_cool.png
-share/gnome/pixmaps/gaim/dialogs/gaim_error.png
-share/gnome/pixmaps/gaim/dialogs/gaim_info.png
-share/gnome/pixmaps/gaim/dialogs/gaim_question.png
-share/gnome/pixmaps/gaim/dialogs/gaim_warning.png
-share/gnome/pixmaps/gaim/icons/away.png
-share/gnome/pixmaps/gaim/icons/connect.png
-share/gnome/pixmaps/gaim/icons/msgpend.png
-share/gnome/pixmaps/gaim/icons/msgunread.png
-share/gnome/pixmaps/gaim/icons/offline.png
-share/gnome/pixmaps/gaim/icons/online.png
-share/gnome/pixmaps/gaim/icons/stock_connect_16.png
-share/gnome/pixmaps/gaim/icons/stock_disconnect_16.png
-share/gnome/pixmaps/gaim/logo.png
-share/gnome/pixmaps/gaim/phone.png
-share/gnome/pixmaps/gaim/smileys/default/angel.png
-share/gnome/pixmaps/gaim/smileys/default/bigsmile.png
-share/gnome/pixmaps/gaim/smileys/default/burp.png
-share/gnome/pixmaps/gaim/smileys/default/cool.png
-share/gnome/pixmaps/gaim/smileys/default/crazy.png
-share/gnome/pixmaps/gaim/smileys/default/crossedlips.png
-share/gnome/pixmaps/gaim/smileys/default/cry.png
-share/gnome/pixmaps/gaim/smileys/default/download.png
-share/gnome/pixmaps/gaim/smileys/default/embarrassed.png
-share/gnome/pixmaps/gaim/smileys/default/farted.png
-share/gnome/pixmaps/gaim/smileys/default/kiss.png
-share/gnome/pixmaps/gaim/smileys/default/luke.png
-share/gnome/pixmaps/gaim/smileys/default/moneymouth.png
-share/gnome/pixmaps/gaim/smileys/default/mrt.png
-share/gnome/pixmaps/gaim/smileys/default/msn_angel.png
-share/gnome/pixmaps/gaim/smileys/default/msn_angry.png
-share/gnome/pixmaps/gaim/smileys/default/msn_away.png
-share/gnome/pixmaps/gaim/smileys/default/msn_bat.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_beer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_bowl.png
-share/gnome/pixmaps/gaim/smileys/default/msn_boy.png
-share/gnome/pixmaps/gaim/smileys/default/msn_brb.png
-share/gnome/pixmaps/gaim/smileys/default/msn_brheart.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cake.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_car.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cat.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cellphone.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cigarette.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_clock.png
-share/gnome/pixmaps/gaim/smileys/default/msn_coffee.png
-share/gnome/pixmaps/gaim/smileys/default/msn_coins.png
-share/gnome/pixmaps/gaim/smileys/default/msn_computer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cry.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_deadflower.png
-share/gnome/pixmaps/gaim/smileys/default/msn_devil.png
-share/gnome/pixmaps/gaim/smileys/default/msn_dog.png
-share/gnome/pixmaps/gaim/smileys/default/msn_dontknow.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_donttell.png
-share/gnome/pixmaps/gaim/smileys/default/msn_drink.png
-share/gnome/pixmaps/gaim/smileys/default/msn_email.png
-share/gnome/pixmaps/gaim/smileys/default/msn_embarrassed.png
-share/gnome/pixmaps/gaim/smileys/default/msn_eyeroll.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_film.png
-share/gnome/pixmaps/gaim/smileys/default/msn_fingerscrossed.png
-share/gnome/pixmaps/gaim/smileys/default/msn_flower.png
-share/gnome/pixmaps/gaim/smileys/default/msn_gift.png
-share/gnome/pixmaps/gaim/smileys/default/msn_girl.png
-share/gnome/pixmaps/gaim/smileys/default/msn_handcuffs.png
-share/gnome/pixmaps/gaim/smileys/default/msn_heart.png
-share/gnome/pixmaps/gaim/smileys/default/msn_highfive.png
-share/gnome/pixmaps/gaim/smileys/default/msn_hot.png
-share/gnome/pixmaps/gaim/smileys/default/msn_icon.png
-share/gnome/pixmaps/gaim/smileys/default/msn_idea.png
-share/gnome/pixmaps/gaim/smileys/default/msn_island.png
-share/gnome/pixmaps/gaim/smileys/default/msn_kiss.png
-share/gnome/pixmaps/gaim/smileys/default/msn_laugh.png
-share/gnome/pixmaps/gaim/smileys/default/msn_lightning.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_nerd.png
-share/gnome/pixmaps/gaim/smileys/default/msn_neutral.png
-share/gnome/pixmaps/gaim/smileys/default/msn_note.png
-share/gnome/pixmaps/gaim/smileys/default/msn_occ.png
-share/gnome/pixmaps/gaim/smileys/default/msn_online.png
-share/gnome/pixmaps/gaim/smileys/default/msn_ooooh.png
-share/gnome/pixmaps/gaim/smileys/default/msn_party.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_phone.png
-share/gnome/pixmaps/gaim/smileys/default/msn_photo.png
-share/gnome/pixmaps/gaim/smileys/default/msn_pizza.png
-share/gnome/pixmaps/gaim/smileys/default/msn_plane.png
-share/gnome/pixmaps/gaim/smileys/default/msn_plate.png
-share/gnome/pixmaps/gaim/smileys/default/msn_question.png
-share/gnome/pixmaps/gaim/smileys/default/msn_rainbow.png
-share/gnome/pixmaps/gaim/smileys/default/msn_run.png
-share/gnome/pixmaps/gaim/smileys/default/msn_runback.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sad.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sarcastic.png
-share/gnome/pixmaps/gaim/smileys/default/msn_secret.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sheep.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sick.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sleep.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sleepy.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_smiley.png
-share/gnome/pixmaps/gaim/smileys/default/msn_snail.png
-share/gnome/pixmaps/gaim/smileys/default/msn_soccer.png
-share/gnome/pixmaps/gaim/smileys/default/msn_star.png
-share/gnome/pixmaps/gaim/smileys/default/msn_stormy.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sun.png
-share/gnome/pixmaps/gaim/smileys/default/msn_sunglasses.png
-share/gnome/pixmaps/gaim/smileys/default/msn_teeth.png
-share/gnome/pixmaps/gaim/smileys/default/msn_think.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_thumbdown.png
-share/gnome/pixmaps/gaim/smileys/default/msn_thumbup.png
-share/gnome/pixmaps/gaim/smileys/default/msn_tongue.png
-share/gnome/pixmaps/gaim/smileys/default/msn_turtle.png
-share/gnome/pixmaps/gaim/smileys/default/msn_umbrella.png
-share/gnome/pixmaps/gaim/smileys/default/msn_weird.png
-share/gnome/pixmaps/gaim/smileys/default/msn_wink.gif
-share/gnome/pixmaps/gaim/smileys/default/msn_xbox.png
-share/gnome/pixmaps/gaim/smileys/default/oneeye.png
-share/gnome/pixmaps/gaim/smileys/default/sad.png
-share/gnome/pixmaps/gaim/smileys/default/scream.png
-share/gnome/pixmaps/gaim/smileys/default/smile.png
-share/gnome/pixmaps/gaim/smileys/default/theme
-share/gnome/pixmaps/gaim/smileys/default/think.png
-share/gnome/pixmaps/gaim/smileys/default/tongue.png
-share/gnome/pixmaps/gaim/smileys/default/wink.png
-share/gnome/pixmaps/gaim/smileys/default/yahoo_alien.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_alien2.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_angel.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_angry.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_batting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_beatup.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_bigsmile.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_blush.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_brokenheart.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_bye.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_chicken.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_clap.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_clown.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_coffee.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cow.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cowboy.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_cry.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_dance.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_devil.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_doh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_drool.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_eyebrow.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_eyeroll.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_femalefighter.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_flag.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_flower.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_frustrated.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_ghost.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_giggle.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_glasses.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_huggs.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_hypnotized.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_idea.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_kiss.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_laughloud.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_liar.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_loser.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_love.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_madtongue.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter1.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter2.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_mean.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_moneyeyes.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_monkey.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_nailbiting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_neutral.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_ooooh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_party.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_peace.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pig.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pray.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_pumpkin.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_question.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_rotfl.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sad.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shame.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shamrock.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_shhhh.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sick.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sighing.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_silent.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_silly.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sleep.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_smiley.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_star.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sunglas.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_sweating.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_talktohand.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_think.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_tired.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_tongue.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_waiting.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_waving.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_whistling.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_wink.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_worried.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_worship.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_yingyang.gif
-share/gnome/pixmaps/gaim/smileys/default/yahoo_youkiddingme.gif
-share/gnome/pixmaps/gaim/smileys/default/yell.png
-share/gnome/pixmaps/gaim/smileys/none/theme
-share/gnome/pixmaps/gaim/status-away.png
-share/gnome/pixmaps/gaim/status-connect0.png
-share/gnome/pixmaps/gaim/status-connect1.png
-share/gnome/pixmaps/gaim/status-connect2.png
-share/gnome/pixmaps/gaim/status-connect3.png
-share/gnome/pixmaps/gaim/status-invisible.png
-share/gnome/pixmaps/gaim/status-offline.png
-share/gnome/pixmaps/gaim/status-online.png
-share/gnome/pixmaps/gaim/status-typing0.png
-share/gnome/pixmaps/gaim/status-typing1.png
-share/gnome/pixmaps/gaim/status-typing2.png
-share/gnome/pixmaps/gaim/status-typing3.png
-share/gnome/pixmaps/gaim/status/default/activebuddy.png
-share/gnome/pixmaps/gaim/status/default/admin.png
-share/gnome/pixmaps/gaim/status/default/aim.png
-share/gnome/pixmaps/gaim/status/default/aol.png
-share/gnome/pixmaps/gaim/status/default/away.png
-share/gnome/pixmaps/gaim/status/default/blocked.png
-share/gnome/pixmaps/gaim/status/default/bonjour.png
-share/gnome/pixmaps/gaim/status/default/dnd.png
-share/gnome/pixmaps/gaim/status/default/extended_away.png
-share/gnome/pixmaps/gaim/status/default/external.png
-share/gnome/pixmaps/gaim/status/default/female.png
-share/gnome/pixmaps/gaim/status/default/founder.png
-share/gnome/pixmaps/gaim/status/default/freeforchat.png
-share/gnome/pixmaps/gaim/status/default/gadu-gadu.png
-share/gnome/pixmaps/gaim/status/default/game.png
-share/gnome/pixmaps/gaim/status/default/halfop.png
-share/gnome/pixmaps/gaim/status/default/hiptop.png
-share/gnome/pixmaps/gaim/status/default/icq.png
-share/gnome/pixmaps/gaim/status/default/ignored.png
-share/gnome/pixmaps/gaim/status/default/invisible.png
-share/gnome/pixmaps/gaim/status/default/irc.png
-share/gnome/pixmaps/gaim/status/default/jabber.png
-share/gnome/pixmaps/gaim/status/default/login.png
-share/gnome/pixmaps/gaim/status/default/logout.png
-share/gnome/pixmaps/gaim/status/default/male.png
-share/gnome/pixmaps/gaim/status/default/meanwhile.png
-share/gnome/pixmaps/gaim/status/default/msn.png
-share/gnome/pixmaps/gaim/status/default/napster.png
-share/gnome/pixmaps/gaim/status/default/notauthorized.png
-share/gnome/pixmaps/gaim/status/default/novell.png
-share/gnome/pixmaps/gaim/status/default/nr.png
-share/gnome/pixmaps/gaim/status/default/occupied.png
-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/secure.png
-share/gnome/pixmaps/gaim/status/default/silc.png
-share/gnome/pixmaps/gaim/status/default/simple.png
-share/gnome/pixmaps/gaim/status/default/unavailable.png
-share/gnome/pixmaps/gaim/status/default/voice.png
-share/gnome/pixmaps/gaim/status/default/wireless.png
-share/gnome/pixmaps/gaim/status/default/yahoo.png
-share/gnome/pixmaps/gaim/status/default/zephyr.png
-share/gnome/pixmaps/gaim/tb_drag_arrow_down.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_left.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_right.xpm
-share/gnome/pixmaps/gaim/tb_drag_arrow_up.xpm
-share/gnome/pixmaps/gaim/typed.png
-share/gnome/pixmaps/gaim/typing.png
-share/gnome/sounds/gaim/alert.wav
-share/gnome/sounds/gaim/login.wav
-share/gnome/sounds/gaim/logout.wav
-share/gnome/sounds/gaim/receive.wav
-share/gnome/sounds/gaim/send.wav
 share/locale/am/LC_MESSAGES/gaim.mo
+share/locale/ar/LC_MESSAGES/gaim.mo
 share/locale/az/LC_MESSAGES/gaim.mo
 share/locale/bg/LC_MESSAGES/gaim.mo
 share/locale/bn/LC_MESSAGES/gaim.mo
 share/locale/bs/LC_MESSAGES/gaim.mo
 share/locale/ca/LC_MESSAGES/gaim.mo
-share/locale/ca_ES@valencian/LC_MESSAGES/gaim.mo
+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
@@ -476,6 +134,7 @@ share/locale/en_CA/LC_MESSAGES/gaim.mo
 share/locale/en_GB/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/et/LC_MESSAGES/gaim.mo
+share/locale/eu/LC_MESSAGES/gaim.mo
 share/locale/fa/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
@@ -493,6 +152,7 @@ share/locale/lt/LC_MESSAGES/gaim.mo
 share/locale/mk/LC_MESSAGES/gaim.mo
 share/locale/my_MM/LC_MESSAGES/gaim.mo
 share/locale/nb/LC_MESSAGES/gaim.mo
+share/locale/ne/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/nn/LC_MESSAGES/gaim.mo
 share/locale/pa/LC_MESSAGES/gaim.mo
@@ -509,25 +169,13 @@ share/locale/sr@Latn/LC_MESSAGES/gaim.mo
 share/locale/sv/LC_MESSAGES/gaim.mo
 share/locale/ta/LC_MESSAGES/gaim.mo
 share/locale/te/LC_MESSAGES/gaim.mo
+share/locale/th/LC_MESSAGES/gaim.mo
 share/locale/tr/LC_MESSAGES/gaim.mo
 share/locale/uk/LC_MESSAGES/gaim.mo
 share/locale/vi/LC_MESSAGES/gaim.mo
 share/locale/xh/LC_MESSAGES/gaim.mo
 share/locale/zh_CN/LC_MESSAGES/gaim.mo
 share/locale/zh_TW/LC_MESSAGES/gaim.mo
-@dirrm share/gnome/sounds/gaim
-@dirrm share/gnome/pixmaps/gaim/status/default
-@dirrm share/gnome/pixmaps/gaim/status
-@dirrm share/gnome/pixmaps/gaim/smileys/none
-@dirrm share/gnome/pixmaps/gaim/smileys/default
-@dirrm share/gnome/pixmaps/gaim/smileys
-@dirrm share/gnome/pixmaps/gaim/icons
-@dirrm share/gnome/pixmaps/gaim/dialogs
-@dirrm share/gnome/pixmaps/gaim/buttons
-@dirrm share/gnome/pixmaps/gaim
-%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
-@dirrm lib/gaim
-@dirrm include/gaim
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
@@ -552,6 +200,8 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/pl
 @dirrmtry share/locale/nn/LC_MESSAGES
 @dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/my_MM/LC_MESSAGES
 @dirrmtry share/locale/my_MM
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -568,7 +218,10 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/el
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
-@dirrmtry share/locale/ca_ES@valencian/LC_MESSAGES
-@dirrmtry share/locale/ca_ES@valencian
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
+@dirrm lib/gaim
+@dirrm include/gaim