4 files changed, 617 insertions, 525 deletions

diff --git a/net-im/amsn/Makefile b/net-im/amsn/Makefile
index f8c86af79d05..32e463acb9dc 100644
--- a/net-im/amsn/Makefile
+++ b/net-im/amsn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amsn
-PORTVERSION=	0.92
+PORTVERSION=	0.93
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,13 +23,13 @@ BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/msn
+WRKSRC=		${WRKDIR}/amsn-0_93
 
 LIBDIR=		${PREFIX}/lib/msn
 DOCSDIR=	${PREFIX}/share/doc/amsn
-CORE=		FAQ HELP README amsn jwakeup langlist amsn-remote remote.help \
+CORE=		FAQ HELP README amsn langlist amsn-remote remote.help \
 		*tcl *htm*
-SUBDIR=		icons lang skins plugins
+SUBDIR=		icons lang skins plugins utils docs
 DOC_FILES=	README TODO
 
 post-extract:
@@ -38,10 +38,8 @@ post-extract:
 	@${FIND} ${WRKSRC} -name .xvpics | ${XARGS} ${RM} -rf
 
 do-configure:
-	export WISH=`which wish8.4` && ${SED} s=!!PREFIX!!=`dirname $${WISH}|${SED} sx/binxxg`=g ${FILESDIR}/Makefile.traydoc | ${SED} s=!!X11BASE!!=${X11BASE}=g > ${WRKSRC}/plugins/traydock/Makefile
 
 do-build:
-	cd ${WRKSRC}/plugins/traydock && make && ${RM} Makefile
 
 do-install:
 	@${MKDIR} ${LIBDIR}
@@ -57,11 +55,10 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s=!!PREFIX!!=${PREFIX}=" < ${FILESDIR}/amsn \
-		> ${PREFIX}/bin/amsn
+	${LN} -s ${PREFIX}/lib/msn/amsn ${PREFIX}/bin/amsn
 	@${CHMOD} 555 ${PREFIX}/bin/amsn
 	@${CHMOD} 555 ${PREFIX}/lib/msn/amsn
-	@uudecode -o ${PREFIX}/lib/msn/skins/default/pixmaps/logolinmsn.gif \
-		${FILESDIR}/logolinmsn.gif.uue
+	@${CHMOD} 555 ${PREFIX}/lib/msn/amsn-remote
+	@${CHMOD} 555 ${PREFIX}/lib/msn/utils/amsnctl.pl
 
 .include <bsd.port.mk>
diff --git a/net-im/amsn/distinfo b/net-im/amsn/distinfo
index 179535d5c36d..b7222f91a3a5 100644
--- a/net-im/amsn/distinfo
+++ b/net-im/amsn/distinfo
@@ -1,2 +1,2 @@
-MD5 (amsn-0_92.tar.gz) = 1a4861b08e469cd86dda8bd19afcde7e
-SIZE (amsn-0_92.tar.gz) = 2039934
+MD5 (amsn-0_93.tar.gz) = dffc4bbd38f4fa63df481b89f7c89e7d
+SIZE (amsn-0_93.tar.gz) = 2266580
diff --git a/net-im/amsn/pkg-plist b/net-im/amsn/pkg-plist
index e1cf07a6c02a..287286f3d525 100644
--- a/net-im/amsn/pkg-plist
+++ b/net-im/amsn/pkg-plist
@@ -1,114 +1,99 @@
 bin/amsn
 lib/msn/FAQ
 lib/msn/HELP
-lib/msn/README
-lib/msn/amsn
-lib/msn/jwakeup
-lib/msn/langlist
-lib/msn/amsn-remote
-lib/msn/remote.help
-lib/msn/AppMain.tcl
-lib/msn/abook.tcl
-lib/msn/alarm.tcl
-lib/msn/anigif.tcl
-lib/msn/automsg.tcl
-lib/msn/balloon.tcl
-lib/msn/blocking.tcl
-lib/msn/combobox.tcl
-lib/msn/config.tcl
-lib/msn/ctadverts.tcl
-lib/msn/ctthemes.tcl
-lib/msn/des.tcl
-lib/msn/dock.tcl
-lib/msn/groups.tcl
-lib/msn/gui.tcl
-lib/msn/hotmail.tcl
-lib/msn/itunes.tcl
-lib/msn/lang.tcl
-lib/msn/loging.tcl
-lib/msn/migmd5.tcl
-lib/msn/mutex.tcl
-lib/msn/plugins.tcl
-lib/msn/png.tcl
-lib/msn/preferences.tcl
-lib/msn/progressbar.tcl
-lib/msn/protocol.tcl
-lib/msn/proxy.tcl
-lib/msn/remote.tcl
-lib/msn/skins.tcl
-lib/msn/smileys.tcl
-lib/msn/socks.tcl
-lib/msn/sxml.tcl
-lib/msn/trayicon.tcl
-lib/msn/xmms.tcl
-lib/msn/hotmlog.htm
-lib/msn/icons/128x128/aMSN_128.png
-lib/msn/icons/128x128/tux-128x128.png
-lib/msn/icons/32x32/aMSN_32.png
-lib/msn/icons/32x32/amsn.png
-lib/msn/icons/32x32/crystal.png
-lib/msn/icons/32x32/msn.png
-lib/msn/icons/32x32/tux-32x32.png
-lib/msn/icons/48x48/aMSN_48.png
-lib/msn/icons/48x48/amsn.png
-lib/msn/icons/48x48/msn.png
-lib/msn/icons/48x48/tux-48x48.png
-lib/msn/icons/64x64/aMSN_64.png
-lib/msn/icons/64x64/amsn.png
-lib/msn/icons/64x64/tux-64x64.png
-lib/msn/icons/96x96/aMSN_96.png
-lib/msn/icons/96x96/tux-96x96.png
-lib/msn/icons/winicons/away.ico
-lib/msn/icons/winicons/brb.ico
-lib/msn/icons/winicons/busy.ico
-lib/msn/icons/winicons/hidden.ico
-lib/msn/icons/winicons/inactive.ico
-lib/msn/icons/winicons/lunch.ico
-lib/msn/icons/winicons/msn.ico
-lib/msn/icons/winicons/offline.ico
-lib/msn/icons/winicons/online.ico
-lib/msn/icons/winicons/phone.ico
-lib/msn/icons/winicons/unread.ico
-lib/msn/lang/LANG-HOWTO
-lib/msn/lang/addkey.tcl
-lib/msn/lang/complete.pl
-lib/msn/lang/convert.tcl
-lib/msn/lang/dups.sh
-lib/msn/lang/errors.py
-lib/msn/lang/genlangfiles.c
-lib/msn/lang/genpage.c
+lib/msn/docs/FAQfur
+lib/msn/docs/HELPda
+lib/msn/docs/HELPde
+lib/msn/docs/HELPes
+lib/msn/docs/HELPfr
+lib/msn/docs/HELPgr
+lib/msn/docs/HELPit
+lib/msn/docs/HELPnl
+lib/msn/docs/HELPno
+lib/msn/docs/HELPpt
+lib/msn/docs/HELPro
+lib/msn/docs/HELPru
+lib/msn/docs/HELPtr
+lib/msn/docs/HELPva
+lib/msn/docs/FAQbs
+lib/msn/docs/FAQde
+lib/msn/docs/FAQdu
+lib/msn/docs/FAQes
+lib/msn/docs/FAQfr
+lib/msn/docs/FAQgr
+lib/msn/docs/FAQit
+lib/msn/docs/FAQmn
+lib/msn/docs/FAQnl
+lib/msn/docs/FAQno
+lib/msn/docs/FAQpt
+lib/msn/docs/FAQsl
+lib/msn/docs/FAQsv
+lib/msn/docs/FAQtr
+lib/msn/docs/FAQva
+lib/msn/docs/READMEfur
+lib/msn/docs/HELPfr_ca
+lib/msn/docs/HELPpt_BR
+lib/msn/docs/HELPzh-TW
+lib/msn/docs/FAQfr.html
+lib/msn/docs/READMEda
+lib/msn/docs/READMEde
+lib/msn/docs/READMEes
+lib/msn/docs/READMEfr
+lib/msn/docs/READMEit
+lib/msn/docs/READMEmn
+lib/msn/docs/READMEnl
+lib/msn/docs/READMEpt
+lib/msn/docs/READMEro
+lib/msn/docs/READMEru
+lib/msn/docs/READMEsv
+lib/msn/docs/READMEtr
+lib/msn/docs/READMEva
+lib/msn/docs/HELPfur
+lib/msn/docs/helpmn
+lib/msn/docs/READMEpt_BR
+lib/msn/docs/READMEzh-TW
+lib/msn/docs/FAQfr_ca
+lib/msn/docs/FAQpt_BR
+lib/msn/lang/langzh-CN
+lib/msn/lang/langzh-TW
+lib/msn/lang/untranslated.py
 lib/msn/lang/lang1.tmpl
 lib/msn/lang/lang2.tmpl
 lib/msn/lang/lang3.tmpl
+lib/msn/lang/langfri
+lib/msn/lang/langfur
+lib/msn/lang/langglg
+lib/msn/lang/langgr2
+lib/msn/lang/langswa
+lib/msn/lang/sortlang
+lib/msn/lang/dups.sh
+lib/msn/lang/addkey.tcl
+lib/msn/lang/missing.py
+lib/msn/lang/LANG-HOWTO
 lib/msn/lang/langaf
 lib/msn/lang/langal
 lib/msn/lang/langbg
+lib/msn/lang/langca
 lib/msn/lang/langbn
 lib/msn/lang/langbs
-lib/msn/lang/langca
-lib/msn/lang/langcs
-lib/msn/lang/langcy
 lib/msn/lang/langda
 lib/msn/lang/langde
+lib/msn/lang/langcs
+lib/msn/lang/langcy
 lib/msn/lang/langee
 lib/msn/lang/langei
 lib/msn/lang/langen
 lib/msn/lang/langeo
 lib/msn/lang/langes
-lib/msn/lang/langeu
 lib/msn/lang/langfi
+lib/msn/lang/langeu
 lib/msn/lang/langfr
-lib/msn/lang/langfr_CA
-lib/msn/lang/langfri
-lib/msn/lang/langfur
-lib/msn/lang/langga
 lib/msn/lang/langgr
-lib/msn/lang/langgr2
-lib/msn/lang/langhu
 lib/msn/lang/langid
+lib/msn/lang/langhu
+lib/msn/lang/langja
 lib/msn/lang/langis
 lib/msn/lang/langit
-lib/msn/lang/langja
 lib/msn/lang/langko
 lib/msn/lang/langmk
 lib/msn/lang/langmn
@@ -116,196 +101,318 @@ lib/msn/lang/langnl
 lib/msn/lang/langno
 lib/msn/lang/langpl
 lib/msn/lang/langpt
-lib/msn/lang/langpt_BR
 lib/msn/lang/langro
 lib/msn/lang/langru
-lib/msn/lang/langsi
 lib/msn/lang/langsk
-lib/msn/lang/langsr
-lib/msn/lang/langsw
-lib/msn/lang/langswa
+lib/msn/lang/langsl
 lib/msn/lang/langta
+lib/msn/lang/langsr
+lib/msn/lang/langsv
 lib/msn/lang/langtr
 lib/msn/lang/langva
-lib/msn/lang/langzh-CN
-lib/msn/lang/langzh-TW
-lib/msn/lang/missing.py
-lib/msn/lang/sortlang
-lib/msn/skins/Tux/desc.txt
+lib/msn/lang/complete.pl
+lib/msn/lang/genpage.c
+lib/msn/lang/genlangfiles.c
+lib/msn/lang/convert.tcl
+lib/msn/lang/errors.py
+lib/msn/lang/langfr_CA
+lib/msn/lang/langpt_BR
+lib/msn/des.tcl
+lib/msn/groups.tcl
+lib/msn/plugins.tcl
+lib/msn/icons/32x32/amsn.png
+lib/msn/icons/32x32/tux-32x32.png
+lib/msn/icons/32x32/crystal.png
+lib/msn/icons/32x32/aMSN_32.png
+lib/msn/icons/32x32/msn.png
+lib/msn/icons/48x48/amsn.png
+lib/msn/icons/48x48/tux-48x48.png
+lib/msn/icons/48x48/aMSN_48.png
+lib/msn/icons/48x48/msn.png
+lib/msn/icons/64x64/tux-64x64.png
+lib/msn/icons/64x64/amsn.png
+lib/msn/icons/64x64/aMSN_64.png
+lib/msn/icons/96x96/aMSN_96.png
+lib/msn/icons/96x96/tux-96x96.png
+lib/msn/icons/128x128/tux-128x128.png
+lib/msn/icons/128x128/aMSN_128.png
 lib/msn/skins/Tux/README
-lib/msn/skins/Tux/displaypic/amsn.dat
-lib/msn/skins/Tux/displaypic/loading.gif
-lib/msn/skins/Tux/displaypic/nopic.gif
+lib/msn/skins/Tux/license
+lib/msn/skins/Tux/smileys/girl.gif
+lib/msn/skins/Tux/smileys/baring_teeth.gif
+lib/msn/skins/Tux/smileys/lightning.gif
+lib/msn/skins/Tux/smileys/red.gif
+lib/msn/skins/Tux/smileys/sad_smile.gif
+lib/msn/skins/Tux/smileys/cry.gif
+lib/msn/skins/Tux/smileys/confused.gif
+lib/msn/skins/Tux/smileys/sick.gif
+lib/msn/skins/Tux/smileys/note.gif
+lib/msn/skins/Tux/smileys/pizza.gif
+lib/msn/skins/Tux/smileys/rainbow.gif
+lib/msn/skins/Tux/smileys/party.gif
+lib/msn/skins/Tux/smileys/mobile_phone.gif
+lib/msn/skins/Tux/smileys/smilec.gif
+lib/msn/skins/Tux/smileys/envelope.gif
+lib/msn/skins/Tux/smileys/dog.gif
+lib/msn/skins/Tux/smileys/wink_smile.gif
+lib/msn/skins/Tux/smileys/present.gif
+lib/msn/skins/Tux/smileys/plate.gif
+lib/msn/skins/Tux/smileys/thinking.gif
+lib/msn/skins/Tux/smileys/ruler.gif
+lib/msn/skins/Tux/smileys/auto.gif
+lib/msn/skins/Tux/smileys/sarcastic.gif
+lib/msn/skins/Tux/smileys/cigarette.gif
+lib/msn/skins/Tux/smileys/cigarette.xcf
+lib/msn/skins/Tux/smileys/guy_hug.gif
+lib/msn/skins/Tux/smileys/beer_mug.gif
+lib/msn/skins/Tux/smileys/airplane.gif
+lib/msn/skins/Tux/smileys/handcuffs.gif
+lib/msn/skins/Tux/smileys/sleepy.gif
+lib/msn/skins/Tux/smileys/heart.gif
+lib/msn/skins/Tux/smileys/film.gif
+lib/msn/skins/Tux/smileys/hahaha.gif
+lib/msn/skins/Tux/smileys/messenger.gif
+lib/msn/skins/Tux/smileys/cake.gif
+lib/msn/skins/Tux/smileys/shades.gif
+lib/msn/skins/Tux/smileys/soccer.gif
+lib/msn/skins/Tux/smileys/console.gif
+lib/msn/skins/Tux/smileys/regular_smile.gif
+lib/msn/skins/Tux/smileys/tongue_smile.gif
+lib/msn/skins/Tux/smileys/umbrella.gif
+lib/msn/skins/Tux/smileys/sun.gif
+lib/msn/skins/Tux/smileys/thumbs_down.gif
+lib/msn/skins/Tux/smileys/kiss.gif
+lib/msn/skins/Tux/smileys/martini.gif
+lib/msn/skins/Tux/smileys/moon.gif
+lib/msn/skins/Tux/smileys/roll.gif
+lib/msn/skins/Tux/smileys/island_palm.gif
+lib/msn/skins/Tux/smileys/clock.gif
+lib/msn/skins/Tux/smileys/black_sheep.gif
+lib/msn/skins/Tux/smileys/wilted_rose.gif
+lib/msn/skins/Tux/smileys/coffee.gif
+lib/msn/skins/Tux/smileys/rose.gif
+lib/msn/skins/Tux/smileys/lightbulb.gif
+lib/msn/skins/Tux/smileys/nerd.gif
+lib/msn/skins/Tux/smileys/angry.gif
+lib/msn/skins/Tux/smileys/broken_heart.gif
+lib/msn/skins/Tux/smileys/thumbs_up.gif
+lib/msn/skins/Tux/smileys/star2.gif
+lib/msn/skins/Tux/smileys/star.gif
+lib/msn/skins/Tux/smileys/guy.gif
+lib/msn/skins/Tux/smileys/bat.gif
+lib/msn/skins/Tux/smileys/wu.gif
+lib/msn/skins/Tux/smileys/omg.gif
+lib/msn/skins/Tux/smileys/phone.gif
+lib/msn/skins/Tux/smileys/teeth_smile.gif
+lib/msn/skins/Tux/smileys/computer.gif
+lib/msn/skins/Tux/smileys/pizaa.gif
+lib/msn/skins/Tux/smileys/asl.gif
+lib/msn/skins/Tux/smileys/turtle.gif
+lib/msn/skins/Tux/smileys/camera.gif
+lib/msn/skins/Tux/smileys/dont_know.gif
+lib/msn/skins/Tux/smileys/stormy.gif
+lib/msn/skins/Tux/smileys/devil_smile.gif
+lib/msn/skins/Tux/smileys/cat.gif
+lib/msn/skins/Tux/smileys/girl_hug.gif
+lib/msn/skins/Tux/smileys/money.gif
+lib/msn/skins/Tux/smileys/brb.gif
+lib/msn/skins/Tux/smileys/secret.gif
+lib/msn/skins/Tux/smileys/dont_tell.gif
+lib/msn/skins/Tux/smileys/what_smile.gif
+lib/msn/skins/Tux/smileys/snail.gif
+lib/msn/skins/Tux/smileys/angel_smile.gif
+lib/msn/skins/Tux/smileys/regular_smiley.gif
+lib/msn/skins/Tux/smileys/bowl.gif
+lib/msn/skins/Tux/settings.xml
+lib/msn/skins/Tux/desc.txt
 lib/msn/skins/Tux/displaypic/null
+lib/msn/skins/Tux/displaypic/amsn.dat
 lib/msn/skins/Tux/displaypic/tux.dat
 lib/msn/skins/Tux/displaypic/tux.png
-lib/msn/skins/Tux/license
-lib/msn/skins/Tux/settings.xml
+lib/msn/skins/Tux/displaypic/loading.gif
+lib/msn/skins/Tux/displaypic/nopic.gif
+lib/msn/skins/Tux/pixmaps/prefpers.gif
+lib/msn/skins/Tux/pixmaps/prefhist2.gif
+lib/msn/skins/Tux/pixmaps/prefhist3.gif
+lib/msn/skins/Tux/pixmaps/donline.xpm
 lib/msn/skins/Tux/pixmaps/amsn.xbm
-lib/msn/skins/Tux/pixmaps/amsnicon.gif
-lib/msn/skins/Tux/pixmaps/amsnmask.xbm
-lib/msn/skins/Tux/pixmaps/away.gif
-lib/msn/skins/Tux/pixmaps/back.gif
-lib/msn/skins/Tux/pixmaps/baway.gif
+lib/msn/skins/Tux/pixmaps/loganim.gif
+lib/msn/skins/Tux/pixmaps/butsmile.gif
+lib/msn/skins/Tux/pixmaps/notifico.gif
 lib/msn/skins/Tux/pixmaps/bbusy.gif
-lib/msn/skins/Tux/pixmaps/blocked.gif
-lib/msn/skins/Tux/pixmaps/blockedme.gif
+lib/msn/skins/Tux/pixmaps/dphone.xpm
+lib/msn/skins/Tux/pixmaps/online.gif
 lib/msn/skins/Tux/pixmaps/boffline.gif
-lib/msn/skins/Tux/pixmaps/bonline.gif
-lib/msn/skins/Tux/pixmaps/busy.gif
-lib/msn/skins/Tux/pixmaps/butblock.gif
-lib/msn/skins/Tux/pixmaps/butfont.gif
-lib/msn/skins/Tux/pixmaps/butinvite.gif
-lib/msn/skins/Tux/pixmaps/butsend.gif
-lib/msn/skins/Tux/pixmaps/butsmile.gif
-lib/msn/skins/Tux/pixmaps/colorbar.gif
-lib/msn/skins/Tux/pixmaps/contract.gif
-lib/msn/skins/Tux/pixmaps/daway.xpm
+lib/msn/skins/Tux/pixmaps/blocked.gif
 lib/msn/skins/Tux/pixmaps/dbrb.xpm
 lib/msn/skins/Tux/pixmaps/dbusy.xpm
-lib/msn/skins/Tux/pixmaps/dhidden.xpm
-lib/msn/skins/Tux/pixmaps/dinactive.xpm
-lib/msn/skins/Tux/pixmaps/dlunch.xpm
-lib/msn/skins/Tux/pixmaps/doffline.xpm
-lib/msn/skins/Tux/pixmaps/donline.xpm
-lib/msn/skins/Tux/pixmaps/dphone.xpm
-lib/msn/skins/Tux/pixmaps/expand.gif
-lib/msn/skins/Tux/pixmaps/fticon.gif
-lib/msn/skins/Tux/pixmaps/ftreject.gif
-lib/msn/skins/Tux/pixmaps/globe.gif
-lib/msn/skins/Tux/pixmaps/imghide.gif
-lib/msn/skins/Tux/pixmaps/imgshow.gif
-lib/msn/skins/Tux/pixmaps/loganim.gif
-lib/msn/skins/Tux/pixmaps/logolinmsn.gif
-lib/msn/skins/Tux/pixmaps/logolinmsn.xcf
-lib/msn/skins/Tux/pixmaps/messenger.png
-lib/msn/skins/Tux/pixmaps/miniinfo.gif
-lib/msn/skins/Tux/pixmaps/minijoins.gif
-lib/msn/skins/Tux/pixmaps/minileaves.gif
+lib/msn/skins/Tux/pixmaps/prefemotic.gif
+lib/msn/skins/Tux/pixmaps/blockedme.gif
 lib/msn/skins/Tux/pixmaps/miniwarn.gif
-lib/msn/skins/Tux/pixmaps/msnbot.gif
-lib/msn/skins/Tux/pixmaps/notifclose.gif
-lib/msn/skins/Tux/pixmaps/notifico.gif
+lib/msn/skins/Tux/pixmaps/away.gif
+lib/msn/skins/Tux/pixmaps/typing.gif
 lib/msn/skins/Tux/pixmaps/notifyoffline.gif
 lib/msn/skins/Tux/pixmaps/notifyonline.gif
-lib/msn/skins/Tux/pixmaps/notifystate.gif
-lib/msn/skins/Tux/pixmaps/offline.gif
-lib/msn/skins/Tux/pixmaps/online.gif
-lib/msn/skins/Tux/pixmaps/prefalerts.gif
-lib/msn/skins/Tux/pixmaps/prefaway.gif
-lib/msn/skins/Tux/pixmaps/prefemotic.gif
+lib/msn/skins/Tux/pixmaps/dlunch.xpm
 lib/msn/skins/Tux/pixmaps/preffont.gif
-lib/msn/skins/Tux/pixmaps/prefhist.gif
-lib/msn/skins/Tux/pixmaps/prefhist2.gif
-lib/msn/skins/Tux/pixmaps/prefhist3.gif
-lib/msn/skins/Tux/pixmaps/preflook.gif
-lib/msn/skins/Tux/pixmaps/prefmsg.gif
+lib/msn/skins/Tux/pixmaps/butsend.gif
+lib/msn/skins/Tux/pixmaps/prefaway.gif
+lib/msn/skins/Tux/pixmaps/offline.gif
+lib/msn/skins/Tux/pixmaps/messenger.png
+lib/msn/skins/Tux/pixmaps/doffline.xpm
+lib/msn/skins/Tux/pixmaps/colorbar.gif
+lib/msn/skins/Tux/pixmaps/minileaves.gif
+lib/msn/skins/Tux/pixmaps/imgshow.gif
 lib/msn/skins/Tux/pixmaps/prefnat.gif
-lib/msn/skins/Tux/pixmaps/prefpers.gif
 lib/msn/skins/Tux/pixmaps/prefphone.gif
+lib/msn/skins/Tux/pixmaps/butblock.gif
+lib/msn/skins/Tux/pixmaps/miniinfo.gif
+lib/msn/skins/Tux/pixmaps/dinactive.xpm
+lib/msn/skins/Tux/pixmaps/butinvite.gif
+lib/msn/skins/Tux/pixmaps/prefmsg.gif
+lib/msn/skins/Tux/pixmaps/baway.gif
+lib/msn/skins/Tux/pixmaps/minijoins.gif
+lib/msn/skins/Tux/pixmaps/bonline.gif
+lib/msn/skins/Tux/pixmaps/prefalerts.gif
+lib/msn/skins/Tux/pixmaps/unread.gif
 lib/msn/skins/Tux/pixmaps/prefprofile.gif
-lib/msn/skins/Tux/pixmaps/prefproxy.gif
+lib/msn/skins/Tux/pixmaps/daway.xpm
 lib/msn/skins/Tux/pixmaps/prefstatus.gif
+lib/msn/skins/Tux/pixmaps/logolinmsn.gif
+lib/msn/skins/Tux/pixmaps/logolinmsn.xcf
+lib/msn/skins/Tux/pixmaps/back.gif
+lib/msn/skins/Tux/pixmaps/prefproxy.gif
+lib/msn/skins/Tux/pixmaps/contract.gif
+lib/msn/skins/Tux/pixmaps/prefhist.gif
+lib/msn/skins/Tux/pixmaps/imghide.gif
+lib/msn/skins/Tux/pixmaps/expand.gif
+lib/msn/skins/Tux/pixmaps/fticon.gif
+lib/msn/skins/Tux/pixmaps/ftreject.gif
+lib/msn/skins/Tux/pixmaps/globe.gif
+lib/msn/skins/Tux/pixmaps/msnbot.gif
+lib/msn/skins/Tux/pixmaps/notifystate.gif
+lib/msn/skins/Tux/pixmaps/sendbut.gif
+lib/msn/skins/Tux/pixmaps/amsnicon.gif
+lib/msn/skins/Tux/pixmaps/busy.gif
+lib/msn/skins/Tux/pixmaps/dhidden.xpm
+lib/msn/skins/Tux/pixmaps/notifclose.gif
 lib/msn/skins/Tux/pixmaps/read.gif
-lib/msn/skins/Tux/pixmaps/typing.gif
-lib/msn/skins/Tux/pixmaps/unread.gif
-lib/msn/skins/Tux/smileys/airplane.gif
-lib/msn/skins/Tux/smileys/angel_smile.gif
-lib/msn/skins/Tux/smileys/angry.gif
-lib/msn/skins/Tux/smileys/asl.gif
-lib/msn/skins/Tux/smileys/auto.gif
-lib/msn/skins/Tux/smileys/baring_teeth.gif
-lib/msn/skins/Tux/smileys/bat.gif
-lib/msn/skins/Tux/smileys/beer_mug.gif
-lib/msn/skins/Tux/smileys/black_sheep.gif
-lib/msn/skins/Tux/smileys/bowl.gif
-lib/msn/skins/Tux/smileys/brb.gif
-lib/msn/skins/Tux/smileys/broken_heart.gif
-lib/msn/skins/Tux/smileys/cake.gif
-lib/msn/skins/Tux/smileys/camera.gif
-lib/msn/skins/Tux/smileys/cat.gif
-lib/msn/skins/Tux/smileys/cigarette.gif
-lib/msn/skins/Tux/smileys/cigarette.xcf
-lib/msn/skins/Tux/smileys/clock.gif
-lib/msn/skins/Tux/smileys/coffee.gif
-lib/msn/skins/Tux/smileys/computer.gif
-lib/msn/skins/Tux/smileys/confused.gif
-lib/msn/skins/Tux/smileys/console.gif
-lib/msn/skins/Tux/smileys/cry.gif
-lib/msn/skins/Tux/smileys/devil_smile.gif
-lib/msn/skins/Tux/smileys/dog.gif
-lib/msn/skins/Tux/smileys/dont_know.gif
-lib/msn/skins/Tux/smileys/dont_tell.gif
-lib/msn/skins/Tux/smileys/envelope.gif
-lib/msn/skins/Tux/smileys/film.gif
-lib/msn/skins/Tux/smileys/girl.gif
-lib/msn/skins/Tux/smileys/girl_hug.gif
-lib/msn/skins/Tux/smileys/guy.gif
-lib/msn/skins/Tux/smileys/guy_hug.gif
-lib/msn/skins/Tux/smileys/hahaha.gif
-lib/msn/skins/Tux/smileys/handcuffs.gif
-lib/msn/skins/Tux/smileys/heart.gif
-lib/msn/skins/Tux/smileys/island_palm.gif
-lib/msn/skins/Tux/smileys/kiss.gif
-lib/msn/skins/Tux/smileys/lightbulb.gif
-lib/msn/skins/Tux/smileys/lightning.gif
-lib/msn/skins/Tux/smileys/martini.gif
-lib/msn/skins/Tux/smileys/messenger.gif
-lib/msn/skins/Tux/smileys/mobile_phone.gif
-lib/msn/skins/Tux/smileys/money.gif
-lib/msn/skins/Tux/smileys/moon.gif
-lib/msn/skins/Tux/smileys/nerd.gif
-lib/msn/skins/Tux/smileys/note.gif
-lib/msn/skins/Tux/smileys/omg.gif
-lib/msn/skins/Tux/smileys/party.gif
-lib/msn/skins/Tux/smileys/phone.gif
-lib/msn/skins/Tux/smileys/pizaa.gif
-lib/msn/skins/Tux/smileys/pizza.gif
-lib/msn/skins/Tux/smileys/plate.gif
-lib/msn/skins/Tux/smileys/present.gif
-lib/msn/skins/Tux/smileys/rainbow.gif
-lib/msn/skins/Tux/smileys/red.gif
-lib/msn/skins/Tux/smileys/regular_smile.gif
-lib/msn/skins/Tux/smileys/regular_smiley.gif
-lib/msn/skins/Tux/smileys/roll.gif
-lib/msn/skins/Tux/smileys/rose.gif
-lib/msn/skins/Tux/smileys/ruler.gif
-lib/msn/skins/Tux/smileys/sad_smile.gif
-lib/msn/skins/Tux/smileys/sarcastic.gif
-lib/msn/skins/Tux/smileys/secret.gif
-lib/msn/skins/Tux/smileys/shades.gif
-lib/msn/skins/Tux/smileys/sick.gif
-lib/msn/skins/Tux/smileys/sleepy.gif
-lib/msn/skins/Tux/smileys/smilec.gif
-lib/msn/skins/Tux/smileys/snail.gif
-lib/msn/skins/Tux/smileys/soccer.gif
-lib/msn/skins/Tux/smileys/sun.gif
-lib/msn/skins/Tux/smileys/star.gif
-lib/msn/skins/Tux/smileys/star2.gif
-lib/msn/skins/Tux/smileys/stormy.gif
-lib/msn/skins/Tux/smileys/teeth_smile.gif
-lib/msn/skins/Tux/smileys/thinking.gif
-lib/msn/skins/Tux/smileys/thumbs_down.gif
-lib/msn/skins/Tux/smileys/thumbs_up.gif
-lib/msn/skins/Tux/smileys/tongue_smile.gif
-lib/msn/skins/Tux/smileys/turtle.gif
-lib/msn/skins/Tux/smileys/umbrella.gif
-lib/msn/skins/Tux/smileys/what_smile.gif
-lib/msn/skins/Tux/smileys/wilted_rose.gif
-lib/msn/skins/Tux/smileys/wink_smile.gif
-lib/msn/skins/Tux/smileys/wu.gif
+lib/msn/skins/Tux/pixmaps/preflook.gif
+lib/msn/skins/Tux/pixmaps/amsnmask.xbm
+lib/msn/skins/Tux/pixmaps/butfont.gif
+lib/msn/skins/default/license
+lib/msn/skins/default/smileys/boy_hug.gif
+lib/msn/skins/default/smileys/null
+lib/msn/skins/default/smileys/brokenheart.gif
+lib/msn/skins/default/smileys/cocktail.gif
+lib/msn/skins/default/smileys/girl.gif
+lib/msn/skins/default/smileys/blush.gif
+lib/msn/skins/default/smileys/yay.gif
+lib/msn/skins/default/smileys/lightning.gif
+lib/msn/skins/default/smileys/confused.gif
+lib/msn/skins/default/smileys/sick.gif
+lib/msn/skins/default/smileys/note.gif
+lib/msn/skins/default/smileys/plane.gif
+lib/msn/skins/default/smileys/pizza.gif
+lib/msn/skins/default/smileys/rainbow.gif
+lib/msn/skins/default/smileys/party.gif
+lib/msn/skins/default/smileys/happy.gif
+lib/msn/skins/default/smileys/hmmm.gif
+lib/msn/skins/default/smileys/smilec.gif
+lib/msn/skins/default/smileys/envelope.gif
+lib/msn/skins/default/smileys/sad.gif
+lib/msn/skins/default/smileys/dog.gif
+lib/msn/skins/default/smileys/present.gif
+lib/msn/skins/default/smileys/plate.gif
+lib/msn/skins/default/smileys/ohaye.gif
+lib/msn/skins/default/smileys/mobile.gif
+lib/msn/skins/default/smileys/xbox.gif
+lib/msn/skins/default/smileys/cigarette.gif
+lib/msn/skins/default/smileys/beer.gif
+lib/msn/skins/default/smileys/crossed.gif
+lib/msn/skins/default/smileys/what.gif
+lib/msn/skins/default/smileys/handcuffs.gif
+lib/msn/skins/default/smileys/highfive.gif
+lib/msn/skins/default/smileys/grrr.gif
+lib/msn/skins/default/smileys/messenger.gif
+lib/msn/skins/default/smileys/crying.gif
+lib/msn/skins/default/smileys/rolleyes.gif
+lib/msn/skins/default/smileys/cake.gif
+lib/msn/skins/default/smileys/rain.gif
+lib/msn/skins/default/smileys/umbrella.gif
+lib/msn/skins/default/smileys/sun.gif
+lib/msn/skins/default/smileys/angel.gif
+lib/msn/skins/default/smileys/kiss.gif
+lib/msn/skins/default/smileys/moon.gif
+lib/msn/skins/default/smileys/cool.gif
+lib/msn/skins/default/smileys/clock.gif
+lib/msn/skins/default/smileys/whisper.gif
+lib/msn/skins/default/smileys/dunno.gif
+lib/msn/skins/default/smileys/zippit.gif
+lib/msn/skins/default/smileys/coffee.gif
+lib/msn/skins/default/smileys/rose.gif
+lib/msn/skins/default/smileys/coins.gif
+lib/msn/skins/default/smileys/lightbulb.gif
+lib/msn/skins/default/smileys/angry.gif
+lib/msn/skins/default/smileys/wink.gif
+lib/msn/skins/default/smileys/disagree.gif
+lib/msn/skins/default/smileys/filmreel.gif
+lib/msn/skins/default/smileys/star.gif
+lib/msn/skins/default/smileys/bat.gif
+lib/msn/skins/default/smileys/omg.gif
+lib/msn/skins/default/smileys/phone.gif
+lib/msn/skins/default/smileys/horny.gif
+lib/msn/skins/default/smileys/glasses.gif
+lib/msn/skins/default/smileys/football.gif
+lib/msn/skins/default/smileys/computer.gif
+lib/msn/skins/default/smileys/asl.gif
+lib/msn/skins/default/smileys/turtle.gif
+lib/msn/skins/default/smileys/yawn.gif
+lib/msn/skins/default/smileys/desertisland.gif
+lib/msn/skins/default/smileys/camera.gif
+lib/msn/skins/default/smileys/wilted.gif
+lib/msn/skins/default/smileys/car.gif
+lib/msn/skins/default/smileys/cat.gif
+lib/msn/skins/default/smileys/agree.gif
+lib/msn/skins/default/smileys/girl_hug.gif
+lib/msn/skins/default/smileys/boy.gif
+lib/msn/skins/default/smileys/sheep.gif
+lib/msn/skins/default/smileys/brb.gif
+lib/msn/skins/default/smileys/love.gif
+lib/msn/skins/default/smileys/snail.gif
+lib/msn/skins/default/smileys/diablo.gif
+lib/msn/skins/default/smileys/cheeky.gif
+lib/msn/skins/default/winicons/online.ico
+lib/msn/skins/default/winicons/inactive.ico
+lib/msn/skins/default/winicons/away.ico
+lib/msn/skins/default/winicons/bossmode.ico
+lib/msn/skins/default/winicons/offline.ico
+lib/msn/skins/default/winicons/msn.ico
+lib/msn/skins/default/winicons/unread.ico
+lib/msn/skins/default/winicons/phone.ico
+lib/msn/skins/default/winicons/busy.ico
+lib/msn/skins/default/winicons/brb.ico
+lib/msn/skins/default/winicons/hidden.ico
+lib/msn/skins/default/winicons/lunch.ico
+lib/msn/skins/default/settings.xml
+lib/msn/skins/default/sounds/null
+lib/msn/skins/default/sounds/online.wav
+lib/msn/skins/default/sounds/type.wav
+lib/msn/skins/default/sounds/newemail.wav
+lib/msn/skins/default/sounds/offline.wav
+lib/msn/skins/default/sounds/alarm.wav
+lib/msn/skins/default/desc.txt
+lib/msn/skins/default/displaypic/null
 lib/msn/skins/default/displaypic/amsn.dat
 lib/msn/skins/default/displaypic/amsn.gif
 lib/msn/skins/default/displaypic/amsn.png
-lib/msn/skins/default/displaypic/ball.dat
-lib/msn/skins/default/displaypic/ball.gif
-lib/msn/skins/default/displaypic/ball.png
 lib/msn/skins/default/displaypic/blood.dat
 lib/msn/skins/default/displaypic/blood.gif
 lib/msn/skins/default/displaypic/blood.png
-lib/msn/skins/default/displaypic/car.dat
-lib/msn/skins/default/displaypic/car.gif
-lib/msn/skins/default/displaypic/car.png
+lib/msn/skins/default/displaypic/skins_readme.txt
+lib/msn/skins/default/displaypic/rubberduck.dat
+lib/msn/skins/default/displaypic/rubberduck.gif
+lib/msn/skins/default/displaypic/rubberduck.png
 lib/msn/skins/default/displaypic/castle.dat
 lib/msn/skins/default/displaypic/castle.gif
 lib/msn/skins/default/displaypic/castle.png
@@ -315,311 +422,282 @@ lib/msn/skins/default/displaypic/doggie.png
 lib/msn/skins/default/displaypic/lightbulb.dat
 lib/msn/skins/default/displaypic/lightbulb.gif
 lib/msn/skins/default/displaypic/lightbulb.png
-lib/msn/skins/default/displaypic/loading.gif
 lib/msn/skins/default/displaypic/lock.dat
 lib/msn/skins/default/displaypic/lock.gif
 lib/msn/skins/default/displaypic/lock.png
-lib/msn/skins/default/displaypic/nopic.gif
-lib/msn/skins/default/displaypic/null
 lib/msn/skins/default/displaypic/phone.dat
 lib/msn/skins/default/displaypic/phone.gif
 lib/msn/skins/default/displaypic/phone.png
-lib/msn/skins/default/displaypic/rubberduck.dat
-lib/msn/skins/default/displaypic/rubberduck.gif
-lib/msn/skins/default/displaypic/rubberduck.png
+lib/msn/skins/default/displaypic/loading.gif
+lib/msn/skins/default/displaypic/nopic.gif
+lib/msn/skins/default/displaypic/ball.dat
+lib/msn/skins/default/displaypic/ball.gif
+lib/msn/skins/default/displaypic/ball.png
+lib/msn/skins/default/displaypic/car.dat
+lib/msn/skins/default/displaypic/car.gif
+lib/msn/skins/default/displaypic/car.png
 lib/msn/skins/default/displaypic/shell.dat
 lib/msn/skins/default/displaypic/shell.gif
 lib/msn/skins/default/displaypic/shell.png
-lib/msn/skins/default/displaypic/skins_readme.txt
-lib/msn/skins/default/desc.txt
-lib/msn/skins/default/license
-lib/msn/skins/default/settings.xml
-lib/msn/skins/default/pixmaps/alarm.gif
+lib/msn/skins/default/pixmaps/warning.gif
+lib/msn/skins/default/pixmaps/prefpers.gif
+lib/msn/skins/default/pixmaps/null
+lib/msn/skins/default/pixmaps/prefhist2.gif
+lib/msn/skins/default/pixmaps/prefhist3.gif
+lib/msn/skins/default/pixmaps/donline.xpm
 lib/msn/skins/default/pixmaps/amsn.xbm
-lib/msn/skins/default/pixmaps/amsnicon.gif
-lib/msn/skins/default/pixmaps/amsnmask.xbm
-lib/msn/skins/default/pixmaps/away.gif
-lib/msn/skins/default/pixmaps/back.gif
-lib/msn/skins/default/pixmaps/baway.gif
+lib/msn/skins/default/pixmaps/notifyoffline_1.gif
+lib/msn/skins/default/pixmaps/loganim.gif
+lib/msn/skins/default/pixmaps/butsmile.gif
+lib/msn/skins/default/pixmaps/notifico.gif
 lib/msn/skins/default/pixmaps/bbusy.gif
-lib/msn/skins/default/pixmaps/bell.gif
-lib/msn/skins/default/pixmaps/belloff.gif
-lib/msn/skins/default/pixmaps/blocked.gif
-lib/msn/skins/default/pixmaps/blockedme.gif
+lib/msn/skins/default/pixmaps/dphone.xpm
+lib/msn/skins/default/pixmaps/online.gif
+lib/msn/skins/default/pixmaps/newline.gif
 lib/msn/skins/default/pixmaps/boffline.gif
-lib/msn/skins/default/pixmaps/bonline.gif
-lib/msn/skins/default/pixmaps/busy.gif
-lib/msn/skins/default/pixmaps/butblock.gif
-lib/msn/skins/default/pixmaps/butfont.gif
-lib/msn/skins/default/pixmaps/buthide.gif
-lib/msn/skins/default/pixmaps/butinvite.gif
-lib/msn/skins/default/pixmaps/butsend.gif
-lib/msn/skins/default/pixmaps/butsend2.gif
-lib/msn/skins/default/pixmaps/butsend3.gif
-lib/msn/skins/default/pixmaps/null
-lib/msn/skins/default/pixmaps/butsmile.gif
-lib/msn/skins/default/pixmaps/colorbar.gif
-lib/msn/skins/default/pixmaps/contract.gif
-lib/msn/skins/default/pixmaps/daway.xpm
+lib/msn/skins/default/pixmaps/blocked.gif
 lib/msn/skins/default/pixmaps/dbrb.xpm
 lib/msn/skins/default/pixmaps/dbusy.xpm
-lib/msn/skins/default/pixmaps/dhidden.xpm
-lib/msn/skins/default/pixmaps/dinactive.xpm
-lib/msn/skins/default/pixmaps/dlunch.xpm
-lib/msn/skins/default/pixmaps/doffline.xpm
-lib/msn/skins/default/pixmaps/donline.xpm
-lib/msn/skins/default/pixmaps/download.gif
-lib/msn/skins/default/pixmaps/dphone.xpm
-lib/msn/skins/default/pixmaps/expand.gif
-lib/msn/skins/default/pixmaps/fticon.gif
-lib/msn/skins/default/pixmaps/ftreject.gif
-lib/msn/skins/default/pixmaps/globe.gif
-lib/msn/skins/default/pixmaps/imghide.gif
-lib/msn/skins/default/pixmaps/imgshow.gif
-lib/msn/skins/default/pixmaps/loganim.gif
-lib/msn/skins/default/pixmaps/logolinmsn.gif
-lib/msn/skins/default/pixmaps/logomacmsn.gif
-lib/msn/skins/default/pixmaps/messenger.png
-lib/msn/skins/default/pixmaps/miniinfo.gif
-lib/msn/skins/default/pixmaps/minijoins.gif
-lib/msn/skins/default/pixmaps/minileaves.gif
+lib/msn/skins/default/pixmaps/prefemotic.gif
 lib/msn/skins/default/pixmaps/miniwarn.gif
-lib/msn/skins/default/pixmaps/msnbot.gif
-lib/msn/skins/default/pixmaps/notifclose.gif
-lib/msn/skins/default/pixmaps/notifico.gif
+lib/msn/skins/default/pixmaps/away.gif
+lib/msn/skins/default/pixmaps/typing.gif
 lib/msn/skins/default/pixmaps/notifyoffline.gif
-lib/msn/skins/default/pixmaps/notifyoffline_1.gif
 lib/msn/skins/default/pixmaps/notifyonline.gif
-lib/msn/skins/default/pixmaps/notifyonline_1.gif
-lib/msn/skins/default/pixmaps/notifystate.gif
-lib/msn/skins/default/pixmaps/notifystate_1.gif
+lib/msn/skins/default/pixmaps/dlunch.xpm
 lib/msn/skins/default/pixmaps/notinlist.gif
-lib/msn/skins/default/pixmaps/offline.gif
-lib/msn/skins/default/pixmaps/online.gif
-lib/msn/skins/default/pixmaps/prefalerts.gif
-lib/msn/skins/default/pixmaps/prefaway.gif
-lib/msn/skins/default/pixmaps/prefemotic.gif
 lib/msn/skins/default/pixmaps/preffont.gif
-lib/msn/skins/default/pixmaps/prefhist.gif
-lib/msn/skins/default/pixmaps/prefhist2.gif
-lib/msn/skins/default/pixmaps/prefhist3.gif
-lib/msn/skins/default/pixmaps/preflook.gif
-lib/msn/skins/default/pixmaps/prefmsg.gif
+lib/msn/skins/default/pixmaps/butsend.gif
+lib/msn/skins/default/pixmaps/prefaway.gif
+lib/msn/skins/default/pixmaps/offline.gif
+lib/msn/skins/default/pixmaps/messenger.png
+lib/msn/skins/default/pixmaps/bell.gif
+lib/msn/skins/default/pixmaps/doffline.xpm
+lib/msn/skins/default/pixmaps/colorbar.gif
+lib/msn/skins/default/pixmaps/minileaves.gif
+lib/msn/skins/default/pixmaps/imgshow.gif
 lib/msn/skins/default/pixmaps/prefnat.gif
-lib/msn/skins/default/pixmaps/prefpers.gif
 lib/msn/skins/default/pixmaps/prefphone.gif
+lib/msn/skins/default/pixmaps/butblock.gif
+lib/msn/skins/default/pixmaps/miniinfo.gif
+lib/msn/skins/default/pixmaps/dinactive.xpm
+lib/msn/skins/default/pixmaps/butinvite.gif
+lib/msn/skins/default/pixmaps/prefmsg.gif
+lib/msn/skins/default/pixmaps/smile.gif
+lib/msn/skins/default/pixmaps/baway.gif
+lib/msn/skins/default/pixmaps/alarm.gif
+lib/msn/skins/default/pixmaps/minijoins.gif
+lib/msn/skins/default/pixmaps/bonline.gif
+lib/msn/skins/default/pixmaps/prefalerts.gif
+lib/msn/skins/default/pixmaps/unread.gif
 lib/msn/skins/default/pixmaps/prefprofile.gif
-lib/msn/skins/default/pixmaps/prefproxy.gif
+lib/msn/skins/default/pixmaps/daway.xpm
+lib/msn/skins/default/pixmaps/notifyonline_1.gif
 lib/msn/skins/default/pixmaps/prefstatus.gif
+lib/msn/skins/default/pixmaps/logolinmsn.gif
+lib/msn/skins/default/pixmaps/back.gif
+lib/msn/skins/default/pixmaps/prefproxy.gif
+lib/msn/skins/default/pixmaps/belloff.gif
+lib/msn/skins/default/pixmaps/contract.gif
+lib/msn/skins/default/pixmaps/prefhist.gif
+lib/msn/skins/default/pixmaps/imghide.gif
+lib/msn/skins/default/pixmaps/expand.gif
+lib/msn/skins/default/pixmaps/fticon.gif
+lib/msn/skins/default/pixmaps/ftreject.gif
+lib/msn/skins/default/pixmaps/globe.gif
+lib/msn/skins/default/pixmaps/msnbot.gif
+lib/msn/skins/default/pixmaps/notifystate.gif
 lib/msn/skins/default/pixmaps/sendbut.gif
-lib/msn/skins/default/pixmaps/typing.gif
-lib/msn/skins/default/pixmaps/unread.gif
-lib/msn/skins/default/pixmaps/warning.gif
-lib/msn/skins/default/smileys/agree.gif
-lib/msn/skins/default/smileys/angel.gif
-lib/msn/skins/default/smileys/angry.gif
-lib/msn/skins/default/smileys/asl.gif
-lib/msn/skins/default/smileys/bat.gif
-lib/msn/skins/default/smileys/beer.gif
-lib/msn/skins/default/smileys/blush.gif
-lib/msn/skins/default/smileys/boy.gif
-lib/msn/skins/default/smileys/boy_hug.gif
-lib/msn/skins/default/smileys/brb.gif
-lib/msn/skins/default/smileys/brokenheart.gif
-lib/msn/skins/default/smileys/cake.gif
-lib/msn/skins/default/smileys/camera.gif
-lib/msn/skins/default/smileys/car.gif
-lib/msn/skins/default/smileys/cat.gif
-lib/msn/skins/default/smileys/cheeky.gif
-lib/msn/skins/default/smileys/cigarette.gif
-lib/msn/skins/default/smileys/clock.gif
-lib/msn/skins/default/smileys/cocktail.gif
-lib/msn/skins/default/smileys/coffee.gif
-lib/msn/skins/default/smileys/coins.gif
-lib/msn/skins/default/smileys/computer.gif
-lib/msn/skins/default/smileys/confused.gif
-lib/msn/skins/default/smileys/cool.gif
-lib/msn/skins/default/smileys/crossed.gif
-lib/msn/skins/default/smileys/crying.gif
-lib/msn/skins/default/smileys/desertisland.gif
-lib/msn/skins/default/smileys/diablo.gif
-lib/msn/skins/default/smileys/disagree.gif
-lib/msn/skins/default/smileys/dog.gif
-lib/msn/skins/default/smileys/dunno.gif
-lib/msn/skins/default/smileys/envelope.gif
-lib/msn/skins/default/smileys/filmreel.gif
-lib/msn/skins/default/smileys/football.gif
-lib/msn/skins/default/smileys/girl.gif
-lib/msn/skins/default/smileys/girl_hug.gif
-lib/msn/skins/default/smileys/glasses.gif
-lib/msn/skins/default/smileys/grrr.gif
-lib/msn/skins/default/smileys/handcuffs.gif
-lib/msn/skins/default/smileys/happy.gif
-lib/msn/skins/default/smileys/highfive.gif
-lib/msn/skins/default/smileys/hmmm.gif
-lib/msn/skins/default/smileys/horny.gif
-lib/msn/skins/default/smileys/kiss.gif
-lib/msn/skins/default/smileys/lightbulb.gif
-lib/msn/skins/default/smileys/lightning.gif
-lib/msn/skins/default/smileys/love.gif
-lib/msn/skins/default/smileys/messenger.gif
-lib/msn/skins/default/smileys/mobile.gif
-lib/msn/skins/default/smileys/moon.gif
-lib/msn/skins/default/smileys/note.gif
-lib/msn/skins/default/smileys/null
-lib/msn/skins/default/smileys/ohaye.gif
-lib/msn/skins/default/smileys/omg.gif
-lib/msn/skins/default/smileys/party.gif
-lib/msn/skins/default/smileys/phone.gif
-lib/msn/skins/default/smileys/pizza.gif
-lib/msn/skins/default/smileys/plane.gif
-lib/msn/skins/default/smileys/plate.gif
-lib/msn/skins/default/smileys/present.gif
-lib/msn/skins/default/smileys/rain.gif
-lib/msn/skins/default/smileys/rainbow.gif
-lib/msn/skins/default/smileys/rolleyes.gif
-lib/msn/skins/default/smileys/rose.gif
-lib/msn/skins/default/smileys/sad.gif
-lib/msn/skins/default/smileys/sheep.gif
-lib/msn/skins/default/smileys/sick.gif
-lib/msn/skins/default/smileys/smilec.gif
-lib/msn/skins/default/smileys/snail.gif
-lib/msn/skins/default/smileys/star.gif
-lib/msn/skins/default/smileys/sun.gif
-lib/msn/skins/default/smileys/turtle.gif
-lib/msn/skins/default/smileys/what.gif
-lib/msn/skins/default/smileys/umbrella.gif
-lib/msn/skins/default/smileys/whisper.gif
-lib/msn/skins/default/smileys/wilted.gif
-lib/msn/skins/default/smileys/wink.gif
-lib/msn/skins/default/smileys/xbox.gif
-lib/msn/skins/default/smileys/yawn.gif
-lib/msn/skins/default/smileys/yay.gif
-lib/msn/skins/default/smileys/zippit.gif
-lib/msn/skins/default/sounds/alarm.wav
-lib/msn/skins/default/sounds/newemail.wav
-lib/msn/skins/default/sounds/null
-lib/msn/skins/default/sounds/offline.wav
-lib/msn/skins/default/sounds/online.wav
-lib/msn/skins/default/sounds/type.wav
-lib/msn/plugins/BWidget-1.7.0/CHANGES.txt
-lib/msn/plugins/BWidget-1.7.0/ChangeLog
-lib/msn/plugins/BWidget-1.7.0/LICENSE.txt
-lib/msn/plugins/BWidget-1.7.0/Makefile.in
-lib/msn/plugins/BWidget-1.7.0/README.txt
-lib/msn/plugins/BWidget-1.7.0/aclocal.m4
-lib/msn/plugins/BWidget-1.7.0/arrow.tcl
-lib/msn/plugins/BWidget-1.7.0/bitmap.tcl
-lib/msn/plugins/BWidget-1.7.0/button.tcl
-lib/msn/plugins/BWidget-1.7.0/buttonbox.tcl
+lib/msn/skins/default/pixmaps/amsnicon.gif
+lib/msn/skins/default/pixmaps/logomacmsn.gif
+lib/msn/skins/default/pixmaps/busy.gif
+lib/msn/skins/default/pixmaps/dhidden.xpm
+lib/msn/skins/default/pixmaps/notifclose.gif
+lib/msn/skins/default/pixmaps/butsend2.gif
+lib/msn/skins/default/pixmaps/butsend3.gif
+lib/msn/skins/default/pixmaps/notifystate_1.gif
+lib/msn/skins/default/pixmaps/preflook.gif
+lib/msn/skins/default/pixmaps/download.gif
+lib/msn/skins/default/pixmaps/amsnmask.xbm
+lib/msn/skins/default/pixmaps/butfont.gif
+lib/msn/AppMain.tcl
+lib/msn/utils/amsn-installer
+lib/msn/utils/plwav.exe
+lib/msn/utils/update-amsn.sh
+lib/msn/utils/qtplay
+lib/msn/utils/amsnctl.pl
+lib/msn/README
+lib/msn/migmd5.tcl
+lib/msn/smileys.tcl
+lib/msn/ctadverts.tcl
+lib/msn/notes.tcl
+lib/msn/automsg.tcl
+lib/msn/remote.help
+lib/msn/remote.tcl
+lib/msn/skins.tcl
+lib/msn/config.tcl
+lib/msn/sxml.tcl
+lib/msn/mutex.tcl
+lib/msn/progressbar.tcl
+lib/msn/anigif.tcl
+lib/msn/protocol.tcl
+lib/msn/hotmlog.htm
+lib/msn/alarm.tcl
+lib/msn/combobox.tcl
+lib/msn/abook.tcl
+lib/msn/gui.tcl
+lib/msn/trayicon.tcl
+lib/msn/amsn-remote
+lib/msn/lang.tcl
+lib/msn/langlist
+lib/msn/xmms.tcl
+lib/msn/preferences.tcl
+lib/msn/ctthemes.tcl
+lib/msn/balloon.tcl
+lib/msn/socks.tcl
+lib/msn/hotmail.tcl
+lib/msn/blocking.tcl
+lib/msn/plugins/sha1/pkgIndex.tcl
+lib/msn/plugins/sha1/sha1.tcl
+lib/msn/plugins/traydock/README
+lib/msn/plugins/traydock/configure
+lib/msn/plugins/traydock/Makefile.in
+lib/msn/plugins/traydock/config.h.in
+lib/msn/plugins/traydock/tray.c
+lib/msn/plugins/plugins.txt
+lib/msn/plugins/gtkdock.c
+lib/msn/plugins/gtkdock.h
+lib/msn/plugins/icons/online.xpm
+lib/msn/plugins/icons/away.xpm
+lib/msn/plugins/icons/offline.xpm
+lib/msn/plugins/icons/noact.xpm
+lib/msn/plugins/icons/onphone.xpm
+lib/msn/plugins/icons/appear.xpm
+lib/msn/plugins/icons/dock_icons.xpm
+lib/msn/plugins/icons/busy.xpm
+lib/msn/plugins/icons/brb.xpm
+lib/msn/plugins/icons/lunch.xpm
+lib/msn/plugins/tclzlib/pkgIndex.tcl
+lib/msn/plugins/tclzlib/tclzlib.tcl
+lib/msn/plugins/base64/pkgIndex.tcl
+lib/msn/plugins/base64/yencode.tcl
+lib/msn/plugins/base64/base64.tcl
+lib/msn/plugins/base64/uuencode.tcl
+lib/msn/plugins/BWidget-1.7.0/lang/en.rc
+lib/msn/plugins/BWidget-1.7.0/labelentry.tcl
+lib/msn/plugins/BWidget-1.7.0/tree.tcl
 lib/msn/plugins/BWidget-1.7.0/color.tcl
-lib/msn/plugins/BWidget-1.7.0/combobox.tcl
-lib/msn/plugins/BWidget-1.7.0/configure.in
-lib/msn/plugins/BWidget-1.7.0/dialog.tcl
+lib/msn/plugins/BWidget-1.7.0/aclocal.m4
 lib/msn/plugins/BWidget-1.7.0/dragsite.tcl
-lib/msn/plugins/BWidget-1.7.0/dropsite.tcl
-lib/msn/plugins/BWidget-1.7.0/dynhelp.tcl
-lib/msn/plugins/BWidget-1.7.0/entry.tcl
+lib/msn/plugins/BWidget-1.7.0/widget.tcl
+lib/msn/plugins/BWidget-1.7.0/pkgIndex.tcl
+lib/msn/plugins/BWidget-1.7.0/scrollview.tcl
+lib/msn/plugins/BWidget-1.7.0/labelframe.tcl
+lib/msn/plugins/BWidget-1.7.0/label.tcl
 lib/msn/plugins/BWidget-1.7.0/font.tcl
-lib/msn/plugins/BWidget-1.7.0/images/bold.gif
-lib/msn/plugins/BWidget-1.7.0/images/copy.gif
+lib/msn/plugins/BWidget-1.7.0/listbox.tcl
+lib/msn/plugins/BWidget-1.7.0/configure.in
+lib/msn/plugins/BWidget-1.7.0/pagesmgr.tcl
+lib/msn/plugins/BWidget-1.7.0/bitmap.tcl
+lib/msn/plugins/BWidget-1.7.0/dialog.tcl
+lib/msn/plugins/BWidget-1.7.0/notebook.tcl
+lib/msn/plugins/BWidget-1.7.0/button.tcl
+lib/msn/plugins/BWidget-1.7.0/progressbar.tcl
+lib/msn/plugins/BWidget-1.7.0/Makefile.in
+lib/msn/plugins/BWidget-1.7.0/images/plus.xbm
+lib/msn/plugins/BWidget-1.7.0/images/warning.gif
+lib/msn/plugins/BWidget-1.7.0/images/undo.gif
 lib/msn/plugins/BWidget-1.7.0/images/cut.gif
-lib/msn/plugins/BWidget-1.7.0/images/dragfile.gif
 lib/msn/plugins/BWidget-1.7.0/images/dragicon.gif
-lib/msn/plugins/BWidget-1.7.0/images/error.gif
+lib/msn/plugins/BWidget-1.7.0/images/dragfile.gif
+lib/msn/plugins/BWidget-1.7.0/images/save.gif
+lib/msn/plugins/BWidget-1.7.0/images/paste.gif
+lib/msn/plugins/BWidget-1.7.0/images/overstrike.gif
 lib/msn/plugins/BWidget-1.7.0/images/file.gif
+lib/msn/plugins/BWidget-1.7.0/images/target.xbm
+lib/msn/plugins/BWidget-1.7.0/images/oplink.xbm
+lib/msn/plugins/BWidget-1.7.0/images/underline.gif
+lib/msn/plugins/BWidget-1.7.0/images/new.gif
+lib/msn/plugins/BWidget-1.7.0/images/copy.gif
+lib/msn/plugins/BWidget-1.7.0/images/minus.xbm
 lib/msn/plugins/BWidget-1.7.0/images/folder.gif
+lib/msn/plugins/BWidget-1.7.0/images/palette.gif
+lib/msn/plugins/BWidget-1.7.0/images/open.gif
+lib/msn/plugins/BWidget-1.7.0/images/question.gif
 lib/msn/plugins/BWidget-1.7.0/images/hourglass.gif
+lib/msn/plugins/BWidget-1.7.0/images/openfold.gif
 lib/msn/plugins/BWidget-1.7.0/images/info.gif
-lib/msn/plugins/BWidget-1.7.0/images/italic.gif
-lib/msn/plugins/BWidget-1.7.0/images/minus.xbm
-lib/msn/plugins/BWidget-1.7.0/images/new.gif
+lib/msn/plugins/BWidget-1.7.0/images/bold.gif
 lib/msn/plugins/BWidget-1.7.0/images/opcopy.xbm
-lib/msn/plugins/BWidget-1.7.0/images/open.gif
-lib/msn/plugins/BWidget-1.7.0/images/openfold.gif
-lib/msn/plugins/BWidget-1.7.0/images/oplink.xbm
-lib/msn/plugins/BWidget-1.7.0/images/opmove.xbm
-lib/msn/plugins/BWidget-1.7.0/images/overstrike.gif
-lib/msn/plugins/BWidget-1.7.0/images/palette.gif
 lib/msn/plugins/BWidget-1.7.0/images/passwd.gif
-lib/msn/plugins/BWidget-1.7.0/images/paste.gif
-lib/msn/plugins/BWidget-1.7.0/images/plus.xbm
-lib/msn/plugins/BWidget-1.7.0/images/print.gif
-lib/msn/plugins/BWidget-1.7.0/images/question.gif
+lib/msn/plugins/BWidget-1.7.0/images/opmove.xbm
 lib/msn/plugins/BWidget-1.7.0/images/redo.gif
-lib/msn/plugins/BWidget-1.7.0/images/save.gif
-lib/msn/plugins/BWidget-1.7.0/images/target.xbm
-lib/msn/plugins/BWidget-1.7.0/images/underline.gif
-lib/msn/plugins/BWidget-1.7.0/images/undo.gif
-lib/msn/plugins/BWidget-1.7.0/images/warning.gif
-lib/msn/plugins/BWidget-1.7.0/init.tcl
-lib/msn/plugins/BWidget-1.7.0/label.tcl
-lib/msn/plugins/BWidget-1.7.0/labelentry.tcl
-lib/msn/plugins/BWidget-1.7.0/labelframe.tcl
-lib/msn/plugins/BWidget-1.7.0/lang/en.rc
-lib/msn/plugins/BWidget-1.7.0/listbox.tcl
-lib/msn/plugins/BWidget-1.7.0/mainframe.tcl
-lib/msn/plugins/BWidget-1.7.0/messagedlg.tcl
-lib/msn/plugins/BWidget-1.7.0/notebook.tcl
-lib/msn/plugins/BWidget-1.7.0/pagesmgr.tcl
-lib/msn/plugins/BWidget-1.7.0/panedw.tcl
+lib/msn/plugins/BWidget-1.7.0/images/italic.gif
+lib/msn/plugins/BWidget-1.7.0/images/error.gif
+lib/msn/plugins/BWidget-1.7.0/images/print.gif
 lib/msn/plugins/BWidget-1.7.0/passwddlg.tcl
-lib/msn/plugins/BWidget-1.7.0/pkgIndex.tcl
-lib/msn/plugins/BWidget-1.7.0/progressbar.tcl
-lib/msn/plugins/BWidget-1.7.0/progressdlg.tcl
-lib/msn/plugins/BWidget-1.7.0/scrollframe.tcl
-lib/msn/plugins/BWidget-1.7.0/scrollview.tcl
+lib/msn/plugins/BWidget-1.7.0/combobox.tcl
+lib/msn/plugins/BWidget-1.7.0/LICENSE.txt
 lib/msn/plugins/BWidget-1.7.0/scrollw.tcl
-lib/msn/plugins/BWidget-1.7.0/separator.tcl
+lib/msn/plugins/BWidget-1.7.0/panedw.tcl
+lib/msn/plugins/BWidget-1.7.0/README.txt
+lib/msn/plugins/BWidget-1.7.0/dynhelp.tcl
+lib/msn/plugins/BWidget-1.7.0/mainframe.tcl
 lib/msn/plugins/BWidget-1.7.0/spinbox.tcl
-lib/msn/plugins/BWidget-1.7.0/titleframe.tcl
-lib/msn/plugins/BWidget-1.7.0/tree.tcl
-lib/msn/plugins/BWidget-1.7.0/utils.tcl
-lib/msn/plugins/BWidget-1.7.0/widget.tcl
+lib/msn/plugins/BWidget-1.7.0/arrow.tcl
 lib/msn/plugins/BWidget-1.7.0/wizard.tcl
+lib/msn/plugins/BWidget-1.7.0/CHANGES.txt
+lib/msn/plugins/BWidget-1.7.0/separator.tcl
 lib/msn/plugins/BWidget-1.7.0/xpm2image.tcl
-lib/msn/plugins/QuickTimeTcl3.1/QuickTimeTcl3.1.dylib
+lib/msn/plugins/BWidget-1.7.0/entry.tcl
+lib/msn/plugins/BWidget-1.7.0/titleframe.tcl
+lib/msn/plugins/BWidget-1.7.0/dropsite.tcl
+lib/msn/plugins/BWidget-1.7.0/init.tcl
+lib/msn/plugins/BWidget-1.7.0/ChangeLog
+lib/msn/plugins/BWidget-1.7.0/messagedlg.tcl
+lib/msn/plugins/BWidget-1.7.0/progressdlg.tcl
+lib/msn/plugins/BWidget-1.7.0/scrollframe.tcl
+lib/msn/plugins/BWidget-1.7.0/buttonbox.tcl
+lib/msn/plugins/BWidget-1.7.0/utils.tcl
+lib/msn/plugins/winflash/README
+lib/msn/plugins/winflash/flash.cpp
+lib/msn/plugins/winflash/flash.dll
+lib/msn/plugins/winflash/flash.h
 lib/msn/plugins/QuickTimeTcl3.1/movie.tcl
 lib/msn/plugins/QuickTimeTcl3.1/pkgIndex.tcl
-lib/msn/plugins/base64/base64.tcl
-lib/msn/plugins/base64/pkgIndex.tcl
-lib/msn/plugins/base64/uuencode.tcl
-lib/msn/plugins/base64/yencode.tcl
-lib/msn/plugins/gtkdock.c
-lib/msn/plugins/gtkdock.h
-lib/msn/plugins/plugins.txt
-lib/msn/plugins/winico03.dll
-lib/msn/plugins/http2.4/http.tcl
+lib/msn/plugins/QuickTimeTcl3.1/QuickTimeTcl3.1.dylib
 lib/msn/plugins/http2.4/pkgIndex.tcl
-lib/msn/plugins/icons/appear.xpm
-lib/msn/plugins/icons/away.xpm
-lib/msn/plugins/icons/brb.xpm
-lib/msn/plugins/icons/busy.xpm
-lib/msn/plugins/icons/dock_icons.xpm
-lib/msn/plugins/icons/lunch.xpm
-lib/msn/plugins/icons/noact.xpm
-lib/msn/plugins/icons/offline.xpm
-lib/msn/plugins/icons/online.xpm
-lib/msn/plugins/icons/onphone.xpm
-lib/msn/plugins/sha1/pkgIndex.tcl
-lib/msn/plugins/sha1/sha1.tcl
-lib/msn/plugins/tclCarbonNotification/Darwin-ppc/critcl.tcl
-lib/msn/plugins/tclCarbonNotification/Darwin-ppc/tclCarbonNotification.dylib
+lib/msn/plugins/http2.4/http.tcl
 lib/msn/plugins/tclCarbonNotification/critcl.tcl
 lib/msn/plugins/tclCarbonNotification/pkgIndex.tcl
-lib/msn/plugins/tclzlib/pkgIndex.tcl
-lib/msn/plugins/tclzlib/tclzlib.tcl
-lib/msn/plugins/traydock/Makefile.in
-lib/msn/plugins/traydock/README
-lib/msn/plugins/traydock/config.h.in
-lib/msn/plugins/traydock/configure
-lib/msn/plugins/traydock/tray.c
-lib/msn/plugins/traydock/tray.o
-lib/msn/plugins/traydock/libtray.so
-lib/msn/plugins/winflash/README
-lib/msn/plugins/winflash/flash.cpp
-lib/msn/plugins/winflash/flash.dll
-lib/msn/plugins/winflash/flash.h
+lib/msn/plugins/tclCarbonNotification/Darwin-ppc/critcl.tcl
+lib/msn/plugins/tclCarbonNotification/Darwin-ppc/tclCarbonNotification.dylib
+lib/msn/plugins/applescript/display_and_send.scpt
+lib/msn/plugins/applescript/mail-bugreport.scpt
+lib/msn/plugins/applescript/itunes.tcl
+lib/msn/plugins/winico05.dll
+lib/msn/plugins/tclAE2.0/Contents/MacOS/tclAE2.0.dylib
+lib/msn/plugins/tclAE2.0/Contents/Resources/aelegacy.tcl
+lib/msn/plugins/tclAE2.0/Contents/Resources/InfoPlist.strings
+lib/msn/plugins/tclAE2.0/Contents/Resources/oserrors.tcl
+lib/msn/plugins/tclAE2.0/Contents/Resources/tclAE.icns
+lib/msn/plugins/tclAE2.0/Contents/Resources/aete.tcl
+lib/msn/plugins/tclAE2.0/Contents/Resources/aebuild.tcl
+lib/msn/plugins/tclAE2.0/Contents/Info.plist
+lib/msn/plugins/tclAE2.0/pkgIndex.tcl
+lib/msn/plugins/tclAE2.0/tclAE2.0
+lib/msn/plugins/linphone/mkIndex.tcl.in
+lib/msn/plugins/linphone/configure.in
+lib/msn/plugins/linphone/Makefile.in
+lib/msn/plugins/linphone/tcl.m4
+lib/msn/plugins/linphone/mkIndex.tcl
+lib/msn/plugins/linphone/linphonewrap.c
+lib/msn/plugins/linphone/linphonewrap.h
+lib/msn/png.tcl
+lib/msn/dock.tcl
+lib/msn/loging.tcl
+lib/msn/proxy.tcl
+lib/msn/amsn
 %%PORTDOCS%%share/doc/amsn/README
 %%PORTDOCS%%share/doc/amsn/TODO
 @dirrm lib/msn/icons/128x128
@@ -627,7 +705,6 @@ lib/msn/plugins/winflash/flash.h
 @dirrm lib/msn/icons/48x48
 @dirrm lib/msn/icons/64x64
 @dirrm lib/msn/icons/96x96
-@dirrm lib/msn/icons/winicons
 @dirrm lib/msn/icons
 @dirrm lib/msn/lang
 @dirrm lib/msn/plugins/QuickTimeTcl3.1
@@ -643,6 +720,12 @@ lib/msn/plugins/winflash/flash.h
 @dirrm lib/msn/plugins/tclzlib
 @dirrm lib/msn/plugins/traydock
 @dirrm lib/msn/plugins/winflash
+@dirrm lib/msn/plugins/applescript
+@dirrm lib/msn/plugins/linphone
+@dirrm lib/msn/plugins/tclAE2.0/Contents/MacOS
+@dirrm lib/msn/plugins/tclAE2.0/Contents/Resources
+@dirrm lib/msn/plugins/tclAE2.0/Contents
+@dirrm lib/msn/plugins/tclAE2.0
 @dirrm lib/msn/plugins
 @dirrm lib/msn/skins/Tux/displaypic
 @dirrm lib/msn/skins/Tux/pixmaps
@@ -652,7 +735,10 @@ lib/msn/plugins/winflash/flash.h
 @dirrm lib/msn/skins/default/pixmaps
 @dirrm lib/msn/skins/default/smileys
 @dirrm lib/msn/skins/default/sounds
+@dirrm lib/msn/skins/default/winicons
 @dirrm lib/msn/skins/default
 @dirrm lib/msn/skins
+@dirrm lib/msn/docs
+@dirrm lib/msn/utils
 @dirrm lib/msn
 %%PORTDOCS%%@dirrm share/doc/amsn
diff --git a/net-im/amsn/scripts/post-configure b/net-im/amsn/scripts/post-configure
index 60b16555d62b..52cd3b7e15d1 100644
--- a/net-im/amsn/scripts/post-configure
+++ b/net-im/amsn/scripts/post-configure
@@ -1,10 +1,19 @@
 #! /bin/sh
 
+## 'wish' is not recognized in FreeBSD
+## we should use 'wish8.4' instead
+## this script fixes the first line in amsn and alarm.tcl scripts
+
 cd $WRKSRC
 
-for i in alarm.tcl amsn
-do
-	mv $i $i.orig
-	sed -e "s=/usr/bin/wish=$PREFIX/bin/wish8.4=" < $i.orig > $i
-	rm $i.orig
-done
+mv alarm.tcl alarm.tcl.orig
+echo \#!$PREFIX/bin/wish8.4 > alarm.tcl
+echo -n \#\#old: >> alarm.tcl
+cat alarm.tcl.orig >> alarm.tcl
+rm alarm.tcl.orig
+
+mv amsn amsn.orig
+echo \#!$PREFIX/bin/wish8.4 > amsn
+echo -n \#\#old: >> amsn
+cat amsn.orig >> amsn
+rm amsn.orig