Update to 0.62:

* Keyboard shortcuts in the buddy list work again (Thanks Joe Clarke).
* Support for Jabber XHTML messages
* Updated a number of translations. Thanks to everyone who submitted
  a translation update.
* Ability to re-request authorization from ICQ and Jabber users by right
  clicking on them in your buddy list.
* Improved Zephyr internationalization.
* Bug causing 'Hide on Send' windows to be lost forever fixed.
* Iconified windows are now raised properly.
* Dates printed for old/offline messages.
* Some assorted crash bugs fixed.

Patch provided by Matthew Luckie in private mail; also closes PR pkg/21318
by Juan RP.

4 files changed, 11 insertions, 34 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index b0f41bde21d..197f7931be1 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2003/04/24 21:18:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2003/04/25 17:16:52 jmmv Exp $
 #
 
-DISTNAME=	gaim-0.61
+DISTNAME=	gaim-0.62
 CATEGORIES=	chat x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
-		ftp://ftp.marko.net/pub/gaim/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 
 MAINTAINER=	mjl@luckie.org.nz
 HOMEPAGE=	http://gaim.sourceforge.net/
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 9bdbd398ab9..c494b27f6ea 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/04/11 15:41:38 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/04/25 17:16:52 jmmv Exp $
 bin/gaim
 bin/gaim-remote
 lib/gaim/autorecon.a
@@ -63,7 +63,9 @@ lib/gaim/timestamp.la
 lib/gaim/timestamp.so
 man/man1/gaim.1
 share/applications/gaim.desktop
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
@@ -193,7 +195,6 @@ share/pixmaps/gaim/smileys/default/yahoo_chicken.gif
 share/pixmaps/gaim/smileys/default/yahoo_clap.gif
 share/pixmaps/gaim/smileys/default/yahoo_clown.gif
 share/pixmaps/gaim/smileys/default/yahoo_coffee.gif
-share/pixmaps/gaim/smileys/default/yahoo_confused.gif
 share/pixmaps/gaim/smileys/default/yahoo_cry.gif
 share/pixmaps/gaim/smileys/default/yahoo_dance.gif
 share/pixmaps/gaim/smileys/default/yahoo_devil.gif
@@ -246,6 +247,7 @@ share/pixmaps/gaim/status/default/aim.png
 share/pixmaps/gaim/status/default/aol.png
 share/pixmaps/gaim/status/default/away.png
 share/pixmaps/gaim/status/default/dnd.png
+share/pixmaps/gaim/status/default/extendedaway.png
 share/pixmaps/gaim/status/default/freeforchat.png
 share/pixmaps/gaim/status/default/gadu-gadu.png
 share/pixmaps/gaim/status/default/game.png
@@ -258,6 +260,7 @@ share/pixmaps/gaim/status/default/logout.png
 share/pixmaps/gaim/status/default/msn.png
 share/pixmaps/gaim/status/default/na.png
 share/pixmaps/gaim/status/default/napster.png
+share/pixmaps/gaim/status/default/notauthorized.png
 share/pixmaps/gaim/status/default/occupied.png
 share/pixmaps/gaim/status/default/offline.png
 share/pixmaps/gaim/status/default/wireless.png
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index bd6d6b1ca6d..bb1bb1f62a7 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.21 2003/04/11 15:41:39 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2003/04/25 17:16:52 jmmv Exp $
 
-SHA1 (gaim-0.61.tar.gz) = abfb78a0b81e39ed744fbe0ac088abdd47601f90
-Size (gaim-0.61.tar.gz) = 2959190 bytes
-SHA1 (patch-aa) = 0428b0cd5c97d061b58fe4bf5bc0514a2aa5ce74
+SHA1 (gaim-0.62.tar.gz) = edd1ee71277268080888b869cdedd44074ec06b7
+Size (gaim-0.62.tar.gz) = 3191884 bytes
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
deleted file mode 100644
index e6f98204803..00000000000
--- a/chat/gaim/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2003/04/11 15:41:40 jmmv Exp $
-
---- src/buddy.c.orig	Thu Apr 10 18:11:40 2003
-+++ src/buddy.c	Thu Apr 10 18:11:54 2003
-@@ -1112,6 +1112,7 @@
- 	GtkWidget *sw;
- 	GtkWidget *button;
- 	GtkSizeGroup *sg;
-+	GtkAccelGroup *accel_group;
- 	GtkTreeSelection *selection;
- 	GtkTargetEntry gte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
- 				{"application/x-im-contact", 0, DRAG_BUDDY}};
-@@ -1136,7 +1137,10 @@
- 	gtk_widget_add_events(gtkblist->window, GDK_VISIBILITY_NOTIFY_MASK);
- 
- 	/******************************* Menu bar *************************************/
--	ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", NULL);
-+	accel_group = gtk_accel_group_new();
-+	gtk_window_add_accel_group(GTK_WINDOW (gtkblist->window), accel_group);
-+	g_object_unref(accel_group);
-+	ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", accel_group);
- 	gtk_item_factory_set_translate_func (ift,
- 					     item_factory_translate_func,
- 					     NULL, NULL);