4 files changed, 19 insertions, 14 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 388a200f577d..ba13474f6ca3 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		gaim
-PORTVERSION=		0.11.0pre8
+PORTVERSION=		0.11.0pre10
 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 413a4eb1e726..e098002ee1bf 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.11.0pre8.tar.bz2) = 01bbd5fb83b904b4fe94333c31f7fcea
+MD5 (gaim-0.11.0pre10.tar.bz2) = 204572dced98a7947eb74f705b5ea00f
diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac
index 24b0b34f2557..df429ced3857 100644
--- a/net-im/gaim/files/patch-ac
+++ b/net-im/gaim/files/patch-ac
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/Makefile.in.orig	Mon Apr 16 12:38:54 2001
++++ src/Makefile.in	Mon Apr 16 12:40:38 2001
+@@ -125,16 +125,16 @@
  l = @l@
  perlpath = @perlpath@
  sedpath = @sedpath@
@@ -9,20 +9,24 @@
  @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 			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_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 		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_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 			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_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 		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_LDFLAGS = -export-dynamic
 +gaim_LDADD = @LDADD@ @LIBOBJS@
  
  # any other stuff
  CFLAGS = @CFLAGS@ -I$(top_srcdir)/libfaim $(PERL_CFLAGS) -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
-@@ -149,19 +149,19 @@
+@@ -151,18 +151,18 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
@@ -32,25 +36,24 @@
 -@GNOMEAPPLET_TRUE@html.o idle.o multi.o oscar.o perl.o plugins.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 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_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 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_applet_OBJECTS =  about.o aim.o applet.o away.o \
++browser.o buddy.o buddy_chat.o conversation.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_OBJECTS =  about.o aim.o applet.o away.o \
 +browser.o buddy.o buddy_chat.o conversation.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)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index e1665cf5adf1..87799a034cd8 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -13,6 +13,8 @@ lib/gaim/libyahoo.so
 lib/gaim/libyahoo.so.0
 lib/gaim/libmsn.so
 lib/gaim/libmsn.so.0
+lib/gaim/libzephyr.so
+lib/gaim/libzephyr.so.0
 lib/gaim/napster.so
 lib/gaim/notify.so
 lib/gaim/spellchk.so