4 files changed, 56 insertions, 22 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index cd6e4c396fb4..5291dd0a46ab 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -5,7 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.68
+PORTVERSION=	0.69
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-static=yes
+CONFIGURE_ARGS=	--enable-static=yes --enable-nss=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 217a977558e2..9a08ec4b8b0f 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.68.tar.bz2) = 604c749f236e3813a1d2341e2e9208bc
+MD5 (gaim-0.69.tar.bz2) = 29f018cc246dd6c7448c555f940aa009
diff --git a/net-im/gaim/files/patch-configure b/net-im/gaim/files/patch-configure
index 24c798ab7451..cfa950003110 100644
--- a/net-im/gaim/files/patch-configure
+++ b/net-im/gaim/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Tue Sep  2 20:51:30 2003
-+++ configure	Tue Sep  2 20:51:41 2003
-@@ -15914,7 +15914,7 @@
- 	fi
+--- configure.orig	Thu Sep 25 08:25:16 2003
++++ configure	Thu Sep 25 08:32:49 2003
+@@ -15962,7 +15962,7 @@
  
- 	prefix=`eval echo $prefix`
--	PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=$prefix"
-+	PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=%%LOCALBASE%%"
+ 	if test "x$prefix" != "xNONE"; then
+ 		prefix=`eval echo $prefix`
+-		PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=$prefix"
++		PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=%%LOCALBASE%%"
+ 	fi
  
  
- # Check whether --with-perl-lib or --without-perl-lib was given.
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 29f53f6be3d3..077c2c7bbced 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -19,7 +19,6 @@ lib/gaim/libtoc.so
 lib/gaim/libyahoo.so
 lib/gaim/libzephyr.so
 lib/gaim/notify.so
-%%PERL:%%lib/gaim/perl.so
 lib/gaim/spellchk.so
 lib/gaim/statenotify.so
 lib/gaim/ticker.so
@@ -72,53 +71,86 @@ share/gnome/pixmaps/gaim/smileys/default/mrt.png
 share/gnome/pixmaps/gaim/smileys/default/msn_angel.png
 share/gnome/pixmaps/gaim/smileys/default/msn_angry.png
 share/gnome/pixmaps/gaim/smileys/default/msn_away.png
-share/gnome/pixmaps/gaim/smileys/default/msn_bat.png
+share/gnome/pixmaps/gaim/smileys/default/msn_bat.gif
 share/gnome/pixmaps/gaim/smileys/default/msn_beer.png
+share/gnome/pixmaps/gaim/smileys/default/msn_bowl.png
 share/gnome/pixmaps/gaim/smileys/default/msn_boy.png
+share/gnome/pixmaps/gaim/smileys/default/msn_brb.png
 share/gnome/pixmaps/gaim/smileys/default/msn_brheart.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cake.png
+share/gnome/pixmaps/gaim/smileys/default/msn_cake.gif
+share/gnome/pixmaps/gaim/smileys/default/msn_car.png
 share/gnome/pixmaps/gaim/smileys/default/msn_cat.png
+share/gnome/pixmaps/gaim/smileys/default/msn_cellphone.png
+share/gnome/pixmaps/gaim/smileys/default/msn_cigarette.gif
 share/gnome/pixmaps/gaim/smileys/default/msn_clock.png
 share/gnome/pixmaps/gaim/smileys/default/msn_coffee.png
-share/gnome/pixmaps/gaim/smileys/default/msn_cry.png
+share/gnome/pixmaps/gaim/smileys/default/msn_coins.png
+share/gnome/pixmaps/gaim/smileys/default/msn_computer.png
+share/gnome/pixmaps/gaim/smileys/default/msn_cry.gif
 share/gnome/pixmaps/gaim/smileys/default/msn_deadflower.png
 share/gnome/pixmaps/gaim/smileys/default/msn_devil.png
 share/gnome/pixmaps/gaim/smileys/default/msn_dog.png
+share/gnome/pixmaps/gaim/smileys/default/msn_dontknow.gif
+share/gnome/pixmaps/gaim/smileys/default/msn_donttell.png
 share/gnome/pixmaps/gaim/smileys/default/msn_drink.png
 share/gnome/pixmaps/gaim/smileys/default/msn_email.png
 share/gnome/pixmaps/gaim/smileys/default/msn_embarrassed.png
+share/gnome/pixmaps/gaim/smileys/default/msn_eyeroll.gif
 share/gnome/pixmaps/gaim/smileys/default/msn_film.png
+share/gnome/pixmaps/gaim/smileys/default/msn_fingerscrossed.png
 share/gnome/pixmaps/gaim/smileys/default/msn_flower.png
 share/gnome/pixmaps/gaim/smileys/default/msn_gift.png
 share/gnome/pixmaps/gaim/smileys/default/msn_girl.png
 share/gnome/pixmaps/gaim/smileys/default/msn_handcuffs.png
 share/gnome/pixmaps/gaim/smileys/default/msn_heart.png
+share/gnome/pixmaps/gaim/smileys/default/msn_highfive.png
 share/gnome/pixmaps/gaim/smileys/default/msn_hot.png
 share/gnome/pixmaps/gaim/smileys/default/msn_icon.png
 share/gnome/pixmaps/gaim/smileys/default/msn_idea.png
+share/gnome/pixmaps/gaim/smileys/default/msn_island.png
 share/gnome/pixmaps/gaim/smileys/default/msn_kiss.png
 share/gnome/pixmaps/gaim/smileys/default/msn_laugh.png
+share/gnome/pixmaps/gaim/smileys/default/msn_lightning.gif
+share/gnome/pixmaps/gaim/smileys/default/msn_nerd.png
 share/gnome/pixmaps/gaim/smileys/default/msn_neutral.png
 share/gnome/pixmaps/gaim/smileys/default/msn_note.png
 share/gnome/pixmaps/gaim/smileys/default/msn_occ.png
 share/gnome/pixmaps/gaim/smileys/default/msn_online.png
 share/gnome/pixmaps/gaim/smileys/default/msn_ooooh.png
+share/gnome/pixmaps/gaim/smileys/default/msn_party.gif
 share/gnome/pixmaps/gaim/smileys/default/msn_phone.png
 share/gnome/pixmaps/gaim/smileys/default/msn_photo.png
+share/gnome/pixmaps/gaim/smileys/default/msn_pizza.png
+share/gnome/pixmaps/gaim/smileys/default/msn_plane.png
+share/gnome/pixmaps/gaim/smileys/default/msn_plate.png
 share/gnome/pixmaps/gaim/smileys/default/msn_question.png
 share/gnome/pixmaps/gaim/smileys/default/msn_rainbow.png
 share/gnome/pixmaps/gaim/smileys/default/msn_run.png
 share/gnome/pixmaps/gaim/smileys/default/msn_runback.png
 share/gnome/pixmaps/gaim/smileys/default/msn_sad.png
+share/gnome/pixmaps/gaim/smileys/default/msn_sarcastic.png
+share/gnome/pixmaps/gaim/smileys/default/msn_secret.png
+share/gnome/pixmaps/gaim/smileys/default/msn_sheep.png
+share/gnome/pixmaps/gaim/smileys/default/msn_sick.png
 share/gnome/pixmaps/gaim/smileys/default/msn_sleep.png
+share/gnome/pixmaps/gaim/smileys/default/msn_sleepy.gif
 share/gnome/pixmaps/gaim/smileys/default/msn_smiley.png
+share/gnome/pixmaps/gaim/smileys/default/msn_snail.png
+share/gnome/pixmaps/gaim/smileys/default/msn_soccer.png
 share/gnome/pixmaps/gaim/smileys/default/msn_star.png
+share/gnome/pixmaps/gaim/smileys/default/msn_stormy.png
 share/gnome/pixmaps/gaim/smileys/default/msn_sun.png
+share/gnome/pixmaps/gaim/smileys/default/msn_sunglasses.png
+share/gnome/pixmaps/gaim/smileys/default/msn_teeth.png
+share/gnome/pixmaps/gaim/smileys/default/msn_think.gif
 share/gnome/pixmaps/gaim/smileys/default/msn_thumbdown.png
 share/gnome/pixmaps/gaim/smileys/default/msn_thumbup.png
 share/gnome/pixmaps/gaim/smileys/default/msn_tongue.png
+share/gnome/pixmaps/gaim/smileys/default/msn_turtle.png
+share/gnome/pixmaps/gaim/smileys/default/msn_umbrella.png
 share/gnome/pixmaps/gaim/smileys/default/msn_weird.png
-share/gnome/pixmaps/gaim/smileys/default/msn_wink.png
+share/gnome/pixmaps/gaim/smileys/default/msn_wink.gif
+share/gnome/pixmaps/gaim/smileys/default/msn_xbox.png
 share/gnome/pixmaps/gaim/smileys/default/oneeye.png
 share/gnome/pixmaps/gaim/smileys/default/sad.png
 share/gnome/pixmaps/gaim/smileys/default/scream.png
@@ -246,6 +278,7 @@ share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/no/LC_MESSAGES/gaim.mo
 share/locale/pl/LC_MESSAGES/gaim.mo
 share/locale/pt_BR/LC_MESSAGES/gaim.mo
+share/locale/pt_PT/LC_MESSAGES/gaim.mo
 share/locale/ro/LC_MESSAGES/gaim.mo
 share/locale/ru/LC_MESSAGES/gaim.mo
 share/locale/sk/LC_MESSAGES/gaim.mo
@@ -254,7 +287,6 @@ share/locale/sr@Latn/LC_MESSAGES/gaim.mo
 share/locale/sv/LC_MESSAGES/gaim.mo
 share/locale/zh_CN/LC_MESSAGES/gaim.mo
 share/locale/zh_TW/LC_MESSAGES/gaim.mo
-@dirrm include/gaim-remote
 @dirrm share/gnome/sounds/gaim
 @dirrm share/gnome/pixmaps/gaim/status/default
 @dirrm share/gnome/pixmaps/gaim/status
@@ -265,11 +297,13 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrm share/gnome/pixmaps/gaim/buttons
 @dirrm share/gnome/pixmaps/gaim
 @dirrm lib/gaim
+@dirrm include/gaim-remote
 %%PERL:%%@cwd %%LOCALBASE%%
-%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Gaim.pm
-%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/.packlist
-%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
-%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
-%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
 %%PERL:%%lib/perl5/%%PERL_VER%%/man/man3/Gaim.3
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim/.packlist
+%%PERL:%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Gaim.pm
+%%PERL:%%lib/gaim/perl.so
 %%PERL:%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gaim