3 files changed, 222 insertions, 363 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index a5dffa2099c3..e98207713267 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -3,161 +3,31 @@
 # 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/gaim-devel/Makefile,v 1.3 2006/10/29 18:55:29 marcus Exp $
 #
 
 PORTNAME=	gaim
-PORTVERSION=	2.0.0.b3.1
-PORTREVISION=	3
-CATEGORIES?=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-devel
-DISTNAME=	gaim-2.0.0beta3.1
 
 MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	Multi-protocol instant messaging client
+COMMENT=	Gaim multi-protocol messaging client (GTK+ UI)
 
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+    		gaim.0:${PORTSDIR}/net-im/libgaim
 
-CONFLICTS?=	ja-gaim-[0-9]* gaim-1*
+MASTERDIR=	${.CURDIR}/../libgaim
+BUILD_WRKSRC=	${WRKSRC}/gtk
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
 
-USE_XLIB=	yes
-USE_PYTHON=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
+GAIM_SLAVE=	yes
+WITH_GTKUI=	yes
+
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
 WANT_GNOME=	yes
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-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
-
-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 \
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mevolutiondataserver}!=""
-USE_GNOME+=		evolutiondataserver
-PLIST_SUB+=		EVO=""
-.else
-CONFIGURE_ARGS+=	--disable-gevolution
-PLIST_SUB+=		EVO="@comment not installed: "
-.endif
-
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--enable-gnutls=yes
-.else
-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 \
-			--with-nspr-includes=${LOCALBASE}/include/nspr \
-			--with-nspr-libs=${LOCALBASE}/lib \
-			--with-nss-includes=${LOCALBASE}/include/nss/nss \
-			--with-nss-libs=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--enable-nss=no
-.endif
-
-.if defined(WITH_SASL)
-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=""
-.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:=""
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3+=			Gaim.3
-.else
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=		PERL:="@comment not installed: "
-.endif
-
-.if !defined(WITHOUT_GTKSPELL)
-LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
-.else
-CONFIGURE_ARGS+=	--disable-gtkspell
-.endif
-
-.if defined(WITH_TCLTK)
-TCLTK_VER?=		8.4	# user can override it
-TCLTK_VER_NODOT=	${TCLTK_VER:S/.//}
-.if ${TCLTK_VER} != 8.3 && ${TCLTK_VER} != 8.4
-.error Currently GAIM can only use Tcl/Tk 8.3 or 8.4
-.endif
-LIB_DEPENDS+=		tk${TCLTK_VER_NODOT}:${PORTSDIR}/x11-toolkits/tk${TCLTK_VER_NODOT}
-CONFIGURE_ARGS+=	--with-tclconfig=${LOCALBASE}/lib/tcl${TCLTK_VER} \
-			--with-tkconfig=${LOCALBASE}/lib/tk${TCLTK_VER}
-CFLAGS+=		-I${LOCALBASE}/include/tk${TCLTK_VER} -I${LOCALBASE}/include/tcl${TCLTK_VER}
-PLIST_SUB+=		TCL:=""
-.else
-PLIST_SUB+=		TCL:="@comment not installed: "
-.endif
-
-.if !defined(WITHOUT_AUDIO)
-LIB_DEPENDS+=		ao.3:${PORTSDIR}/audio/libao \
-			audiofile.0:${PORTSDIR}/audio/libaudiofile
-.else
-CONFIGURE_ARGS+=	--disable-audio
-.endif
-
-pre-everything::
-.if defined(WITH_PERL) && ${PERL_LEVEL} < 500800
-	@${ECHO_MSG} "WARNING: Perl scripting disabled (Perl 5.8 requirement not met)."
-.endif
-.if defined(WITHOUT_GNUTLS) && defined(WITHOUT_NSS)
-	@${ECHO_MSG} "WARNING: In order to use MSN, you must enable the GNUTLS and/or NSS options."
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
-		-e 's|%%LOCALBASE%%|${LOCALBASE}|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' \
-		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \
-			${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
+CONFIGURE_ARGS=	--disable-consoleui
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/net-im/finch/distinfo b/net-im/finch/distinfo
deleted file mode 100644
index ba30341f4adc..000000000000
--- a/net-im/finch/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/net-im/finch/pkg-plist b/net-im/finch/pkg-plist
index c3cb70f7a50f..44806537eb26 100644
--- a/net-im/finch/pkg-plist
+++ b/net-im/finch/pkg-plist
@@ -1,45 +1,21 @@
 bin/gaim
-%%DBUS%%bin/gaim-client-example
-%%DBUS%%bin/gaim-notifications-example.py
-%%DBUS%%bin/gaim-remote.py
-%%DBUS%%bin/gaim-send
-%%DBUS%%bin/gaim-send-async
-include/gaim/account.h
-include/gaim/accountopt.h
-include/gaim/blist.h
-include/gaim/buddyicon.h
-include/gaim/cipher.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-server.h
-%%DBUS%%include/gaim/dbus-useful.h
-include/gaim/debug.h
-include/gaim/desktopitem.h
-include/gaim/dnssrv.h
-include/gaim/eventloop.h
-include/gaim/ft.h
-include/gaim/gaim.h
-include/gaim/gaim_buffer.h
+include/gaim/eggtrayicon.h
+include/gaim/gaimcombobox.h
+include/gaim/gaimstock.h
 include/gaim/gtkaccount.h
 include/gaim/gtkblist.h
 include/gaim/gtkcelllayout.h
+include/gaim/gtkcellrendererexpander.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/gtkdocklet.h
 include/gaim/gtkeventloop.h
 include/gaim/gtkexpander.h
 include/gaim/gtkft.h
@@ -63,42 +39,11 @@ 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
-include/gaim/mime.h
-include/gaim/network.h
-include/gaim/notify.h
-include/gaim/ntlm.h
-include/gaim/plugin.h
-include/gaim/pluginpref.h
-include/gaim/pounce.h
-include/gaim/prefs.h
-include/gaim/privacy.h
-include/gaim/proxy.h
-include/gaim/prpl.h
-include/gaim/request.h
-include/gaim/roomlist.h
-include/gaim/savedstatuses.h
-include/gaim/server.h
-include/gaim/signals.h
-include/gaim/sound.h
-include/gaim/sslconn.h
-include/gaim/status.h
-include/gaim/stringref.h
-include/gaim/stun.h
-include/gaim/upnp.h
-include/gaim/util.h
-include/gaim/value.h
-include/gaim/version.h
-include/gaim/whiteboard.h
-include/gaim/xmlnode.h
-%%DBUS%%lib/gaim/dbus-example.la
-%%DBUS%%lib/gaim/dbus-example.so
+%%CAP%%lib/gaim/cap.la
+%%CAP%%lib/gaim/cap.so
 lib/gaim/docklet.la
 lib/gaim/docklet.so
 lib/gaim/extplacement.la
@@ -113,68 +58,20 @@ 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
-lib/gaim/libirc.la
-lib/gaim/libirc.so
-lib/gaim/libjabber.la
-lib/gaim/libjabber.so
-lib/gaim/libmsn.la
-lib/gaim/libmsn.so
-lib/gaim/libnovell.la
-lib/gaim/libnovell.so
-lib/gaim/liboscar.la
-lib/gaim/liboscar.so
-%%SILC%%lib/gaim/libsilcgaim.la
-%%SILC%%lib/gaim/libsilcgaim.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/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
-lib/gaim/ssl-nss.so
-lib/gaim/ssl.la
-lib/gaim/ssl.so
-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
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.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
-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
@@ -206,6 +103,7 @@ 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/insert-image.png
 share/gnome/pixmaps/gaim/logo.png
 share/gnome/pixmaps/gaim/phone.png
 share/gnome/pixmaps/gaim/smileys/default/angel.png
@@ -306,6 +204,102 @@ 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/qq_smiley_0.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_1.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_10.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_11.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_12.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_13.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_14.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_15.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_16.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_17.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_18.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_19.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_2.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_20.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_21.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_22.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_23.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_24.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_25.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_26.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_27.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_28.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_29.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_3.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_30.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_31.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_32.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_33.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_34.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_35.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_36.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_37.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_38.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_39.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_4.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_40.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_41.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_42.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_43.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_44.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_45.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_46.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_47.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_48.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_49.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_5.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_50.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_51.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_52.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_53.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_54.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_55.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_56.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_57.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_58.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_59.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_6.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_60.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_61.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_62.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_63.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_64.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_65.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_66.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_67.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_68.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_69.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_7.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_70.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_71.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_72.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_73.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_74.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_75.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_76.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_77.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_78.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_79.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_8.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_80.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_81.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_82.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_83.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_84.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_85.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_86.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_87.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_88.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_89.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_9.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_90.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_91.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_92.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_93.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_94.gif
+share/gnome/pixmaps/gaim/smileys/default/qq_smiley_95.gif
 share/gnome/pixmaps/gaim/smileys/default/sad.png
 share/gnome/pixmaps/gaim/smileys/default/scream.png
 share/gnome/pixmaps/gaim/smileys/default/smile.png
@@ -433,14 +427,113 @@ 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/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
@@ -455,66 +548,12 @@ 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/Makefile.mingw
 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/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/cs/LC_MESSAGES/gaim.mo
-share/locale/da/LC_MESSAGES/gaim.mo
-share/locale/de/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
-share/locale/en_GB/LC_MESSAGES/gaim.mo
-share/locale/es/LC_MESSAGES/gaim.mo
-share/locale/et/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
-share/locale/gl/LC_MESSAGES/gaim.mo
-share/locale/gu/LC_MESSAGES/gaim.mo
-share/locale/he/LC_MESSAGES/gaim.mo
-share/locale/hi/LC_MESSAGES/gaim.mo
-share/locale/hu/LC_MESSAGES/gaim.mo
-share/locale/it/LC_MESSAGES/gaim.mo
-share/locale/ja/LC_MESSAGES/gaim.mo
-share/locale/ka/LC_MESSAGES/gaim.mo
-share/locale/ko/LC_MESSAGES/gaim.mo
-share/locale/ku/LC_MESSAGES/gaim.mo
-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/nl/LC_MESSAGES/gaim.mo
-share/locale/nn/LC_MESSAGES/gaim.mo
-share/locale/pa/LC_MESSAGES/gaim.mo
-share/locale/pl/LC_MESSAGES/gaim.mo
-share/locale/pt/LC_MESSAGES/gaim.mo
-share/locale/pt_BR/LC_MESSAGES/gaim.mo
-share/locale/ro/LC_MESSAGES/gaim.mo
-share/locale/ru/LC_MESSAGES/gaim.mo
-share/locale/sk/LC_MESSAGES/gaim.mo
-share/locale/sl/LC_MESSAGES/gaim.mo
-share/locale/sq/LC_MESSAGES/gaim.mo
-share/locale/sr/LC_MESSAGES/gaim.mo
-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/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
@@ -525,50 +564,3 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @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
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/my_MM/LC_MESSAGES
-@dirrmtry share/locale/my_MM
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@dirrmtry share/locale/el/LC_MESSAGES
-@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/LC_MESSAGES
-@dirrmtry share/locale/ca