- Update to 0.90

- Add ImageMagick dependency, it's used for picture and smiles functionality
- Install KDE/GNOME traydock plugin
- Correct a replacement of logo picture

PR:		ports/63249
Submitted by:	Jie Gao <gaoj@cpsc.ucalgary.ca>
Approved by:	maintainer timeout (20 days)

5 files changed, 404 insertions, 169 deletions

diff --git a/net/amsn/Makefile b/net/amsn/Makefile
index 8e5d7c8..46d7226 100644
--- a/net/amsn/Makefile
+++ b/net/amsn/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	amsn
-PORTVERSION=	0.83
-PORTREVISION=	1
+PORTVERSION=	0.90
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,21 +15,31 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	MSN Messenger
 
+LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
+		convert:${PORTSDIR}/graphics/ImageMagick \
 		${LOCALBASE}/lib/tcllib1.4/base64/base64.tcl:${PORTSDIR}/devel/tcllib
 
-NO_BUILD=	yes
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/msn
 
 LIBDIR=		${PREFIX}/lib/msn
 DOCSDIR=	${PREFIX}/share/doc/amsn
-CORE=		FAQ HELP README amsn jwakeup langlist *tcl *htm*
-SUBDIR=		icons lang skins
+CORE=		FAQ HELP README amsn jwakeup langlist amsn-remote remote.help \
+		*tcl *htm*
+SUBDIR=		icons lang skins plugins
 DOC_FILES=	README TODO
 
 post-extract:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
-	@${RM} -rf ${WRKSRC}/skins/default/smileys/.xvpics
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${RM} -rf
+	@${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}
@@ -50,7 +59,7 @@ post-install:
 		> ${PREFIX}/bin/amsn
 	@${CHMOD} 555 ${PREFIX}/bin/amsn
 	@${CHMOD} 555 ${PREFIX}/lib/msn/amsn
-	@uudecode -o ${PREFIX}/lib/msn/icons/logolinmsn.gif \
+	@uudecode -o ${PREFIX}/lib/msn/skins/default/pixmaps/logolinmsn.gif \
 		${FILESDIR}/logolinmsn.gif.uue
 
 .include <bsd.port.mk>
diff --git a/net/amsn/distinfo b/net/amsn/distinfo
index 299e1f9..e2dd8a1 100644
--- a/net/amsn/distinfo
+++ b/net/amsn/distinfo
@@ -1 +1 @@
-MD5 (amsn-0_83.tar.gz) = 9c613ca47fe2841551d8f609b622279d
+MD5 (amsn-0_90.tar.gz) = 6840539ac90ea734ca83a40fafd0bfbc
diff --git a/net/amsn/files/Makefile.traydoc b/net/amsn/files/Makefile.traydoc
new file mode 100644
index 0000000..5545955
--- /dev/null
+++ b/net/amsn/files/Makefile.traydoc
@@ -0,0 +1,36 @@
+LOCALBASE = 	!!PREFIX!!
+X11BASE =	!!X11BASE!!
+
+# The path to the tcl.h header file
+
+TCL_INCPATH = ${LOCALBASE}/include/tcl8.4
+
+# The path to the tk.h header file
+
+TK_INCPATH  = ${LOCALBASE}/include/tk8.4
+
+# The path to the X11 include files
+
+XINCLUDES   = -I${X11BASE}/include
+
+TCL_VERSION = @TCLVER@
+
+CC        ?= cc -pipe
+
+INCLUDES  = ${XINCLUDES} -I${TCL_INCPATH} -I${TK_INCPATH}
+
+CFLAGS    += -O -fPIC ${INCLUDES}
+
+SHLIB_LD     = ld -shared -x
+
+LIBSN     = -lc -L${X11BASE}/lib -L${LOCALBASE}/lib -lX11 -lm -ltcl84${TCL_DBGX} -ltk84 -lImlib -ltiff -lungif -lpng -lz -lXext -lSM -lICE
+
+.PHONY : all 
+
+all : libtray.so
+
+tray.o: tray.c
+	$(CC) -c $(CFLAGS) tray.c
+
+libtray.so: tray.o
+	${SHLIB_LD} tray.o $(LIBSN) -o libtray.so
diff --git a/net/amsn/files/amsn b/net/amsn/files/amsn
index 4333dd3..1058809 100644
--- a/net/amsn/files/amsn
+++ b/net/amsn/files/amsn
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-!!PREFIX!!/lib/msn/amsn
+wish8.4 !!PREFIX!!/lib/msn/amsn
diff --git a/net/amsn/pkg-plist b/net/amsn/pkg-plist
index d01ed58..79ac67d 100644
--- a/net/amsn/pkg-plist
+++ b/net/amsn/pkg-plist
@@ -2,9 +2,14 @@ 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/amsn
 lib/msn/anigif.tcl
 lib/msn/automsg.tcl
 lib/msn/balloon.tcl
@@ -20,22 +25,54 @@ lib/msn/dock.tcl
 lib/msn/groups.tcl
 lib/msn/gui.tcl
 lib/msn/hotmail.tcl
+lib/msn/lang.tcl
+lib/msn/loging.tcl
+lib/msn/migmd5.tcl
+lib/msn/notebook.tcl
+lib/msn/plugins.tcl
+lib/msn/png.tcl
+lib/msn/progressbar.tcl
+lib/msn/protocol.tcl
+lib/msn/proxy.tcl
+lib/msn/remote.tcl
+lib/msn/rnotebook.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/logolinmsn.gif
-lib/msn/jwakeup
-lib/msn/lang.tcl
+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
@@ -47,11 +84,16 @@ lib/msn/lang/lang3.tmpl
 lib/msn/lang/langaf
 lib/msn/lang/langal
 lib/msn/lang/langbg
+lib/msn/lang/langbn
 lib/msn/lang/langbr
+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/langee
+lib/msn/lang/langei
 lib/msn/lang/langen
 lib/msn/lang/langeo
 lib/msn/lang/langes
@@ -89,95 +131,46 @@ lib/msn/lang/langzh-cn
 lib/msn/lang/langzh-tw
 lib/msn/lang/missing.py
 lib/msn/lang/sortlang
-lib/msn/langlist
-lib/msn/loging.tcl
-lib/msn/migmd5.tcl
-lib/msn/notebook.tcl
-lib/msn/plugins.tcl
-lib/msn/progressbar.tcl
-lib/msn/protocol.tcl
-lib/msn/proxy.tcl
-lib/msn/remote.tcl
-lib/msn/rnotebook.tcl
-lib/msn/skins.tcl
-lib/msn/skins/aMac/README
-lib/msn/skins/aMac/desc.txt
-lib/msn/skins/aMac/pixmaps/amsn.xbm
-lib/msn/skins/aMac/pixmaps/amsnicon.gif
-lib/msn/skins/aMac/pixmaps/amsnmask.xbm
-lib/msn/skins/aMac/pixmaps/away.gif
-lib/msn/skins/aMac/pixmaps/back.gif
-lib/msn/skins/aMac/pixmaps/baway.gif
-lib/msn/skins/aMac/pixmaps/bbusy.gif
-lib/msn/skins/aMac/pixmaps/blocked.gif
-lib/msn/skins/aMac/pixmaps/blockedme.gif
-lib/msn/skins/aMac/pixmaps/boffline.gif
-lib/msn/skins/aMac/pixmaps/bonline.gif
-lib/msn/skins/aMac/pixmaps/busy.gif
-lib/msn/skins/aMac/pixmaps/butblock.gif
-lib/msn/skins/aMac/pixmaps/butfont.gif
-lib/msn/skins/aMac/pixmaps/butsmile.gif
-lib/msn/skins/aMac/pixmaps/colorbar.gif
-lib/msn/skins/aMac/pixmaps/contract.gif
-lib/msn/skins/aMac/pixmaps/daway.xpm
-lib/msn/skins/aMac/pixmaps/expand.gif
-lib/msn/skins/aMac/pixmaps/fticon.gif
-lib/msn/skins/aMac/pixmaps/ftreject.gif
-lib/msn/skins/aMac/pixmaps/globe.gif
-lib/msn/skins/aMac/pixmaps/loganim.gif
-lib/msn/skins/aMac/pixmaps/logolinmsn.gif
-lib/msn/skins/aMac/pixmaps/messenger.png
-lib/msn/skins/aMac/pixmaps/miniinfo.gif
-lib/msn/skins/aMac/pixmaps/minijoins.gif
-lib/msn/skins/aMac/pixmaps/minileaves.gif
-lib/msn/skins/aMac/pixmaps/miniwarn.gif
-lib/msn/skins/aMac/pixmaps/msnbot.gif
-lib/msn/skins/aMac/pixmaps/notifclose.gif
-lib/msn/skins/aMac/pixmaps/notifico.gif
-lib/msn/skins/aMac/pixmaps/notifyoffline.gif
-lib/msn/skins/aMac/pixmaps/notifyonline.gif
-lib/msn/skins/aMac/pixmaps/notifystate.gif
-lib/msn/skins/aMac/pixmaps/offline.gif
-lib/msn/skins/aMac/pixmaps/online.gif
-lib/msn/skins/aMac/pixmaps/read.gif
-lib/msn/skins/aMac/pixmaps/send.gif
-lib/msn/skins/aMac/pixmaps/typing.gif
-lib/msn/skins/aMac/pixmaps/unread.gif
-lib/msn/skins/aMac/settings.xml
-lib/msn/skins/aMac/smileys/angel_smile.gif
-lib/msn/skins/aMac/smileys/angry_smile.gif
-lib/msn/skins/aMac/smileys/apple.gif
-lib/msn/skins/aMac/smileys/baring_teeth_smile.gif
-lib/msn/skins/aMac/smileys/cigarette.gif
-lib/msn/skins/aMac/smileys/computer.gif
-lib/msn/skins/aMac/smileys/confused_smile.gif
-lib/msn/skins/aMac/smileys/cry_smile.gif
-lib/msn/skins/aMac/smileys/devil_smile.gif
-lib/msn/skins/aMac/smileys/dont_know_smile.gif
-lib/msn/skins/aMac/smileys/dont_tell_smile.gif
-lib/msn/skins/aMac/smileys/messenger.gif
-lib/msn/skins/aMac/smileys/money.gif
-lib/msn/skins/aMac/smileys/nerd_smile.gif
-lib/msn/skins/aMac/smileys/omg_smile.gif
-lib/msn/skins/aMac/smileys/party_smile.gif
-lib/msn/skins/aMac/smileys/red_smile.gif
-lib/msn/skins/aMac/smileys/regular_smile.gif
-lib/msn/skins/aMac/smileys/roll_smile.gif
-lib/msn/skins/aMac/smileys/sad_smile.gif
-lib/msn/skins/aMac/smileys/sarcastic_smile.gif
-lib/msn/skins/aMac/smileys/secret_smile.gif
-lib/msn/skins/aMac/smileys/shades_smile.gif
-lib/msn/skins/aMac/smileys/sick_smile.gif
-lib/msn/skins/aMac/smileys/sleepy_smile.gif
-lib/msn/skins/aMac/smileys/star.gif
-lib/msn/skins/aMac/smileys/teeth_smile.gif
-lib/msn/skins/aMac/smileys/thinking_smile.gif
-lib/msn/skins/aMac/smileys/tongue_smile.gif
-lib/msn/skins/aMac/smileys/what_smile.gif
-lib/msn/skins/aMac/smileys/wink_smile.gif
-lib/msn/skins/aMac/smileys/wu.gif
-lib/msn/skins/aMac/smileys/xD_smile.gif
+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/castle.dat
+lib/msn/skins/default/displaypic/castle.gif
+lib/msn/skins/default/displaypic/castle.png
+lib/msn/skins/default/displaypic/doggie.dat
+lib/msn/skins/default/displaypic/doggie.gif
+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/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/amsn.xbm
 lib/msn/skins/default/pixmaps/amsnicon.gif
@@ -195,15 +188,18 @@ 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/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/dphone.xpm
@@ -211,9 +207,11 @@ 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/logolinmsn2.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
@@ -223,9 +221,11 @@ 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/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/null
+lib/msn/skins/default/pixmaps/notifystate_1.gif
 lib/msn/skins/default/pixmaps/offline.gif
 lib/msn/skins/default/pixmaps/online.gif
 lib/msn/skins/default/pixmaps/prefalerts.gif
@@ -243,108 +243,288 @@ lib/msn/skins/default/pixmaps/prefphone.gif
 lib/msn/skins/default/pixmaps/prefprofile.gif
 lib/msn/skins/default/pixmaps/prefproxy.gif
 lib/msn/skins/default/pixmaps/prefstatus.gif
+lib/msn/skins/default/pixmaps/sendmessage.gif
 lib/msn/skins/default/pixmaps/typing.gif
 lib/msn/skins/default/pixmaps/unread.gif
-lib/msn/skins/default/settings.xml
-lib/msn/skins/default/smileys/airplane.gif
-lib/msn/skins/default/smileys/angel_smile.gif
-lib/msn/skins/default/smileys/angry_smile.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/auto.gif
-lib/msn/skins/default/smileys/baring_teeth_smile.gif
 lib/msn/skins/default/smileys/bat.gif
-lib/msn/skins/default/smileys/beer_mug.gif
-lib/msn/skins/default/smileys/black_sheep.gif
-lib/msn/skins/default/smileys/bowl.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/broken_heart.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_smile.gif
-lib/msn/skins/default/smileys/cry_smile.gif
-lib/msn/skins/default/smileys/devil_smile.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/dont_know_smile.gif
-lib/msn/skins/default/smileys/dont_tell_smile.gif
+lib/msn/skins/default/smileys/dunno.gif
 lib/msn/skins/default/smileys/envelope.gif
-lib/msn/skins/default/smileys/film.gif
-lib/msn/skins/default/smileys/fingerscrossed.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/guy.gif
-lib/msn/skins/default/smileys/guy_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/heart.gif
-lib/msn/skins/default/smileys/hifive.gif
-lib/msn/skins/default/smileys/island_palm.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/martini.gif
+lib/msn/skins/default/smileys/love.gif
 lib/msn/skins/default/smileys/messenger.gif
-lib/msn/skins/default/smileys/mobile_phone.gif
-lib/msn/skins/default/smileys/money.gif
+lib/msn/skins/default/smileys/mobile.gif
 lib/msn/skins/default/smileys/moon.gif
-lib/msn/skins/default/smileys/nerd_smile.gif
 lib/msn/skins/default/smileys/note.gif
 lib/msn/skins/default/smileys/null
-lib/msn/skins/default/smileys/omg_smile.gif
-lib/msn/skins/default/smileys/party_smile.gif
+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/red_smile.gif
-lib/msn/skins/default/smileys/regular_smile.gif
-lib/msn/skins/default/smileys/roll_smile.gif
+lib/msn/skins/default/smileys/rolleyes.gif
 lib/msn/skins/default/smileys/rose.gif
-lib/msn/skins/default/smileys/sad_smile.gif
-lib/msn/skins/default/smileys/sarcastic_smile.gif
-lib/msn/skins/default/smileys/secret_smile.gif
-lib/msn/skins/default/smileys/shades_smile.gif
-lib/msn/skins/default/smileys/sick_smile.gif
-lib/msn/skins/default/smileys/sleepy_smile.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/soccer_ball.gif
 lib/msn/skins/default/smileys/star.gif
-lib/msn/skins/default/smileys/stormy.gif
 lib/msn/skins/default/smileys/sun.gif
-lib/msn/skins/default/smileys/teeth_smile.gif
-lib/msn/skins/default/smileys/thinking_smile.gif
-lib/msn/skins/default/smileys/thumbs_down.gif
-lib/msn/skins/default/smileys/thumbs_up.gif
-lib/msn/skins/default/smileys/tongue_smile.gif
-lib/msn/skins/default/smileys/trillian_lol.gif
-lib/msn/skins/default/smileys/trillian_roll.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/what_smile.gif
-lib/msn/skins/default/smileys/wilted_rose.gif
-lib/msn/skins/default/smileys/wink_smile.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/sounds/alarm.wav
-lib/msn/skins/default/sounds/beep.wav
-lib/msn/skins/default/sounds/drums.wav
-lib/msn/skins/default/sounds/hoho.wav
-lib/msn/skins/default/sounds/lol.wav
-lib/msn/skins/default/sounds/meow.wav
+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/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/skins/default/sounds/woof.wav
-lib/msn/smileys.tcl
-lib/msn/socks.tcl
-lib/msn/sxml.tcl
-lib/msn/trayicon.tcl
+lib/msn/skins/Tux/desc.txt
+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/displaypic/null
+lib/msn/skins/Tux/displaypic/tux.dat
+lib/msn/skins/Tux/displaypic/tux.png
+lib/msn/skins/Tux/settings.xml
+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/bbusy.gif
+lib/msn/skins/Tux/pixmaps/blocked.gif
+lib/msn/skins/Tux/pixmaps/blockedme.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/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/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/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/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/prefnat.gif
+lib/msn/skins/Tux/pixmaps/prefpers.gif
+lib/msn/skins/Tux/pixmaps/prefphone.gif
+lib/msn/skins/Tux/pixmaps/prefprofile.gif
+lib/msn/skins/Tux/pixmaps/prefproxy.gif
+lib/msn/skins/Tux/pixmaps/prefstatus.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/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/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/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
 %%PORTDOCS%%share/doc/amsn/README
 %%PORTDOCS%%share/doc/amsn/TODO
 @dirrm lib/msn/icons/128x128
@@ -352,15 +532,25 @@ lib/msn/trayicon.tcl
 @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/skins/aMac/pixmaps
-@dirrm lib/msn/skins/aMac/smileys
-@dirrm lib/msn/skins/aMac
+@dirrm lib/msn/skins/default/displaypic
 @dirrm lib/msn/skins/default/pixmaps
 @dirrm lib/msn/skins/default/smileys
 @dirrm lib/msn/skins/default/sounds
 @dirrm lib/msn/skins/default
+@dirrm lib/msn/skins/Tux/displaypic
+@dirrm lib/msn/skins/Tux/pixmaps
+@dirrm lib/msn/skins/Tux/smileys
+@dirrm lib/msn/skins/Tux
 @dirrm lib/msn/skins
+@dirrm lib/msn/plugins/base64
+@dirrm lib/msn/plugins/http2.4
+@dirrm lib/msn/plugins/icons
+@dirrm lib/msn/plugins/sha1
+@dirrm lib/msn/plugins/tclzlib
+@dirrm lib/msn/plugins/traydock
+@dirrm lib/msn/plugins
 @dirrm lib/msn
 %%PORTDOCS%%@dirrm share/doc/amsn