4 files changed, 25 insertions, 24 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 3dc69e774714..ed23ced3af06 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		gaim
-PORTVERSION=		0.11.0pre4
+PORTVERSION=		0.11.0pre6
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.marko.net/pub/gaim/ \
 			${MASTER_SITE_SOURCEFORGE}
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 86f36a021d3f..605f09bd49fd 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.11.0pre4.tar.bz2) = 5a1194b356caedbf0a664f3d63231211
+MD5 (gaim-0.11.0pre6.tar.bz2) = 4a5df1435d1e0cbcb7f0b137b0915b76
diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac
index 47d3f8fd7dcb..24b0b34f2557 100644
--- a/net-im/gaim/files/patch-ac
+++ b/net-im/gaim/files/patch-ac
@@ -1,55 +1,55 @@
---- src/Makefile.in.orig	Fri Dec 15 19:19:17 2000
-+++ src/Makefile.in	Fri Dec 15 19:28:25 2000
-@@ -122,14 +122,14 @@
+--- src/Makefile.in.orig	Wed Mar  7 08:54:56 2001
++++ src/Makefile.in	Wed Mar  7 08:56:37 2001
+@@ -125,14 +125,14 @@
  l = @l@
  perlpath = @perlpath@
  sedpath = @sedpath@
 -@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 			dialogs.c 			gaimrc.c 			gtkhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			multi.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
+-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			applet.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gtkimhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			multi.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
 -@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 -@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 		dialogs.c 		gaimrc.c 		gtkhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		multi.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
+-@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gtkimhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		multi.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
 -@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 -@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 			dialogs.c 			gaimrc.c 			gtkhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			multi.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
++gaim_applet_SOURCES = about.c 			aim.c 			applet.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gtkimhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			multi.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
 +gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 +gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-+gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gtkhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		multi.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
++gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gtkimhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		multi.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
 +gaim_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 +gaim_LDADD = @LDADD@ @LIBOBJS@
  
- CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
- LIBS = @LIBS@ $(DEBUG_LIBS)
-@@ -145,19 +145,19 @@
+ # any other stuff
+ CFLAGS = @CFLAGS@ -I$(top_srcdir)/libfaim $(PERL_CFLAGS) -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
+@@ -149,19 +149,19 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS =  about.o aim.o applet.o away.o \
 -@GNOMEAPPLET_TRUE@browser.o buddy.o buddy_chat.o conversation.o \
--@GNOMEAPPLET_TRUE@dialogs.o gaimrc.o gtkhtml.o gtkspell.o gtkticker.o \
+-@GNOMEAPPLET_TRUE@dialogs.o gaimrc.o gtkimhtml.o gtkspell.o gtkticker.o \
 -@GNOMEAPPLET_TRUE@html.o idle.o multi.o oscar.o perl.o plugins.o \
--@GNOMEAPPLET_TRUE@prefs.o proxy.o prpl.o rvous.o server.o sound.o \
--@GNOMEAPPLET_TRUE@ticker.o toc.o util.o
+-@GNOMEAPPLET_TRUE@prefs.o proxy.o prpl.o server.o sound.o ticker.o \
+-@GNOMEAPPLET_TRUE@toc.o util.o
 +gaim_applet_OBJECTS =  about.o aim.o applet.o away.o \
 +browser.o buddy.o buddy_chat.o conversation.o \
-+dialogs.o gaimrc.o gtkhtml.o gtkspell.o gtkticker.o \
++dialogs.o gaimrc.o gtkimhtml.o gtkspell.o gtkticker.o \
 +html.o idle.o multi.o oscar.o perl.o plugins.o \
-+prefs.o proxy.o prpl.o rvous.o server.o sound.o \
-+ticker.o toc.o util.o
++prefs.o proxy.o prpl.o server.o sound.o ticker.o \
++toc.o util.o
  gaim_applet_LDFLAGS = 
 -@GNOMEAPPLET_FALSE@gaim_OBJECTS =  about.o aim.o applet.o away.o \
 -@GNOMEAPPLET_FALSE@browser.o buddy.o buddy_chat.o conversation.o \
--@GNOMEAPPLET_FALSE@dialogs.o gaimrc.o gtkhtml.o gtkspell.o gtkticker.o \
--@GNOMEAPPLET_FALSE@html.o idle.o multi.o oscar.o perl.o plugins.o \
--@GNOMEAPPLET_FALSE@prefs.o proxy.o prpl.o rvous.o server.o sound.o \
+-@GNOMEAPPLET_FALSE@dialogs.o gaimrc.o gtkimhtml.o gtkspell.o \
+-@GNOMEAPPLET_FALSE@gtkticker.o html.o idle.o multi.o oscar.o perl.o \
+-@GNOMEAPPLET_FALSE@plugins.o prefs.o proxy.o prpl.o server.o sound.o \
 -@GNOMEAPPLET_FALSE@ticker.o toc.o util.o
 +gaim_OBJECTS =  about.o aim.o applet.o away.o \
 +browser.o buddy.o buddy_chat.o conversation.o \
-+dialogs.o gaimrc.o gtkhtml.o gtkspell.o gtkticker.o \
-+html.o idle.o multi.o oscar.o perl.o plugins.o \
-+prefs.o proxy.o prpl.o rvous.o server.o sound.o \
++dialogs.o gaimrc.o gtkimhtml.o gtkspell.o \
++gtkticker.o html.o idle.o multi.o oscar.o perl.o \
++plugins.o prefs.o proxy.o prpl.o server.o sound.o \
 +ticker.o toc.o util.o
  gaim_LDFLAGS = 
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 2996cb1e11e2..a3b1ba40da74 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -120,6 +120,7 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/register.xpm
 %%DATADIR%%/pixmaps/gaim/sad.xpm
 %%DATADIR%%/pixmaps/gaim/save.xpm
+%%DATADIR%%/pixmaps/gaim/save_small.xpm
 %%DATADIR%%/pixmaps/gaim/scream.xpm
 %%DATADIR%%/pixmaps/gaim/search_small.xpm
 %%DATADIR%%/pixmaps/gaim/send_small.xpm