Update to 0.74, provided by Matthew Luckie. Together with the update, add a

patch to allow gaim connect to MSN using OpenSSL, instead of gnutls.

version 0.74 (11/25/2003):
	* Sort-by-size log sorting fix
	* Log directory umask fix for users of gaim-remote
	* Fix Jabber room creation on MUC servers.
	* Vietnamese translation added (T.M.Thanh,M.D.)

version 0.73 (11/21/2003):
	* New Logging format and code:
		* fixes i18n issues with logs
		* compatible with old logs
		* hopefully fixes segfault in viewing logs
	* New disconnected account dialog (Thanks, Daniel Atallah)
	* Fixes several Jabber bugs
	* Fixes the bug where some dialogs would crash when spell checking was
	  enabled. Closes #827930.
	* Fixed unblocking of users in MSN (Robert Mibus)
	* Fixes outgoing mobile pages on MSN.
	* The border on the close buttons on inactive tabs are no longer shown,
	  thanks to a fix used by Galeon.
	* Compatible with autoconf 2.58.
	* Cleaned up gtkspell-related code (Robert McQueen)
	* Changed the parameters for the received-chat-msg signal.
	* Added a Release Notification plugin
	* Chinese (Simplified) translation updated (Funda Wang)
	* Chinese (Traditional) translation updated (Ambrose C. Li)
	* Danish translation updated (Morten Brix Pedersen (mbrix))
	* Finnish translation updated (Arto Alakulju)
	* French translation updated (Eric Boumaour)
	* German translation updated (Bjoern Voigt)
	* Hindi trnaslation updated (Ravi (raviratlami))
	* Italian translation updated (Claudio Satriano)
	* Norwegian translation updated (Petter Johan Olsen)
	* Polish translation updated (Emil Nowak)
	* Serbian Latin translation updated (Danilo Segan)
	* Swedish translation updated (Tore Lundqvist (luntor))

version 0.72 (10/31/2003):
	* Added a search feature to conversations.
	* Added an option to remove the formatting toolbar, both globally and
	  on a per-window basis (Nathan Fredrickson)
	* Added a drop shadow to the buddy list tooltip
	* Smileys are copyable
	* Fixed the ICQ login crash
	* Fixed a crash in the Add Chat dialog when selecting an
	  account that doesn't support chats. Closes bug #821606.
	* Fixed a bug where new MSN accounts without buddies added wouldn't
	  connect.
	* Fixed a crash when deleting an account that has IMs or chats open.
	  Closes bug #821630.
	* Smileys have background colors
	* If SSL is not enabled, MSN will load, but error on connect.
	* Disable Jabber SASL auth until the standard stabilizes
	* Chinese (Simplified) translation updated (Funda Wang)
	* Chinese (Traditional) translation updated (Ambrose C. Li)
	* Czech translation updated (Stanislav Brabec, Miloslav Trmac)
	* Danish translation updated (Morten Brix Pedersen (mbrix))
	* Dutch translation updated (Vincent van Adrighem)
	* Finnish translation updated (Arto Alakulju)
	* French translation updated (Eric Boumaour)
	* German translation updated (Bjoern Voigt)
	* Italian translation updated (Claudio Satriano)
	* Korean translation updated (Kyung-uk)
	* Portuguese (Portugal) updated (Duarte Henriques)
	* Romanian translation updated (Misu Moldovan)
	* Russian translation updated (Alexandre Prokoudine)
	* Serbian translation updated (Danilo Segan)
	* Serbian Latin translation updated (Danilo Segan)
	* Spanish translation updated (Javier Fernandez-Sanguino Pena)
	* Swedish translation updated (Tore Lundqvist (luntor))

3 files changed, 24 insertions, 8 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 51e69cf7db9..df488b41a89 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.42 2003/10/18 08:18:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.43 2003/12/03 13:23:28 jmmv Exp $
 #
 
-DISTNAME=	gaim-0.71
+DISTNAME=	gaim-0.74
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
 
+PATCH_SITES=	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/marcus/
+PATCHFILES=	${DISTNAME}-openssl.patch.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	mjl@luckie.org.nz
 HOMEPAGE=	http://gaim.sourceforge.net/
 COMMENT=	GTK2 based client for the AOL Instant Messenger chat system
@@ -27,6 +31,8 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS+=	--disable-nas
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-nss
+CONFIGURE_ARGS+=	--disable-tcl
+CONFIGURE_ARGS+=	--disable-gnutls
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,7 +46,7 @@ CONFIGURE_ARGS+=	--disable-screensaver
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../security/gnutls/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 .include "../../textproc/gtkspell/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../x11/startup-notification/buildlink2.mk"
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index e3990396e7e..c5ed158f64f 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2003/10/18 08:18:46 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.21 2003/12/03 13:23:28 jmmv Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim-remote/remote-socket.h
@@ -54,6 +54,9 @@ lib/gaim/libzephyr.so
 lib/gaim/notify.a
 lib/gaim/notify.la
 lib/gaim/notify.so
+lib/gaim/relnot.a
+lib/gaim/relnot.la
+lib/gaim/relnot.so
 lib/gaim/spellchk.a
 lib/gaim/spellchk.la
 lib/gaim/spellchk.so
@@ -63,6 +66,9 @@ lib/gaim/ssl-gnutls.so
 lib/gaim/ssl-nss.a
 lib/gaim/ssl-nss.la
 lib/gaim/ssl-nss.so
+lib/gaim/ssl-openssl.a
+lib/gaim/ssl-openssl.la
+lib/gaim/ssl-openssl.so
 lib/gaim/ssl.a
 lib/gaim/ssl.la
 lib/gaim/ssl.so
@@ -101,14 +107,15 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
 share/pixmaps/gaim.png
@@ -329,6 +336,7 @@ 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/secure.png
 share/pixmaps/gaim/status/default/trepia.png
 share/pixmaps/gaim/status/default/wireless.png
 share/pixmaps/gaim/status/default/yahoo.png
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 9fd1fa69321..44c54b54ac9 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.33 2003/10/18 08:18:46 jmmv Exp $
+$NetBSD: distinfo,v 1.34 2003/12/03 13:23:28 jmmv Exp $
 
-SHA1 (gaim-0.71.tar.bz2) = 3615ca1973704de57ab48a098ec6ece147bba578
-Size (gaim-0.71.tar.bz2) = 3109536 bytes
+SHA1 (gaim-0.74.tar.bz2) = f9df2adbd49e0dba95eb0442fdd7b75b7177dcbd
+Size (gaim-0.74.tar.bz2) = 3285757 bytes
+SHA1 (gaim-0.74-openssl.patch.gz) = 230ce6408cf6a11c6dd38b8fcb7f3ec7dd58ec86
+Size (gaim-0.74-openssl.patch.gz) = 7669 bytes