diff options
author | jlam <jlam> | 2002-08-28 07:43:52 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-08-28 07:43:52 +0000 |
commit | 74b9282e9d57f97f7bbf6ee0eec387edd2218ddc (patch) | |
tree | 4a98a2827e7e45d9ca817a6a0c7092f5d790e411 /chat | |
parent | e65aa8d89c5697d88922533a1820ada2f7e26485 (diff) | |
download | pkgsrc-74b9282e9d57f97f7bbf6ee0eec387edd2218ddc.tar.gz |
Update gaim and gaim-gnome to 0.59.1. This update is based on work by
Curt Sampson. Relevant changes from version 0.59 include:
* Fixed a security bug in the manual browser setting (Thanks Robert McQueen)
* Will work with Perl 5.8 (thanks, Timothy Lee and Dan Colascione)
* Fix for HTTP proxies (thanks, Ethan Blanton)
* Read proxy environment variables. (thanks, Christian Hammond)
* Use the pretty gaim.png for our menu entry.
The new iconv() support has been explicitly disabled for now until I can
get it right across both packages.
Diffstat (limited to 'chat')
-rw-r--r-- | chat/gaim/Makefile | 3 | ||||
-rw-r--r-- | chat/gaim/Makefile.common | 10 | ||||
-rw-r--r-- | chat/gaim/PLIST.common | 4 | ||||
-rw-r--r-- | chat/gaim/distinfo | 11 | ||||
-rw-r--r-- | chat/gaim/patches/patch-aa | 10 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ab | 35 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ac | 12 |
7 files changed, 57 insertions, 28 deletions
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index a1088dd5d3a..a9b617d2a64 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/08/25 21:49:30 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/28 07:43:52 jlam Exp $ # .include "Makefile.common" @@ -15,4 +15,5 @@ PLIST_SRC+= ${.CURDIR}/../gaim/PLIST .include "../../audio/esound/buildlink2.mk" .include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common index 9140887bbd8..2eb3f3d0908 100644 --- a/chat/gaim/Makefile.common +++ b/chat/gaim/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.2 2002/08/25 21:49:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/08/28 07:43:54 jlam Exp $ # -DISTNAME= gaim-0.59 +DISTNAME= gaim-0.59.1 CATEGORIES= chat x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} \ ftp://ftp.marko.net/pub/gaim/ @@ -31,3 +31,9 @@ CONFIGURE_ARGS+= --disable-screensaver CONFIGURE_ARGS+= --enable-esd CONFIGURE_ARGS+= --enable-perl CONFIGURE_ARGS+= --enable-pixbuf + +# Newer versions of gaim use gettext checks that gettext-lib/buildlink2.mk +# can't currently handle. +# +CONFIGURE_ARGS+= --without-included-gettext +CONFIGURE_ENV+= gt_cv_func_gnugettext1_libc=yes diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common index 586440be0bf..eda395a8ff6 100644 --- a/chat/gaim/PLIST.common +++ b/chat/gaim/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.2 2002/08/25 21:49:31 jlam Exp $ +@comment $NetBSD: PLIST.common,v 1.3 2002/08/28 07:43:54 jlam Exp $ lib/gaim/autorecon.so lib/gaim/chatlist.so lib/gaim/iconaway.so @@ -48,5 +48,5 @@ ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo -share/pixmaps/gaim.xpm +share/pixmaps/gaim.png @dirrm lib/gaim diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo index 4c187b65895..ff2b3870ece 100644 --- a/chat/gaim/distinfo +++ b/chat/gaim/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2002/08/25 21:49:32 jlam Exp $ +$NetBSD: distinfo,v 1.14 2002/08/28 07:43:55 jlam Exp $ -SHA1 (gaim-0.59.tar.gz) = 0a74bc3b48810291adf9725966efc4a6de28fa3f -Size (gaim-0.59.tar.gz) = 2047105 bytes -SHA1 (patch-aa) = f56e9e5ee36db05adc1ba34294cf088a335117fe -SHA1 (patch-ab) = c15b6d79f8129eee9298f0aae6d0ca4e39983655 +SHA1 (gaim-0.59.1.tar.gz) = 1fc89e3c0252beca6bbcdc36f0abd709796ec4dc +Size (gaim-0.59.1.tar.gz) = 2117978 bytes +SHA1 (patch-aa) = e4fe5ef9db63507e7a350afa82b4f46a95489bb6 +SHA1 (patch-ab) = b085e043c5cb5b66e0540fd21ea86908d777d37c +SHA1 (patch-ac) = 5a86eb569c058136b4d7e361672f381b84dad30d diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa index 9ad60381cc8..ce176f17e56 100644 --- a/chat/gaim/patches/patch-aa +++ b/chat/gaim/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.7 2002/08/25 21:49:32 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2002/08/28 07:43:56 jlam Exp $ ---- configure.orig Tue Jun 25 06:23:07 2002 -+++ configure -@@ -7762,8 +7762,6 @@ +--- configure.orig Mon Aug 26 10:41:07 2002 ++++ configure Wed Aug 28 13:39:51 2002 +@@ -12254,8 +12254,6 @@ fi - rm -f conftest* + rm -f conftest.$ac_objext conftest.$ac_ext -CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)" - diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab index 03817b3a04f..2a5f705c4ce 100644 --- a/chat/gaim/patches/patch-ab +++ b/chat/gaim/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ ---- src/perl.c.orig Fri May 31 05:13:02 2002 -+++ src/perl.c Fri Jul 19 05:07:30 2002 -@@ -289,7 +289,7 @@ +--- src/perl.c.orig Mon Aug 26 11:00:58 2002 ++++ src/perl.c Wed Aug 28 13:37:46 2002 +@@ -185,7 +185,7 @@ + path = gaim_user_dir(); + dir = opendir(path); + if (dir) { +- while ((readdir_r(dir,&dirent_buf,&ent),ent)) { ++ while ((ent = readdir(dir))) { + if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) { + if (is_pl_file(ent->d_name)) { + buf = g_malloc(strlen(path) + strlen(ent->d_name) + 2); +@@ -293,7 +293,7 @@ XS (XS_GAIM_register) { char *name, *ver, *callback, *unused; /* exactly like X-Chat, eh? :) */ @@ -11,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ struct perlscript *scp; dXSARGS; items = 0; -@@ -400,7 +400,7 @@ +@@ -404,7 +404,7 @@ { char *title; char *message; @@ -20,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ dXSARGS; items = 0; -@@ -468,7 +468,7 @@ +@@ -472,7 +472,7 @@ XS (XS_GAIM_command) { @@ -29,7 +38,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ char *command = NULL; dXSARGS; items = 0; -@@ -520,7 +520,7 @@ +@@ -524,7 +524,7 @@ XS (XS_GAIM_user_info) { struct gaim_connection *gc; @@ -38,7 +47,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ struct buddy *buddy = NULL; dXSARGS; items = 0; -@@ -546,7 +546,7 @@ +@@ -550,7 +550,7 @@ { char *nick, *who, *what; struct conversation *c; @@ -47,7 +56,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ int send, wflags; dXSARGS; items = 0; -@@ -578,7 +578,7 @@ +@@ -582,7 +582,7 @@ struct gaim_connection *gc; char *nick, *what; int isauto; @@ -56,7 +65,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ dXSARGS; items = 0; -@@ -601,7 +601,7 @@ +@@ -605,7 +605,7 @@ char *nick, *what; int isauto; struct conversation *c; @@ -65,7 +74,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ dXSARGS; items = 0; -@@ -631,7 +631,7 @@ +@@ -635,7 +635,7 @@ char *what; struct conversation *b = NULL; GSList *bcs; @@ -74,7 +83,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ dXSARGS; items = 0; -@@ -797,7 +797,7 @@ +@@ -801,7 +801,7 @@ XS (XS_GAIM_add_event_handler) { @@ -83,7 +92,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $ struct _perl_event_handlers *handler; dXSARGS; items = 0; -@@ -824,7 +824,7 @@ +@@ -828,7 +828,7 @@ XS (XS_GAIM_add_timeout_handler) { diff --git a/chat/gaim/patches/patch-ac b/chat/gaim/patches/patch-ac new file mode 100644 index 00000000000..8e2e6059860 --- /dev/null +++ b/chat/gaim/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2002/08/28 07:43:58 jlam Exp $ + +--- src/util.c.orig Thu Aug 22 12:23:03 2002 ++++ src/util.c Wed Aug 28 13:46:53 2002 +@@ -32,7 +32,6 @@ + #include <string.h> + #include <sys/wait.h> + #include <ctype.h> +-#include <iconv.h> + #include <math.h> + #include "gaim.h" + #include "prpl.h" |