>Number:         10298
>Category:       pkg
>Synopsis:       Update of net/gaim to 0.9.18
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jun 06 11:46:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     John Darrow
>Release:        pkgsrc 2000-06-06
>Organization:
Computing Services, Wheaton College, Wheaton, IL
>Environment:
System: NetBSD jdarrowpiii.wheaton.edu 1.4V NetBSD 1.4V (JDARROW) #0: Tue Mar 21 15:04:28 CST 2000 jdarrow@jdarrowpiii.wheaton.edu:/var/src/sys/arch/i386/compile/JDARROW i386


>Description:

The version of gaim currently in pkgsrc (0.9.10) stopped working due to a
change at AOL on 2000-05-31, instead returning a "No Configuration" error.
This newer version fixes said problem.

In addition, this version also adds some file transfer support, bugfixes,
and a new preference item for choosing daemon pixmaps, so you don't have
to spend all day staring at penguins :)

>How-To-Repeat:

Log out, be unable to log back in.  Try some things.  Go to web site.  See
news item on AOL change, and fact that it is fixed in newer version.

>Fix:

cd to pkgsrc/net/gaim and apply the following patch.  (Note that you might
have to `mkdir patches' first, as I don't know if patch will handle the
new directory...

(Note that the default gaim install creates a gaim desktop icon in
${PREFIX}/share/gnome/apps/Internet .  I don't know if this is the right
location for such a thing or not, because I don't use gnome.)


diff -urN /source/sup/current/pkgsrc/net/gaim/Makefile ./Makefile
--- /source/sup/current/pkgsrc/net/gaim/Makefile	Fri Jan  7 07:24:26 2000
+++ ./Makefile	Mon Jun  5 19:30:00 2000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.10 2000/01/07 01:30:45 garbled Exp $
 #
 
-DISTNAME=	gaim-0.9.10
+DISTNAME=	gaim-0.9.18
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/
 
@@ -14,5 +14,8 @@
 USE_X11BASE=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=  yes
+
+# for pthread.h
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"

diff -urN /source/sup/current/pkgsrc/net/gaim/files/md5 ./files/md5
--- /source/sup/current/pkgsrc/net/gaim/files/md5	Wed Jan  5 06:22:19 2000
+++ ./files/md5	Mon Jun  5 18:26:51 2000
@@ -1,3 +1,3 @@
 $NetBSD: md5,v 1.2 2000/01/05 02:00:32 garbled Exp $
 
-MD5 (gaim-0.9.10.tar.gz) = 793d21402cc778defa6d32b224a7c75f
+MD5 (gaim-0.9.18.tar.gz) = 0645359f18d20c06aadabdf9254242a2

diff -urN /source/sup/current/pkgsrc/net/gaim/files/patch-sum ./files/patch-sum
--- /source/sup/current/pkgsrc/net/gaim/files/patch-sum	Wed Dec 31 18:00:00 1969
+++ ./files/patch-sum	Tue Jun  6 11:22:23 2000
@@ -0,0 +1,3 @@
+$NetBSD$
+
+MD5 (patch-aa) = d03692b436ab8fabc88db64336c069db

diff -urN /source/sup/current/pkgsrc/net/gaim/patches/patch-aa ./patches/patch-aa
--- /source/sup/current/pkgsrc/net/gaim/patches/patch-aa	Wed Dec 31 18:00:00 1969
+++ ./patches/patch-aa	Tue Jun  6 11:22:16 2000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/prefs.c.orig	Wed May 31 19:24:34 2000
++++ src/prefs.c	Tue Jun  6 11:20:16 2000
+@@ -788,7 +788,7 @@
+ 	gaim_button("Transparent text window (experimental)", &transparent, appbox );
+ #endif
+ 	gaim_button("Show logon/logoffs in conversation windows", &display_options, OPT_DISP_SHOW_LOGON, appbox );
+-	gaim_button("Use devil icons", &display_options, OPT_DISP_DEVIL_PIXMAPS, appbox );
++	gaim_button("Use daemon icons", &display_options, OPT_DISP_DEVIL_PIXMAPS, appbox );
+ 	
+ 	
+ 	

diff -urN /source/sup/current/pkgsrc/net/gaim/pkg/PLIST ./pkg/PLIST
--- /source/sup/current/pkgsrc/net/gaim/pkg/PLIST	Wed Jan  5 06:22:20 2000
+++ ./pkg/PLIST	Mon Jun  5 19:47:52 2000
@@ -1,5 +1,15 @@
 @comment $NetBSD: PLIST,v 1.2 2000/01/05 02:00:32 garbled Exp $
-share/applets/Amusements/gaim_applet.desktop
-etc/CORBA/servers/gaim_applet.gnorba
+lib/gaim/autorecon.so
+lib/gaim/iconaway.so
+lib/gaim/notify.so
+lib/gaim/spellchk.so
 bin/au2h
 bin/gaim
+man/man1/gaim.1
+share/pixmaps/gaim.xpm
+share/gnome/apps/Internet/gaim.desktop
+@unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true
+@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@unexec rmdir %D/lib/gaim 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: