4 files changed, 45 insertions, 36 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 2cde1d730780..f329ac02d0a3 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		gaim
-PORTVERSION=		0.10.3
-PORTREVISION=		1
+PORTVERSION=		0.11.0pre2
 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 9213fb1faa83..6bb1c495091e 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.10.3.tar.bz2) = 5e7aaf3b3e7f621eb442a18b85ae0cde
+MD5 (gaim-0.11.0pre2.tar.bz2) = 3c65804f4731c9cd7b99031b90f2f28d
diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac
index 6c5b292aa4ad..5d7e5aa51d36 100644
--- a/net-im/gaim/files/patch-ac
+++ b/net-im/gaim/files/patch-ac
@@ -1,53 +1,56 @@
---- src/Makefile.in.orig	Tue Oct  3 16:00:11 2000
-+++ src/Makefile.in	Tue Oct  3 16:05:56 2000
-@@ -123,12 +123,12 @@
+--- src/Makefile.in.orig	Mon Dec  4 18:02:33 2000
++++ src/Makefile.in	Mon Dec  4 18:08:39 2000
+@@ -122,14 +122,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 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.c 			gtkhtml.c 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
--@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
--@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 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
--@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a
-+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 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
-+gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
-+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 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
-+gaim_DEPENDENCIES = ../libfaim/libfaim.a
+-@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_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_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_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_DEPENDENCIES = ../libfaim/libfaim.a @LIBOBJS@
++gaim_LDADD = @LDADD@ @LIBOBJS@
  
- CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(prefix)/share/locale\"
- 
-@@ -142,20 +142,20 @@
+ CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
+ LIBS = @LIBS@ $(DEBUG_LIBS)
+@@ -145,19 +145,19 @@
  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 gtkticker.o \
--@GNOMEAPPLET_TRUE@html.o idle.o network.o oscar.o perl.o plugins.o \
--@GNOMEAPPLET_TRUE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
--@GNOMEAPPLET_TRUE@toc.o util.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 gtkticker.o \
-+html.o idle.o network.o oscar.o perl.o plugins.o \
-+prefs.o proxy.o rvous.o server.o sound.o ticker.o \
-+toc.o util.o
- gaim_applet_LDADD = $(LDADD)
++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
  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 gtkticker.o \
--@GNOMEAPPLET_FALSE@html.o idle.o network.o oscar.o perl.o plugins.o \
--@GNOMEAPPLET_FALSE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
--@GNOMEAPPLET_FALSE@toc.o util.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 gtkticker.o \
-+html.o idle.o network.o oscar.o perl.o plugins.o \
-+prefs.o proxy.o rvous.o server.o sound.o ticker.o \
-+toc.o util.o
- gaim_LDADD = $(LDADD)
++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
  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 55c391f66c08..583cf730179d 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -1,11 +1,17 @@
-bin/au2h
 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
 lib/gaim/lagmeter.so
+lib/gaim/libgaimicq.a
+lib/gaim/libgaimicq.so
+lib/gaim/libgaimicq.so.0
+lib/gaim/libyahoo.a
+lib/gaim/libyahoo.so
+lib/gaim/libyahoo.so.0
 lib/gaim/notify.so
 lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/about_small.xpm
@@ -95,6 +101,7 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/save.xpm
 %%DATADIR%%/pixmaps/gaim/scream.xpm
 %%DATADIR%%/pixmaps/gaim/search_small.xpm
+%%DATADIR%%/pixmaps/gaim/send_small.xpm
 %%DATADIR%%/pixmaps/gaim/signing_on.xpm
 %%DATADIR%%/pixmaps/gaim/small.xpm
 %%DATADIR%%/pixmaps/gaim/smile.xpm