4 files changed, 46 insertions, 38 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index f329ac02d0a3..055a37cc27fe 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		gaim
-PORTVERSION=		0.11.0pre2
+PORTVERSION=		0.11.0pre3
 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 6bb1c495091e..f01235a8a237 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.11.0pre2.tar.bz2) = 3c65804f4731c9cd7b99031b90f2f28d
+MD5 (gaim-0.11.0pre3.tar.bz2) = 27b8a3b719d528decb6d83ff246cc39a
diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac
index 5d7e5aa51d36..47d3f8fd7dcb 100644
--- a/net-im/gaim/files/patch-ac
+++ b/net-im/gaim/files/patch-ac
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	Mon Dec  4 18:02:33 2000
-+++ src/Makefile.in	Mon Dec  4 18:08:39 2000
+--- 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 @@
  l = @l@
  perlpath = @perlpath@
@@ -7,16 +7,16 @@
 -@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 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.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 			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_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 -@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
--@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.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 		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_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 -@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@
-+gaim_applet_SOURCES = about.c 			aim.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.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 			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_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 +gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-+gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.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 		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_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
 +gaim_LDADD = @LDADD@ @LIBOBJS@
  
@@ -26,31 +26,31 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
--@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
--@GNOMEAPPLET_TRUE@buddy.o buddy_chat.o conversation.o dialogs.o \
--@GNOMEAPPLET_TRUE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkspell.o \
--@GNOMEAPPLET_TRUE@gtkticker.o html.o idle.o multi.o oscar.o perl.o \
--@GNOMEAPPLET_TRUE@plugins.o prefs.o proxy.o prpl.o rvous.o server.o \
--@GNOMEAPPLET_TRUE@sound.o ticker.o toc.o util.o
-+gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
-+buddy.o buddy_chat.o conversation.o dialogs.o \
-+gaimrc.o gnome_applet_mgr.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 ticker.o toc.o util.o
+-@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@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
++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 \
++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
  gaim_applet_LDFLAGS = 
--@GNOMEAPPLET_FALSE@gaim_OBJECTS =  about.o aim.o away.o browser.o \
--@GNOMEAPPLET_FALSE@buddy.o buddy_chat.o conversation.o dialogs.o \
--@GNOMEAPPLET_FALSE@gaimrc.o gnome_applet_mgr.o gtkhtml.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 rvous.o server.o \
--@GNOMEAPPLET_FALSE@sound.o ticker.o toc.o util.o
-+gaim_OBJECTS =  about.o aim.o away.o browser.o \
-+buddy.o buddy_chat.o conversation.o dialogs.o \
-+gaimrc.o gnome_applet_mgr.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 ticker.o toc.o util.o
+-@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@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 \
++ticker.o toc.o util.o
  gaim_LDFLAGS = 
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=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 583cf730179d..e73a38e38635 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -1,7 +1,6 @@
 bin/gaim
 %%GNOME:%%bin/gaim_applet
 %%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
-%%GNOME:%%etc/sound/events/gaim.soundlist
 lib/gaim/autorecon.so
 lib/gaim/iconaway.so
 lib/gaim/irc.so
@@ -12,6 +11,9 @@ lib/gaim/libgaimicq.so.0
 lib/gaim/libyahoo.a
 lib/gaim/libyahoo.so
 lib/gaim/libyahoo.so.0
+lib/gaim/libmsn.a
+lib/gaim/libmsn.so
+lib/gaim/libmsn.so.0
 lib/gaim/notify.so
 lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/about_small.xpm
@@ -63,6 +65,12 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/gnome/penguin-connect.png
 %%DATADIR%%/pixmaps/gaim/gnome/penguin-offline.png
 %%DATADIR%%/pixmaps/gaim/gnome/penguin-online.png
+%%DATADIR%%/pixmaps/gaim/gnomeicu-away.xpm
+%%DATADIR%%/pixmaps/gaim/gnomeicu-dnd.xpm
+%%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm
+%%DATADIR%%/pixmaps/gaim/gnomeicu-na.xpm
+%%DATADIR%%/pixmaps/gaim/gnomeicu-occ.xpm
+%%DATADIR%%/pixmaps/gaim/gnomeicu-online.xpm
 %%DATADIR%%/pixmaps/gaim/gnome_add.xpm
 %%DATADIR%%/pixmaps/gaim/gnome_close.xpm
 %%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm
@@ -81,6 +89,8 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/luke03.xpm
 %%DATADIR%%/pixmaps/gaim/moneymouth.xpm
 %%DATADIR%%/pixmaps/gaim/msg_pending.xpm
+%%DATADIR%%/pixmaps/gaim/msn_away.xpm
+%%DATADIR%%/pixmaps/gaim/msn_online.xpm
 %%DATADIR%%/pixmaps/gaim/no_icon.xpm
 %%DATADIR%%/pixmaps/gaim/normal.xpm
 %%DATADIR%%/pixmaps/gaim/offline.xpm
@@ -111,6 +121,9 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/smile_sad.xpm
 %%DATADIR%%/pixmaps/gaim/smile_wink.xpm
 %%DATADIR%%/pixmaps/gaim/speaker.xpm
+%%DATADIR%%/pixmaps/gaim/status-away.xpm
+%%DATADIR%%/pixmaps/gaim/status-here.xpm
+%%DATADIR%%/pixmaps/gaim/status-idle.xpm
 %%DATADIR%%/pixmaps/gaim/strike.xpm
 %%DATADIR%%/pixmaps/gaim/tb_forward.xpm
 %%DATADIR%%/pixmaps/gaim/tb_search.xpm
@@ -125,16 +138,11 @@ lib/gaim/spellchk.so
 %%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop
 %%GNOME:%%share/gnome/apps/Internet/gaim.desktop
 %%GNOME:%%share/gnome/pixmaps/gaim.xpm
-%%GNOME:%%share/gnome/sounds/gaim/BuddyArrive.au
-%%GNOME:%%share/gnome/sounds/gaim/BuddyLeave.au
-%%GNOME:%%share/gnome/sounds/gaim/Receive.au
-%%GNOME:%%share/gnome/sounds/gaim/Send.au
 share/locale/de/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
 share/locale/ko/LC_MESSAGES/gaim.mo
 share/locale/zh_CN/LC_MESSAGES/gaim.mo
-%%GNOME:%%@dirrm share/gnome/sounds/gaim
 @dirrm %%DATADIR%%/pixmaps/gaim/gnome
 @dirrm %%DATADIR%%/pixmaps/gaim
 %%NOGNOME:%%@dirrm %%DATADIR%%/pixmaps