* Update to 0.59.1

* Don't build with GNOME support if installed under GNOME 2

Note, among other bug fixes, this is also a security update.  It is highly
recommended that all gaim users update to this version.

5 files changed, 108 insertions, 81 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index b7e70ce7aae1..1753e66aaffa 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.59
+PORTVERSION=	0.59.1
 CATEGORIES?=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -29,6 +29,8 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 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
@@ -36,7 +38,7 @@ USE_GNOME+=	gdkpixbuf
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mlibpanel}!= ""
+.if ${HAVE_GNOME:Mlibpanel}!= "" && !exists(${GNOME_PANEL2})
 USE_GNOME+=	libpanel
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 CONFIGURE_ARGS+=	--enable-panel
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index bcf0d7e62e41..21bcf5e4b55e 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.59.tar.bz2) = d32006df4d76095413b4bf0ab2d29351
+MD5 (gaim-0.59.1.tar.bz2) = 54b85690b75ee1b9f4801f01f1af4f82
diff --git a/net-im/gaim/files/patch-ab b/net-im/gaim/files/patch-ab
index 368e0642689e..f944f92ccbf6 100644
--- a/net-im/gaim/files/patch-ab
+++ b/net-im/gaim/files/patch-ab
@@ -1,32 +1,32 @@
---- pixmaps/Makefile.in.orig	Tue Mar  5 21:04:40 2002
-+++ pixmaps/Makefile.in	Tue Mar  5 21:06:51 2002
-@@ -260,22 +260,15 @@
+--- pixmaps/Makefile.in.orig	Wed Aug 28 00:18:58 2002
++++ pixmaps/Makefile.in	Wed Aug 28 00:20:28 2002
+@@ -276,22 +276,16 @@
  		yell.xpm			
  
  
--@DISTRIB_TRUE@gaimdistpixdir = @DISTRIB_TRUE@$(datadir)/pixmaps/gaim
--@DISTRIB_TRUE@gaimdistpix_DATA = @DISTRIB_TRUE@away.png connect.png msgpend.png offline.png online.png
+-@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.xpm
  
--@DISTRIB_TRUE@distpixmapdir = @DISTRIB_TRUE@$(datadir)/pixmaps
--@DISTRIB_TRUE@distpixmap_DATA = @DISTRIB_TRUE@gaim.xpm
+-@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
+-@DISTRIB_TRUE@distpixmap_DATA = gaim.png
 +pixmapdir = $(datadir)/pixmaps
 +pixmap_DATA = gaim.xpm
  
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@`@GNOME_CONFIG@ --datadir`
--
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps/gaim
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@away.png connect.png msgpend.png offline.png online.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 = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaim.xpm
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.png
 -
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@$(datadir)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@gaim.xpm
+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.png
+ subdir = pixmaps
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac
index 20c965d88db1..d337f2360e41 100644
--- a/net-im/gaim/files/patch-ac
+++ b/net-im/gaim/files/patch-ac
@@ -1,13 +1,13 @@
---- src/Makefile.in.orig	Tue Mar  5 21:07:43 2002
-+++ src/Makefile.in	Tue Mar  5 21:16:14 2002
-@@ -146,72 +146,75 @@
- sedpath = @sedpath@
+--- src/Makefile.in.orig	Wed Aug 28 00:51:08 2002
++++ src/Makefile.in	Wed Aug 28 01:10:39 2002
+@@ -156,74 +156,91 @@
  
  SUBDIRS = protocols
--@GNOMEAPPLET_TRUE@bin_PROGRAMS = @GNOMEAPPLET_TRUE@gaim_applet
+ 
+-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
 +@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
- @GNOMEAPPLET_FALSE@bin_PROGRAMS = @GNOMEAPPLET_FALSE@gaim
--@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = @GNOMEAPPLET_TRUE@about.c \
+ @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
+-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c \
 -@GNOMEAPPLET_TRUE@			aim.c \
 -@GNOMEAPPLET_TRUE@			applet.c \
 -@GNOMEAPPLET_TRUE@			away.c \
@@ -36,10 +36,11 @@
 -@GNOMEAPPLET_TRUE@			sound.c \
 -@GNOMEAPPLET_TRUE@			ticker.c \
 -@GNOMEAPPLET_TRUE@			util.c
--@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @GNOMEAPPLET_TRUE@@LIBOBJS@ $(STATIC_LINK_LIBS)
--@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = @GNOMEAPPLET_TRUE@-export-dynamic
--@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @GNOMEAPPLET_TRUE@@LDADD@ @LIBOBJS@
--@GNOMEAPPLET_FALSE@gaim_SOURCES = @GNOMEAPPLET_FALSE@about.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 \
 -@GNOMEAPPLET_FALSE@		aim.c \
 -@GNOMEAPPLET_FALSE@		applet.c \
 -@GNOMEAPPLET_FALSE@		away.c \
@@ -68,9 +69,11 @@
 -@GNOMEAPPLET_FALSE@		sound.c \
 -@GNOMEAPPLET_FALSE@		ticker.c \
 -@GNOMEAPPLET_FALSE@		util.c
--@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @GNOMEAPPLET_FALSE@@LIBOBJS@ $(STATIC_LINK_LIBS)
--@GNOMEAPPLET_FALSE@gaim_LDFLAGS = @GNOMEAPPLET_FALSE@-export-dynamic
--@GNOMEAPPLET_FALSE@gaim_LDADD = @GNOMEAPPLET_FALSE@@LDADD@ @LIBOBJS@
+-
+-@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 \
@@ -132,52 +135,71 @@
 +       server.c \
 +       sound.c \
 +       ticker.c \
++       util.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)
-@@ -235,6 +238,7 @@
+ EXTRA_DIST = applet.h \
+ 		convo.h \
+@@ -245,44 +262,40 @@
  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)
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT)
+ @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
  
-@@ -242,30 +246,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) \
+-@GNOMEAPPLET_TRUE@am_gaim_OBJECTS =
+-@GNOMEAPPLET_FALSE@am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	applet.$(OBJEXT) away.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	browser.$(OBJEXT) buddy.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	core.$(OBJEXT) dialogs.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	md5.$(OBJEXT) module.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	multi.$(OBJEXT) perl.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	plugins.$(OBJEXT) prefs.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	proxy.$(OBJEXT) prpl.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	server.$(OBJEXT) sound.$(OBJEXT) \
+-@GNOMEAPPLET_FALSE@	ticker.$(OBJEXT) util.$(OBJEXT)
+ gaim_OBJECTS = $(am_gaim_OBJECTS)
+-@GNOMEAPPLET_TRUE@gaim_DEPENDENCIES =
+-@GNOMEAPPLET_TRUE@am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	applet.$(OBJEXT) away.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	browser.$(OBJEXT) buddy.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	core.$(OBJEXT) dialogs.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	md5.$(OBJEXT) module.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	multi.$(OBJEXT) perl.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	plugins.$(OBJEXT) prefs.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	proxy.$(OBJEXT) prpl.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	server.$(OBJEXT) sound.$(OBJEXT) \
+-@GNOMEAPPLET_TRUE@	ticker.$(OBJEXT) util.$(OBJEXT)
+-@GNOMEAPPLET_FALSE@am_gaim_applet_OBJECTS =
++am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
 +   applet.$(OBJEXT) away.$(OBJEXT) \
 +   browser.$(OBJEXT) buddy.$(OBJEXT) \
 +   buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
@@ -191,7 +213,7 @@
 +   proxy.$(OBJEXT) prpl.$(OBJEXT) \
 +   server.$(OBJEXT) sound.$(OBJEXT) \
 +   ticker.$(OBJEXT) util.$(OBJEXT)
-+gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
++am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
 +   applet.$(OBJEXT) away.$(OBJEXT) \
 +   browser.$(OBJEXT) buddy.$(OBJEXT) \
 +   buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
@@ -205,6 +227,9 @@
 +   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)
++
+ gaim_applet_OBJECTS = $(am_gaim_applet_OBJECTS)
+-@GNOMEAPPLET_FALSE@gaim_applet_DEPENDENCIES =
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 8ea6900683ec..d512097c6d10 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -16,7 +16,7 @@ lib/gaim/notify.so
 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
+share/gnome/pixmaps/gaim.xpm
 %%GNOME:%%share/gnome/pixmaps/gaim/away.png
 %%GNOME:%%share/gnome/pixmaps/gaim/connect.png
 %%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png