Update to 0.60. Note, this is now a GTK+-2 application.

8 files changed, 227 insertions, 260 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 4cbc1b8..57e2b63 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -1,67 +1,47 @@
 # New ports collection makefile for:	gaim
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@FreeBSD.org>
-#
 # $FreeBSD$
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.59.9
+PORTVERSION=	0.60
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER?=	marcus@FreeBSD.org
-COMMENT=	Gtk+ open-source 'clone' of AOL's Instant Messenger client
+COMMENT=	Gtk+-2.0 open-source 'clone' of AOL's Instant Messenger client
 
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk12
+USE_GNOME=	gnomeprefix gnomehack gtk20
 WANT_GNOME=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 MAN1=		gaim.1
 
-GNOME_PANEL2=	${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
-
-.if !defined(WITHOUT_GDK_PIXBUF)
-# Note, gdk-pixbuf is needed for buddy icon support.
-USE_GNOME+=	gdkpixbuf
+.ifndef(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mlibpanel}!= "" && !exists(${GNOME_PANEL2})
-USE_GNOME+=	libpanel
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-CONFIGURE_ARGS+=	--enable-panel
-PKGNAMESUFFIX=	-gnome
-PLIST_SUB+=	PANEL:="" NOPANEL:="@comment "
-.else
-CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=	PANEL:="@comment " NOPANEL:=""
+.ifndef(WITHOUT_AUDIO)
+LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
 .endif
 
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
-.else
-PKGNAMESUFFIX=	-esound
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-esd
-.endif
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Gaim has the following tunable option(s):"
+	@${ECHO_MSG} "		WITHOUT_GTKSPELL	Turns off spell checking"
+	@${ECHO_MSG} "		WITHOUT_AUDIO		Disable audio support"
+	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
 		s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 1f4b485..221d41d 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.59.9.tar.bz2) = ef0aec77daccbc21d34b45955fc44b1c
+MD5 (gaim-0.60.tar.gz) = 464ae767fba53ff7a95de4ae40e5a42e
diff --git a/net-im/gaim/files/patch-aa b/net-im/gaim/files/patch-aa
deleted file mode 100644
index 77386c4..0000000
--- a/net-im/gaim/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Fri Nov  2 05:31:32 2001
-+++ Makefile.in	Fri Nov  2 05:33:10 2001
-@@ -171,8 +171,8 @@
- @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktopdir = $(gnomedata)/applets/Network
- @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktop_DATA = $(gaim_DESKTOP)
- 
--pixmapdir = $(datadir)/apps/Internet
--pixmap_DATA = gaim.desktop
-+@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet
-+@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop
- 
- SUBDIRS = m4 sounds plugins pixmaps doc po intl src
- ACLOCAL_AMFLAGS = -I m4
diff --git a/net-im/gaim/files/patch-ab b/net-im/gaim/files/patch-ab
deleted file mode 100644
index 04fdc29..0000000
--- a/net-im/gaim/files/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
---- pixmaps/Makefile.in.orig	Sat Oct 19 18:47:14 2002
-+++ pixmaps/Makefile.in	Sat Oct 19 18:48:03 2002
-@@ -150,22 +150,15 @@
- EXTRA_DIST = ab.xpm						about_small.xpm					add.xpm						add_small.xpm					admin_icon.xpm					aimicon.xpm					angel.xpm					arrow_down.xpm					arrow_right.xpm					aol_icon.xpm					available-away.xpm				available-chat.xpm				available-dnd.xpm				available-error.xpm				available-xa.xpm				available.xpm					away.png					away_big.xpm					away_icon.xpm					away_small.xpm					bgcolor.xpm					big.xpm						bigsmile.xpm					block.xpm					bold.xpm					broken.xpm					burp.xpm					cancel.xpm					close.xpm					close_small.xpm					connect.png					crazy4.xpm					crossedlips.xpm					cry.xpm						dt_icon.xpm					download.xpm					embarrassed.xpm					exit_small.xpm					farted.xpm					fgcolor.xpm					fontface.xpm					fontface2.xpm					free_icon.xpm					gaim.png					gaim.xpm					gg_suncloud.xpm					gg_sunred.xpm					gg_sunwhitered.xpm				gg_sunyellow.xpm				gnome_add.xpm					gnome_preferences.xpm				gnome_remove.xpm 				gnomeicu-away.xpm				gnomeicu-dnd.xpm				gnomeicu-ffc.xpm				gnomeicu-na.xpm					gnomeicu-occ.xpm				gnomeicu-offline.xpm				gnomeicu-online.xpm				group.xpm					image_icon.xpm					import_small.xpm				irc_icon.xpm					italic.xpm					join.xpm					kiss.xpm					link.xpm					login_icon.xpm					logo.xpm					logout_icon.xpm					logout_menu.xpm					luke03.xpm					moneymouth.xpm					mrt.xpm						msgpend.png					msn_away.xpm					msn_occ.xpm					msn_online.xpm					napster.xpm					no_icon.xpm					normal.xpm					offline.png					ok.xpm						oneeye.xpm					online.png					panic.xpm					plugins_small.xpm				pounce_small.xpm				prefs_small.xpm					refresh.xpm					sad.xpm						save.xpm					save_small.xpm					scream.xpm					search_small.xpm				send_small.xpm					small.xpm					smile.xpm					smile8.xpm					smile_icon.xpm					speaker.xpm					speaker_mute.xpm				status-away.xpm					status-game.xpm					status-here.xpm					status-idle.xpm					strike.xpm					tb_forward.xpm					tb_redo.xpm					tb_refresh.xpm					tb_search.xpm					tb_undo.xpm					think.xpm					tmp_send.xpm					tongue.xpm					underline.xpm					warn.xpm					wink.xpm					wireless_icon.xpm				wood.xpm					yell.xpm			
- 
- 
--@DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim
--@DISTRIB_TRUE@gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
-+@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
-+@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
-+@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
-+@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
-+@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.png
- 
--@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
--@DISTRIB_TRUE@distpixmap_DATA = gaim.png
-+pixmapdir = $(datadir)/pixmaps
-+pixmap_DATA = gaim.png
- 
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
--
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
--
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.png
--
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.png
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac
deleted file mode 100644
index 271d729..0000000
--- a/net-im/gaim/files/patch-ac
+++ /dev/null
@@ -1,153 +0,0 @@
---- src/Makefile.in.orig	Fri Mar 15 06:13:34 2002
-+++ src/Makefile.in	Fri Mar 15 06:22:03 2002
-@@ -146,16 +146,74 @@
- sedpath = @sedpath@
- 
- SUBDIRS = protocols
--@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
-+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
- @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
--@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			applet.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			core.c 			dialogs.c 			gaimrc.c 			gtkimhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			list.c 			md5.c 			module.c 			multi.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			server.c 			sound.c 			ticker.c 			util.c
--@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
--@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
--@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		core.c 		dialogs.c 		gaimrc.c 		gtkimhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		list.c 		md5.c 		module.c 		multi.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		server.c 		sound.c 		ticker.c 		util.c
--@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
--@GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@
-+gaim_applet_SOURCES = about.c \
-+           aim.c \
-+           applet.c \
-+           away.c \
-+           browser.c \
-+           buddy.c \
-+           buddy_chat.c \
-+           conversation.c \
-+           core.c \
-+           dialogs.c \
-+           gaimrc.c \
-+           gtkimhtml.c \
-+           gtkspell.c \
-+           gtkticker.c \
-+           html.c \
-+           idle.c \
-+           list.c \
-+           md5.c \
-+           module.c \
-+           multi.c \
-+           perl.c \
-+           plugins.c \
-+           prefs.c \
-+           proxy.c \
-+           prpl.c \
-+           server.c \
-+           sound.c \
-+           ticker.c \
-+           util.c
-+
-+gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
-+gaim_applet_LDFLAGS = -export-dynamic
-+gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-+gaim_SOURCES = about.c \
-+       aim.c \
-+       applet.c \
-+       away.c \
-+       browser.c \
-+       buddy.c \
-+       buddy_chat.c \
-+       conversation.c \
-+       core.c \
-+       dialogs.c \
-+       gaimrc.c \
-+       gtkimhtml.c \
-+       gtkspell.c \
-+       gtkticker.c \
-+       html.c \
-+       idle.c \
-+       list.c \
-+       md5.c \
-+       module.c \
-+       multi.c \
-+       perl.c \
-+       plugins.c \
-+       prefs.c \
-+       proxy.c \
-+       prpl.c \
-+       server.c \
-+       sound.c \
-+       ticker.c \
-+       util.c
-+
-+gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
-+gaim_LDFLAGS = -export-dynamic
-+gaim_LDADD = @LDADD@ @LIBOBJS@
- CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(prefix)/share/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
- 
- LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
-@@ -165,6 +223,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) gaim$(EXEEXT)
- @GNOMEAPPLET_FALSE@bin_PROGRAMS =  gaim$(EXEEXT)
- PROGRAMS =  $(bin_PROGRAMS)
- 
-@@ -172,30 +231,34 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS =  about.$(OBJEXT) aim.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@conversation.$(OBJEXT) core.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@dialogs.$(OBJEXT) gaimrc.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@gtkimhtml.$(OBJEXT) gtkspell.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@gtkticker.$(OBJEXT) html.$(OBJEXT) idle.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@list.$(OBJEXT) md5.$(OBJEXT) module.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@multi.$(OBJEXT) perl.$(OBJEXT) plugins.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@prefs.$(OBJEXT) proxy.$(OBJEXT) prpl.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@server.$(OBJEXT) sound.$(OBJEXT) ticker.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@util.$(OBJEXT)
--@GNOMEAPPLET_FALSE@gaim_OBJECTS =  about.$(OBJEXT) aim.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@conversation.$(OBJEXT) core.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@dialogs.$(OBJEXT) gaimrc.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@gtkimhtml.$(OBJEXT) gtkspell.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@gtkticker.$(OBJEXT) html.$(OBJEXT) idle.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@list.$(OBJEXT) md5.$(OBJEXT) module.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@multi.$(OBJEXT) perl.$(OBJEXT) plugins.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@prefs.$(OBJEXT) proxy.$(OBJEXT) prpl.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@server.$(OBJEXT) sound.$(OBJEXT) ticker.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@util.$(OBJEXT)
-+gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
-+   applet.$(OBJEXT) away.$(OBJEXT) \
-+   browser.$(OBJEXT) buddy.$(OBJEXT) \
-+   buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
-+   core.$(OBJEXT) dialogs.$(OBJEXT) \
-+   gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
-+   gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
-+   html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
-+   md5.$(OBJEXT) module.$(OBJEXT) \
-+   multi.$(OBJEXT) perl.$(OBJEXT) \
-+   plugins.$(OBJEXT) prefs.$(OBJEXT) \
-+   proxy.$(OBJEXT) prpl.$(OBJEXT) \
-+   server.$(OBJEXT) sound.$(OBJEXT) \
-+   ticker.$(OBJEXT) util.$(OBJEXT)
-+gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
-+   applet.$(OBJEXT) away.$(OBJEXT) \
-+   browser.$(OBJEXT) buddy.$(OBJEXT) \
-+   buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
-+   core.$(OBJEXT) dialogs.$(OBJEXT) \
-+   gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
-+   gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
-+   html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
-+   md5.$(OBJEXT) module.$(OBJEXT) \
-+   multi.$(OBJEXT) perl.$(OBJEXT) \
-+   plugins.$(OBJEXT) prefs.$(OBJEXT) \
-+   proxy.$(OBJEXT) prpl.$(OBJEXT) \
-+   server.$(OBJEXT) sound.$(OBJEXT) \
-+   ticker.$(OBJEXT) util.$(OBJEXT)
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
diff --git a/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c b/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c
deleted file mode 100644
index 3713958..0000000
--- a/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/protocols/yahoo/yahoo.c.orig	Wed Jan 15 21:19:22 2003
-+++ src/protocols/yahoo/yahoo.c	Wed Jan 15 21:19:46 2003
-@@ -1196,6 +1196,9 @@
- 	yahoo_packet_hash(pkt, 1, gc->displayname);
- 	yahoo_packet_hash(pkt, 5, who);
- 	yahoo_packet_hash(pkt, 14, utf8);
-+	yahoo_packet_hash(pkt, 63, ";0");
-+	yahoo_packet_hash(pkt, 64, "0");
-+	yahoo_packet_hash(pkt, 97, "1");
- 
- 	g_free (utf8);
- 
diff --git a/net-im/gaim/pkg-descr b/net-im/gaim/pkg-descr
index fc14677..aabe420 100644
--- a/net-im/gaim/pkg-descr
+++ b/net-im/gaim/pkg-descr
@@ -1,5 +1,5 @@
 GAIM is an Open Source 'clone' of America OnLine's Instant Messenger
-client using the GTK+ toolkit. It features most of the functionality
+client using the GTK+-2.0 toolkit. It features most of the functionality
 of the official AIM client while being much smaller and faster.  It
 features multiple groups, group chat, user information fetching and
 registration, time stamping, sound (for when you really do want to be
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index e731802..0908388 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -1,27 +1,215 @@
 bin/gaim
-%%PANEL:%%bin/gaim_applet
-%%PANEL:%%etc/CORBA/servers/gaim_applet.gnorba
+bin/gaim-remote
 lib/gaim/autorecon.so
-lib/gaim/chatlist.so
+lib/gaim/docklet.so
+lib/gaim/gestures.so
+lib/gaim/history.so
 lib/gaim/iconaway.so
+lib/gaim/idle.so
 lib/gaim/libgg.so
 lib/gaim/libicq.so
 lib/gaim/libirc.so
 lib/gaim/libjabber.so
 lib/gaim/libmsn.so
 lib/gaim/libnapster.so
+lib/gaim/liboscar.so
+lib/gaim/libtoc.so
 lib/gaim/libyahoo.so
 lib/gaim/libzephyr.so
 lib/gaim/notify.so
 lib/gaim/spellchk.so
-%%PANEL:%%share/gnome/applets/Network/gaim_applet.desktop
-%%PANEL:%%share/gnome/apps/Internet/gaim.desktop
+lib/gaim/ticker.so
+lib/gaim/timestamp.so
+share/gnome/applications/gaim.desktop
 share/gnome/pixmaps/gaim.png
-%%PANEL:%%share/gnome/pixmaps/gaim/away.png
-%%PANEL:%%share/gnome/pixmaps/gaim/connect.png
-%%PANEL:%%share/gnome/pixmaps/gaim/msgpend.png
-%%PANEL:%%share/gnome/pixmaps/gaim/offline.png
-%%PANEL:%%share/gnome/pixmaps/gaim/online.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
+share/gnome/pixmaps/gaim/buttons/change-fgcolor-small.png
+share/gnome/pixmaps/gaim/buttons/edit.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
+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/logo.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.png
+share/gnome/pixmaps/gaim/smileys/default/msn_beer.png
+share/gnome/pixmaps/gaim/smileys/default/msn_boy.png
+share/gnome/pixmaps/gaim/smileys/default/msn_brheart.png
+share/gnome/pixmaps/gaim/smileys/default/msn_cake.png
+share/gnome/pixmaps/gaim/smileys/default/msn_cat.png
+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_cry.png
+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_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_film.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_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_kiss.png
+share/gnome/pixmaps/gaim/smileys/default/msn_laugh.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_phone.png
+share/gnome/pixmaps/gaim/smileys/default/msn_photo.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_sleep.png
+share/gnome/pixmaps/gaim/smileys/default/msn_smiley.png
+share/gnome/pixmaps/gaim/smileys/default/msn_star.png
+share/gnome/pixmaps/gaim/smileys/default/msn_sun.png
+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_weird.png
+share/gnome/pixmaps/gaim/smileys/default/msn_wink.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_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_confused.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_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_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_love.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_neutral.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_ooooh.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_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_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_sunglas.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_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/yell.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/dnd.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/icq.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/msn.png
+share/gnome/pixmaps/gaim/status/default/na.png
+share/gnome/pixmaps/gaim/status/default/napster.png
+share/gnome/pixmaps/gaim/status/default/occupied.png
+share/gnome/pixmaps/gaim/status/default/offline.png
+share/gnome/pixmaps/gaim/status/default/wireless.png
+share/gnome/pixmaps/gaim/status/default/yahoo.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/arrive.wav
+share/gnome/sounds/gaim/leave.wav
+share/gnome/sounds/gaim/receive.wav
+share/gnome/sounds/gaim/redalert.wav
+share/gnome/sounds/gaim/send.wav
 share/locale/bg/LC_MESSAGES/gaim.mo
 share/locale/cs/LC_MESSAGES/gaim.mo
 share/locale/da/LC_MESSAGES/gaim.mo
@@ -35,11 +223,20 @@ share/locale/ja/LC_MESSAGES/gaim.mo
 share/locale/ko/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/pl/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/sr/LC_MESSAGES/gaim.mo
 share/locale/sv/LC_MESSAGES/gaim.mo
 share/locale/zh_CN/LC_MESSAGES/gaim.mo
 share/locale/zh_TW/LC_MESSAGES/gaim.mo
-%%PANEL:%%@dirrm share/gnome/pixmaps/gaim
-%%NOPANEL:%%@dirrm share/gnome/pixmaps
+@dirrm share/gnome/sounds/gaim
+@dirrm share/gnome/pixmaps/gaim/status/default
+@dirrm share/gnome/pixmaps/gaim/status
+@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
 @dirrm lib/gaim