Update to 0.69:

* Added Contact (aka Person, aka Meta-Contact, aka Buddy Merging, etc)
  support
* Added MSN 6 smileys.
* Added animated smiley support (Ka-Hing Cheung)
* Added SSL support, compatible with GNUTLS and Mozilla NSS.
* Added plugin IPC.
* Added support for gettext 0.12.x.
* Updated MSN support to the MSN Protocol version 9.
* Jabber now supports SSL
* Yahoo now shows people using the java chat client (Tim Ringenbach)
* Yahoo chat and conference (Tim Ringenbach)
* Yahoo ignore support (Jesse Farmer (farmerje))
* Yahoo idle times displayed, long buddy lists work, sms users,
  and other improvements (Tim Ringenbach)
* The accounts window now shows offline accounts as greyed out, and
  online accounts as colored.
* Fixed the text replacement plugin.
* Fixed all known signal problems in perl.
* The right-click menu for conversation tabs now shows the tab icon
  and status, if tab icons are enabled. (Jesse Farmer)
* Chinese (Simplified) translation updated (Funda Wang)
* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
  Liu (prliu))
* Czech translation updated (Miloslav Trmac)
* Danish translation updated (Morten Brix Pedersen (mbrix))
* Dutch translation updated (Vincent van Adrighem)
* Finnish translation updated (Ambrose C. LI (acli))
* French translation updated (Eric Boumaour)
* German translation updated (Bjoern Voigt)
* Italian translation updated (Luca Beltrame, Claudio Satriano)
* Korean translation updated (Kyung-uk Son)
* Polish translation updated (Przemysław Sułek, Krzysztof, and
  Emil)
* Portuguese (Brazilian) translation updated (Mauricio de Lemos
  Rodrigues Collares Neto)
* Portuguese (Portugal) added (Duarte Henriques)
* Romanian translation updated (Misu Moldovan (dumol))
* Russian translation updated (Alexandre Prokoudine)
* Serbian translation updated (Danilo Segan)
* Serbian Latin translation updated (Danilo Segan)
* Spanish translation updated (Javier Fernández-Sanguino Peña)
* Swedish translation updated (Tore Lundqvist (luntor))

4 files changed, 47 insertions, 24 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 7c1535da9a1..795502a7b29 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2003/09/04 12:57:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2003/09/26 15:03:36 jmmv Exp $
 #
 
-DISTNAME=	gaim-0.68
+DISTNAME=	gaim-0.69
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index eb5dd62e257..3857a9e7409 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2003/09/04 12:57:00 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.19 2003/09/26 15:03:36 jmmv Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim-remote/remote-socket.h
@@ -9,6 +9,9 @@ lib/gaim/autorecon.so
 lib/gaim/docklet.a
 lib/gaim/docklet.la
 lib/gaim/docklet.so
+lib/gaim/gaim-remote.a
+lib/gaim/gaim-remote.la
+lib/gaim/gaim-remote.so
 lib/gaim/gestures.a
 lib/gaim/gestures.la
 lib/gaim/gestures.so
@@ -90,6 +93,7 @@ ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pl/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
@@ -142,53 +146,86 @@ share/pixmaps/gaim/smileys/default/mrt.png
 share/pixmaps/gaim/smileys/default/msn_angel.png
 share/pixmaps/gaim/smileys/default/msn_angry.png
 share/pixmaps/gaim/smileys/default/msn_away.png
-share/pixmaps/gaim/smileys/default/msn_bat.png
+share/pixmaps/gaim/smileys/default/msn_bat.gif
 share/pixmaps/gaim/smileys/default/msn_beer.png
+share/pixmaps/gaim/smileys/default/msn_bowl.png
 share/pixmaps/gaim/smileys/default/msn_boy.png
+share/pixmaps/gaim/smileys/default/msn_brb.png
 share/pixmaps/gaim/smileys/default/msn_brheart.png
-share/pixmaps/gaim/smileys/default/msn_cake.png
+share/pixmaps/gaim/smileys/default/msn_cake.gif
+share/pixmaps/gaim/smileys/default/msn_car.png
 share/pixmaps/gaim/smileys/default/msn_cat.png
+share/pixmaps/gaim/smileys/default/msn_cellphone.png
+share/pixmaps/gaim/smileys/default/msn_cigarette.gif
 share/pixmaps/gaim/smileys/default/msn_clock.png
 share/pixmaps/gaim/smileys/default/msn_coffee.png
-share/pixmaps/gaim/smileys/default/msn_cry.png
+share/pixmaps/gaim/smileys/default/msn_coins.png
+share/pixmaps/gaim/smileys/default/msn_computer.png
+share/pixmaps/gaim/smileys/default/msn_cry.gif
 share/pixmaps/gaim/smileys/default/msn_deadflower.png
 share/pixmaps/gaim/smileys/default/msn_devil.png
 share/pixmaps/gaim/smileys/default/msn_dog.png
+share/pixmaps/gaim/smileys/default/msn_dontknow.gif
+share/pixmaps/gaim/smileys/default/msn_donttell.png
 share/pixmaps/gaim/smileys/default/msn_drink.png
 share/pixmaps/gaim/smileys/default/msn_email.png
 share/pixmaps/gaim/smileys/default/msn_embarrassed.png
+share/pixmaps/gaim/smileys/default/msn_eyeroll.gif
 share/pixmaps/gaim/smileys/default/msn_film.png
+share/pixmaps/gaim/smileys/default/msn_fingerscrossed.png
 share/pixmaps/gaim/smileys/default/msn_flower.png
 share/pixmaps/gaim/smileys/default/msn_gift.png
 share/pixmaps/gaim/smileys/default/msn_girl.png
 share/pixmaps/gaim/smileys/default/msn_handcuffs.png
 share/pixmaps/gaim/smileys/default/msn_heart.png
+share/pixmaps/gaim/smileys/default/msn_highfive.png
 share/pixmaps/gaim/smileys/default/msn_hot.png
 share/pixmaps/gaim/smileys/default/msn_icon.png
 share/pixmaps/gaim/smileys/default/msn_idea.png
+share/pixmaps/gaim/smileys/default/msn_island.png
 share/pixmaps/gaim/smileys/default/msn_kiss.png
 share/pixmaps/gaim/smileys/default/msn_laugh.png
+share/pixmaps/gaim/smileys/default/msn_lightning.gif
+share/pixmaps/gaim/smileys/default/msn_nerd.png
 share/pixmaps/gaim/smileys/default/msn_neutral.png
 share/pixmaps/gaim/smileys/default/msn_note.png
 share/pixmaps/gaim/smileys/default/msn_occ.png
 share/pixmaps/gaim/smileys/default/msn_online.png
 share/pixmaps/gaim/smileys/default/msn_ooooh.png
+share/pixmaps/gaim/smileys/default/msn_party.gif
 share/pixmaps/gaim/smileys/default/msn_phone.png
 share/pixmaps/gaim/smileys/default/msn_photo.png
+share/pixmaps/gaim/smileys/default/msn_pizza.png
+share/pixmaps/gaim/smileys/default/msn_plane.png
+share/pixmaps/gaim/smileys/default/msn_plate.png
 share/pixmaps/gaim/smileys/default/msn_question.png
 share/pixmaps/gaim/smileys/default/msn_rainbow.png
 share/pixmaps/gaim/smileys/default/msn_run.png
 share/pixmaps/gaim/smileys/default/msn_runback.png
 share/pixmaps/gaim/smileys/default/msn_sad.png
+share/pixmaps/gaim/smileys/default/msn_sarcastic.png
+share/pixmaps/gaim/smileys/default/msn_secret.png
+share/pixmaps/gaim/smileys/default/msn_sheep.png
+share/pixmaps/gaim/smileys/default/msn_sick.png
 share/pixmaps/gaim/smileys/default/msn_sleep.png
+share/pixmaps/gaim/smileys/default/msn_sleepy.gif
 share/pixmaps/gaim/smileys/default/msn_smiley.png
+share/pixmaps/gaim/smileys/default/msn_snail.png
+share/pixmaps/gaim/smileys/default/msn_soccer.png
 share/pixmaps/gaim/smileys/default/msn_star.png
+share/pixmaps/gaim/smileys/default/msn_stormy.png
 share/pixmaps/gaim/smileys/default/msn_sun.png
+share/pixmaps/gaim/smileys/default/msn_sunglasses.png
+share/pixmaps/gaim/smileys/default/msn_teeth.png
+share/pixmaps/gaim/smileys/default/msn_think.gif
 share/pixmaps/gaim/smileys/default/msn_thumbdown.png
 share/pixmaps/gaim/smileys/default/msn_thumbup.png
 share/pixmaps/gaim/smileys/default/msn_tongue.png
+share/pixmaps/gaim/smileys/default/msn_turtle.png
+share/pixmaps/gaim/smileys/default/msn_umbrella.png
 share/pixmaps/gaim/smileys/default/msn_weird.png
-share/pixmaps/gaim/smileys/default/msn_wink.png
+share/pixmaps/gaim/smileys/default/msn_wink.gif
+share/pixmaps/gaim/smileys/default/msn_xbox.png
 share/pixmaps/gaim/smileys/default/oneeye.png
 share/pixmaps/gaim/smileys/default/sad.png
 share/pixmaps/gaim/smileys/default/scream.png
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 24172bcaadb..e33cc5ae160 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.30 2003/09/04 12:57:00 jmmv Exp $
+$NetBSD: distinfo,v 1.31 2003/09/26 15:03:36 jmmv Exp $
 
-SHA1 (gaim-0.68.tar.gz) = 00b6fbdfa13e681771303aa29ead0ddca15384a1
-Size (gaim-0.68.tar.gz) = 4145453 bytes
-SHA1 (patch-aa) = bd11a2c4b74c1670503b09b5b87e483ce06060a9
+SHA1 (gaim-0.69.tar.gz) = c9ba4f15f19ad5eebed5a98c956d8a05475d3b4d
+Size (gaim-0.69.tar.gz) = 4479717 bytes
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
deleted file mode 100644
index 47dcabbdf77..00000000000
--- a/chat/gaim/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2003/09/04 12:57:01 jmmv Exp $
-
---- src/Makefile.in.orig	2003-09-02 05:12:56.000000000 +0200
-+++ src/Makefile.in
-@@ -320,7 +320,7 @@ gaim_remote_SOURCES = \
- gaim_remote_DEPENDENCIES = @LIBOBJS@
- gaim_remote_LDADD = \
- 	@LIBOBJS@ $(GLIB_LIBS) $(INTLLIBS) \
--	-L$(top_builddir)/plugins/gaim-remote -lgaim-remote
-+	$(top_builddir)/plugins/gaim-remote/libgaim-remote.la
- 
- 
- AM_CPPFLAGS = \