3 files changed, 220 insertions, 133 deletions

diff --git a/net/amsn/Makefile b/net/amsn/Makefile
index b6ea186292a7..76e1fc0ebf06 100644
--- a/net/amsn/Makefile
+++ b/net/amsn/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	amsn
-PORTVERSION=	0.81
+PORTVERSION=	0.82
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
@@ -22,9 +23,13 @@ WRKSRC=		${WRKDIR}/msn
 LIBDIR=		${PREFIX}/lib/msn
 DOCSDIR=	${PREFIX}/share/doc/amsn
 CORE=		FAQ HELP README amsn jwakeup langlist *tcl *htm*
-SUBDIR=		i lang s
+SUBDIR=		icons lang skins
 DOC_FILES=	README TODO
 
+post-extract:
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
+	@${RM} -rf ${WRKSRC}/skins/default/smileys/.xvpics
+
 do-install:
 	@${MKDIR} ${LIBDIR}
 	@cd ${WRKSRC}; tar cf - ${CORE} | ( cd ${LIBDIR}; tar xpf - )
@@ -43,7 +48,7 @@ post-install:
 		> ${PREFIX}/bin/amsn
 	@${CHMOD} 555 ${PREFIX}/bin/amsn
 	@${CHMOD} 555 ${PREFIX}/lib/msn/amsn
-	@uudecode -o ${PREFIX}/lib/msn/i/logolinmsn.gif \
+	@uudecode -o ${PREFIX}/lib/msn/icons/logolinmsn.gif \
 		${FILESDIR}/logolinmsn.gif.uue
 
 .include <bsd.port.mk>
diff --git a/net/amsn/distinfo b/net/amsn/distinfo
index 0ac1f5390abd..a8b6ac2f3b14 100644
--- a/net/amsn/distinfo
+++ b/net/amsn/distinfo
@@ -1 +1 @@
-MD5 (amsn-0_81.tar.gz) = 37a3278749de1eaad0c7e4edecaf5cb4
+MD5 (amsn-0_82.tar.gz) = 4b851b9308025cc3505f8fb028611cdf
diff --git a/net/amsn/pkg-plist b/net/amsn/pkg-plist
index 9eaadaef2cc5..3c1dfa024ac7 100644
--- a/net/amsn/pkg-plist
+++ b/net/amsn/pkg-plist
@@ -2,11 +2,15 @@ bin/amsn
 lib/msn/FAQ
 lib/msn/HELP
 lib/msn/README
+lib/msn/amsn
+lib/msn/jwakeup
+lib/msn/langlist
 lib/msn/abook.tcl
 lib/msn/alarm.tcl
-lib/msn/amsn
 lib/msn/anigif.tcl
-lib/msn/checkver.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
@@ -18,122 +22,45 @@ lib/msn/dock.tcl
 lib/msn/groups.tcl
 lib/msn/gui.tcl
 lib/msn/hotmail.tcl
-lib/msn/hotmlog.htm
-lib/msn/i/alarm.gif
-lib/msn/i/amsn.xbm
-lib/msn/i/amsnmask.xbm
-lib/msn/i/angel.gif
-lib/msn/i/angry.gif
-lib/msn/i/asl.gif
-lib/msn/i/away.gif
-lib/msn/i/back.gif
-lib/msn/i/baway.gif
-lib/msn/i/bbusy.gif
-lib/msn/i/beer.gif
-lib/msn/i/bell.gif
-lib/msn/i/belloff.gif
-lib/msn/i/blocked.gif
-lib/msn/i/boffline.gif
-lib/msn/i/bonline.gif
-lib/msn/i/boyhug.gif
-lib/msn/i/busy.gif
-lib/msn/i/butblock.gif
-lib/msn/i/butfont.gif
-lib/msn/i/butsmile.gif
-lib/msn/i/cake.gif
-lib/msn/i/clk.gif
-lib/msn/i/coctail.gif
-lib/msn/i/colorbar.gif
-lib/msn/i/contract.gif
-lib/msn/i/crooked.gif
-lib/msn/i/daway.xpm
-lib/msn/i/dbrb.xpm
-lib/msn/i/dbusy.xpm
-lib/msn/i/devil.gif
-lib/msn/i/dhidden.xpm
-lib/msn/i/dinactive.xpm
-lib/msn/i/disgust.gif
-lib/msn/i/dlunch.xpm
-lib/msn/i/doffline.xpm
-lib/msn/i/dog.gif
-lib/msn/i/donline.xpm
-lib/msn/i/dphone.xpm
-lib/msn/i/email.gif
-lib/msn/i/emboy.gif
-lib/msn/i/embulb.gif
-lib/msn/i/emcat.gif
-lib/msn/i/emcup.gif
-lib/msn/i/emgirl.gif
-lib/msn/i/emhottie.gif
-lib/msn/i/emnote.gif
-lib/msn/i/emphone.gif
-lib/msn/i/emsleep.gif
-lib/msn/i/emstar.gif
-lib/msn/i/expand.gif
-lib/msn/i/film.gif
-lib/msn/i/fticon.gif
-lib/msn/i/ftreject.gif
-lib/msn/i/gift.gif
-lib/msn/i/girlhug.gif
-lib/msn/i/globe.gif
-lib/msn/i/handcuffs.gif
-lib/msn/i/lips.gif
-lib/msn/i/loganim.gif
-lib/msn/i/logolinmsn.gif
-lib/msn/i/love.gif
-lib/msn/i/messenger.gif
-lib/msn/i/messenger.png
-lib/msn/i/miniinfo.gif
-lib/msn/i/miniwarn.gif
-lib/msn/i/msnbot.gif
-lib/msn/i/notifclose.gif
-lib/msn/i/notifico.gif
-lib/msn/i/offline.gif
-lib/msn/i/online.gif
-lib/msn/i/photo.gif
-lib/msn/i/prefalerts.gif
-lib/msn/i/prefaway.gif
-lib/msn/i/prefemotic.gif
-lib/msn/i/preffont.gif
-lib/msn/i/prefhist.gif
-lib/msn/i/prefhist2.gif
-lib/msn/i/prefhist3.gif
-lib/msn/i/preflook.gif
-lib/msn/i/prefmsg.gif
-lib/msn/i/prefnat.gif
-lib/msn/i/prefpers.gif
-lib/msn/i/prefphone.gif
-lib/msn/i/prefprofile.gif
-lib/msn/i/prefproxy.gif
-lib/msn/i/prefstatus.gif
-lib/msn/i/rainbow.gif
-lib/msn/i/rose.gif
-lib/msn/i/rosew.gif
-lib/msn/i/sad.gif
-lib/msn/i/smile.gif
-lib/msn/i/smilec.gif
-lib/msn/i/smiled.gif
-lib/msn/i/smilemb.gif
-lib/msn/i/smileo.gif
-lib/msn/i/smilep.gif
-lib/msn/i/sun.gif
-lib/msn/i/thumbd.gif
-lib/msn/i/thumbu.gif
-lib/msn/i/typing.gif
-lib/msn/i/unlove.gif
-lib/msn/i/unread.gif
-lib/msn/i/vampire.gif
-lib/msn/i/wink.gif
-lib/msn/jwakeup
 lib/msn/lang.tcl
+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/smileys.tcl
+lib/msn/socks.tcl
+lib/msn/sxml.tcl
+lib/msn/trayicon.tcl
+lib/msn/hotmlog.htm
+lib/msn/icons/128x128/aMSN_128.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/48x48/aMSN_48.png
+lib/msn/icons/48x48/amsn.png
+lib/msn/icons/48x48/msn.png
+lib/msn/icons/64x64/aMSN_64.png
+lib/msn/icons/64x64/amsn.png
+lib/msn/icons/96x96/aMSN_96.png
+lib/msn/icons/logolinmsn.gif
+lib/msn/lang/addkey.tcl
 lib/msn/lang/convert.tcl
 lib/msn/lang/errors.py
+lib/msn/lang/genlangfiles.c
 lib/msn/lang/genpage.c
 lib/msn/lang/lang1.tmpl
 lib/msn/lang/lang2.tmpl
 lib/msn/lang/lang3.tmpl
 lib/msn/lang/langaf
 lib/msn/lang/langal
+lib/msn/lang/langbg
 lib/msn/lang/langbr
 lib/msn/lang/langca
 lib/msn/lang/langda
@@ -142,7 +69,6 @@ lib/msn/lang/langee
 lib/msn/lang/langen
 lib/msn/lang/langeo
 lib/msn/lang/langes
-lib/msn/lang/langes.bak
 lib/msn/lang/langeu
 lib/msn/lang/langfi
 lib/msn/lang/langfr
@@ -178,26 +104,182 @@ 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/notebook1.tcl
-lib/msn/progressbar.tcl
-lib/msn/protocol.tcl
-lib/msn/proxy.tcl
-lib/msn/rnotebook.tcl
-lib/msn/s/alarm.wav
-lib/msn/s/newemail.wav
-lib/msn/s/online.wav
-lib/msn/s/type.wav
-lib/msn/smileys.tcl
-lib/msn/socks.tcl
-lib/msn/trayicon.tcl
+lib/msn/skins/default/pixmaps/alarm.gif
+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/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/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/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/null
+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
+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/loganim.gif
+lib/msn/skins/default/pixmaps/logolinmsn.gif
+lib/msn/skins/default/pixmaps/logolinmsn2.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/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/notifystate.gif
+lib/msn/skins/default/pixmaps/notifyoffline.gif
+lib/msn/skins/default/pixmaps/notifyonline.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/prefnat.gif
+lib/msn/skins/default/pixmaps/prefpers.gif
+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/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/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/brb.gif
+lib/msn/skins/default/smileys/broken_heart.gif
+lib/msn/skins/default/smileys/cake.gif
+lib/msn/skins/default/smileys/camera.gif
+lib/msn/skins/default/smileys/cat.gif
+lib/msn/skins/default/smileys/cigarette.gif
+lib/msn/skins/default/smileys/clock.gif
+lib/msn/skins/default/smileys/coffee.gif
+lib/msn/skins/default/smileys/computer.gif
+lib/msn/skins/default/smileys/confused_smile.gif
+lib/msn/skins/default/smileys/dog.gif
+lib/msn/skins/default/smileys/guy.gif
+lib/msn/skins/default/smileys/cry_smile.gif
+lib/msn/skins/default/smileys/devil_smile.gif
+lib/msn/skins/default/smileys/dont_know_smile.gif
+lib/msn/skins/default/smileys/dont_tell_smile.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/girl.gif
+lib/msn/skins/default/smileys/girl_hug.gif
+lib/msn/skins/default/smileys/guy_hug.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/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/messenger.gif
+lib/msn/skins/default/smileys/mobile_phone.gif
+lib/msn/skins/default/smileys/money.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/phone.gif
+lib/msn/skins/default/smileys/pizza.gif
+lib/msn/skins/default/smileys/plate.gif
+lib/msn/skins/default/smileys/present.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/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/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/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/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/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
 %%PORTDOCS%%share/doc/amsn/README
 %%PORTDOCS%%share/doc/amsn/TODO
-@dirrm lib/msn/i
+@dirrm lib/msn/icons/128x128
+@dirrm lib/msn/icons/32x32
+@dirrm lib/msn/icons/48x48
+@dirrm lib/msn/icons/64x64
+@dirrm lib/msn/icons/96x96
+@dirrm lib/msn/icons
 @dirrm lib/msn/lang
-@dirrm lib/msn/s
+@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
 @dirrm lib/msn
 %%PORTDOCS%%@dirrm share/doc/amsn