Update to 0.81. For a list of what's changed, see

http://gaim.sourceforge.net/ChangeLog.

Submitted by:	Matthew Luckie <mjl@luckie.org.nz>

4 files changed, 37 insertions, 7 deletions

diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index bdf31dcf9408..36063b3221a2 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -5,7 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.80
+PORTVERSION=	0.81
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index d7fb15245189..5657480a7108 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-0.80.tar.bz2) = cb68e059ff9667d3156d7abef74b7b19
-SIZE (gaim-0.80.tar.bz2) = 4589883
+MD5 (gaim-0.81.tar.bz2) = ee3460363f51ad24db1c5697d1da3c1b
+SIZE (gaim-0.81.tar.bz2) = 4588215
diff --git a/net/gaim/files/patch-src_protocols_oscar_oscar.c b/net/gaim/files/patch-src_protocols_oscar_oscar.c
index 050faa3b1966..db3e22bbbcf8 100644
--- a/net/gaim/files/patch-src_protocols_oscar_oscar.c
+++ b/net/gaim/files/patch-src_protocols_oscar_oscar.c
@@ -1,6 +1,6 @@
---- src/protocols/oscar/oscar.c.orig	Tue Jun  1 18:12:11 2004
-+++ src/protocols/oscar/oscar.c	Tue Jun  1 18:12:58 2004
-@@ -3127,7 +3127,7 @@
+--- src/protocols/oscar/oscar.c.orig	Sun Aug  8 01:32:27 2004
++++ src/protocols/oscar/oscar.c	Sun Aug  8 01:40:47 2004
+@@ -3136,7 +3136,7 @@
  	 * Note: There *may* be some clients which send messages as HTML formatted -
  	 *       they need to be special-cased somehow.
  	 */
@@ -9,3 +9,29 @@
  		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
  		gchar *tmp2 = gaim_escape_html(tmp);
  		g_free(tmp);
+@@ -3473,6 +3473,9 @@
+ 	gchar **msg1, **msg2;
+ 	GError *err = NULL;
+ 	int i, numtoks;
++#ifdef HAVE_TM_GMTOFF
++	struct tm tm;
++#endif
+ 
+ 	if (!args->type || !args->msg || !args->uin)
+ 		return 1;
+@@ -3507,8 +3510,15 @@
+ 
+ 				if (t) { /* This is an offline message */
+ 					/* The timestamp is UTC-ish, so we need to get the offset */
++#ifdef HAVE_TM_GMTOFF
++					localtime_r(&t, &tm);
++					t += tm.tm_gmtoff;
++#else
++#ifdef HAVE_TIMEZONE
+ 					tzset();
+ 					t -= timezone;
++#endif
++#endif
+ 					serv_got_im(gc, uin, tmp, 0, t);
+ 				} else { /* This is a message from MacICQ/Miranda */
+ 					serv_got_im(gc, uin, tmp, 0, time(NULL));
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index e20a11955551..274cd2412f71 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -325,12 +325,14 @@ share/gnome/pixmaps/gaim/status/default/away.png
 share/gnome/pixmaps/gaim/status/default/dnd.png
 share/gnome/pixmaps/gaim/status/default/extendedaway.png
 share/gnome/pixmaps/gaim/status/default/female.png
+share/gnome/pixmaps/gaim/status/default/founder.png
 share/gnome/pixmaps/gaim/status/default/freeforchat.png
 share/gnome/pixmaps/gaim/status/default/gadu-gadu.png
 share/gnome/pixmaps/gaim/status/default/game.png
+share/gnome/pixmaps/gaim/status/default/halfop.png
 share/gnome/pixmaps/gaim/status/default/hiptop.png
 share/gnome/pixmaps/gaim/status/default/icq.png
-share/gnome/pixmaps/gaim/status/default/ignored.svg
+share/gnome/pixmaps/gaim/status/default/ignored.png
 share/gnome/pixmaps/gaim/status/default/invisible.png
 share/gnome/pixmaps/gaim/status/default/irc.png
 share/gnome/pixmaps/gaim/status/default/jabber.png
@@ -344,10 +346,12 @@ share/gnome/pixmaps/gaim/status/default/notauthorized.png
 share/gnome/pixmaps/gaim/status/default/novell.png
 share/gnome/pixmaps/gaim/status/default/occupied.png
 share/gnome/pixmaps/gaim/status/default/offline.png
+share/gnome/pixmaps/gaim/status/default/op.png
 share/gnome/pixmaps/gaim/status/default/rendezvous.png
 share/gnome/pixmaps/gaim/status/default/secure.png
 share/gnome/pixmaps/gaim/status/default/silc.png
 share/gnome/pixmaps/gaim/status/default/trepia.png
+share/gnome/pixmaps/gaim/status/default/voice.png
 share/gnome/pixmaps/gaim/status/default/wireless.png
 share/gnome/pixmaps/gaim/status/default/yahoo.png
 share/gnome/pixmaps/gaim/status/default/zephyr.png