Upgrade to 1.9 RC 2 - Build 20070207.

Changelog at <http://www.mercury.to/index.php?sub=Changelog>.

3 files changed, 32 insertions, 51 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index 13b9df5dce21..15f9ea97199d 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1.9RC1
+DISTVERSION=	1.9RC2
 PORTEPOCH=	6
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}			\
-		http://dknapp.ca/mirror/mercury/beta/	\
-		http://download.mercury.to/
+		http://download.mercury.to/1.9/		\
+		http://dknapp.ca/mirror/mercury/beta/
 MASTER_SITE_SUBDIR=	thierry/${PORTNAME}
 DISTNAME=	${DISTVERSION}
 DIST_SUBDIR=	${PORTNAME}
@@ -40,7 +40,6 @@ SUB_DIRS=	lib resources
 DIR2PRUNE=	resources/AppData/Backgrounds	\
 		resources/AppData/Games		\
 		resources/AppData/Plugins
-BADOSLIBS=	linuxtray.jar wintray.jar
 
 .if defined(WITH_VIDEO)	# Experimental
 VIDJAR=		VidConf-libs.jar
@@ -72,7 +71,6 @@ do-install:
 .for ed in ${DIR2PRUNE}
 	${TOUCH} ${INSTDIR}/${ed}/.keep_me
 .endfor
-	${RM} ${BADOSLIBS:S|^|${INSTDIR}/lib/|}
 .if defined(WITH_VIDEO)
 	${INSTALL_DATA} ${_DISTDIR}/${VIDJAR} ${INSTDIR}/lib
 .endif
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index 7f7090614e05..1c4d965fe4ee 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/1.9RC1.zip) = 43d1a14d8fdd11696ad179e5eaa18749
-SHA256 (mercury/1.9RC1.zip) = 464656577e246f70e107fa1aeb353e2c229d49c73d4d291dfa236749e515de74
-SIZE (mercury/1.9RC1.zip) = 4684804
+MD5 (mercury/1.9RC2.zip) = 26c673953d2f1c1aff11531927b67725
+SHA256 (mercury/1.9RC2.zip) = 6ce4eb39103f9e4e9d1b83e43e0f2d891970ce2afb41e51e8b32e7a27869a46d
+SIZE (mercury/1.9RC2.zip) = 3545899
 MD5 (mercury/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
 SHA256 (mercury/VidConf-libs.jar) = 13c7b81b1f60c10c347d5e3616c3a9881dea130891f2ebcdd2d7ffec03b0fe80
 SIZE (mercury/VidConf-libs.jar) = 617362
diff --git a/net-im/mercury/pkg-plist b/net-im/mercury/pkg-plist
index 1b2acef0398f..580bbc565940 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -1,57 +1,45 @@
 bin/Mercury_Messenger
 %%INSTDIR%%/Mercury_Messenger
 %%VID%%%%INSTDIR%%/lib/VidConf-libs.jar
+%%INSTDIR%%/lib/SpellCheck.jar
 %%INSTDIR%%/lib/dMSN.jar
-%%INSTDIR%%/lib/idle.jar
 %%INSTDIR%%/lib/jdom1_0.jar
-%%INSTDIR%%/lib/winflash.jar
 %%INSTDIR%%/lib/xmlpull.jar
 %%INSTDIR%%/resources/AppData/Backgrounds/.keep_me
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN7.zip
 %%INSTDIR%%/resources/AppData/Games/.keep_me
 %%INSTDIR%%/resources/AppData/Images/Default.zip
-%%INSTDIR%%/resources/AppData/LoginImages/Default.gif
 %%INSTDIR%%/resources/AppData/Plugins/.keep_me
-%%INSTDIR%%/resources/AppData/Skins/Aqua.zip
-%%INSTDIR%%/resources/AppData/Skins/BBJ2.zip
-%%INSTDIR%%/resources/AppData/Skins/Barbie.zip
-%%INSTDIR%%/resources/AppData/Skins/BeOS.zip
-%%INSTDIR%%/resources/AppData/Skins/Cell.zip
-%%INSTDIR%%/resources/AppData/Skins/MacOS.zip
-%%INSTDIR%%/resources/AppData/Skins/Mozilla.zip
-%%INSTDIR%%/resources/AppData/Skins/Simple.zip
-%%INSTDIR%%/resources/AppData/Skins/Toxic.zip
-%%INSTDIR%%/resources/AppData/Skins/Whistler.zip
-%%INSTDIR%%/resources/AppData/Skins/XP.zip
 %%INSTDIR%%/resources/AppData/Sounds/MSN Email.wav
 %%INSTDIR%%/resources/AppData/Sounds/MSN Message.wav
 %%INSTDIR%%/resources/AppData/Sounds/MSN Online.wav
 %%INSTDIR%%/resources/AppData/SplashWindow/Default.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/Mercury.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_Danny.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_Dave.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN 16b.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN default.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_Maarten.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_MacOS-New.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_MacOS-Old.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_Ranch 24p.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_Roy.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_Scarecrow 24p.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/M_Scarecrow 32p.zip
-%%INSTDIR%%/resources/AppData/Views/Global/Default_EventBox.zip
-%%INSTDIR%%/resources/AppData/Views/Global/Default_OSD.zip
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_EventBox.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLGroup.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_Chat.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactTooltip.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_General.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_IM.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_MultiConvoList.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_Participants.zip
-%%INSTDIR%%/resources/AppData/Views/MSN/RobsDroneV3.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/Danny.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/Dave.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/MMercury.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/MMercury_Small.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/MSN 16b.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/MSN default.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/Maarten.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/MacOS-New.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/MacOS-Old.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/Ranch 24p.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/Scarecrow 24p.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/Scarecrow 32p.zip
+%%INSTDIR%%/resources/AppData/Views/Default_CLContact.zip
+%%INSTDIR%%/resources/AppData/Views/Default_CLGroup.zip
+%%INSTDIR%%/resources/AppData/Views/Default_Chat.zip
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard.zip
+%%INSTDIR%%/resources/AppData/Views/Default_ContactTooltip.zip
+%%INSTDIR%%/resources/AppData/Views/Default_EventBox.zip
+%%INSTDIR%%/resources/AppData/Views/Default_General.zip
+%%INSTDIR%%/resources/AppData/Views/Default_IM.zip
+%%INSTDIR%%/resources/AppData/Views/Default_MultiConvoList.zip
+%%INSTDIR%%/resources/AppData/Views/Default_OSD.zip
+%%INSTDIR%%/resources/AppData/Views/Default_Participants.zip
+%%INSTDIR%%/resources/AppData/Views/RobsDroneV3.zip
+%%INSTDIR%%/resources/AppData/Views/RobsEventBox.zip
 %%INSTDIR%%/resources/AppData/Winks/BouncyBall.zip
 %%INSTDIR%%/resources/AppData/Winks/Crying.zip
 %%INSTDIR%%/resources/AppData/Winks/Dancer.zip
@@ -79,7 +67,6 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/settings/Window_Basic_Account.xml
 %%INSTDIR%%/resources/settings/Window_Basic_Global.xml
 %%INSTDIR%%/resources/settings/Window_View.xml
-%%INSTDIR%%/resources/settings/Wizard_FirstTime_Account.xml
 %%INSTDIR%%/resources/text/EventExampleLog.xml
 %%INSTDIR%%/resources/text/EventLog.xsl
 %%INSTDIR%%/resources/text/Locations.xml
@@ -90,15 +77,11 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/menu
 @dirrm %%INSTDIR%%/resources/lang
 @dirrm %%INSTDIR%%/resources/AppData/Winks
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN
-@dirrm %%INSTDIR%%/resources/AppData/Views/Global
 @dirrm %%INSTDIR%%/resources/AppData/Views
 @dirrm %%INSTDIR%%/resources/AppData/StatusIcons
 @dirrm %%INSTDIR%%/resources/AppData/SplashWindow
 @dirrm %%INSTDIR%%/resources/AppData/Sounds
-@dirrm %%INSTDIR%%/resources/AppData/Skins
 @dirrm %%INSTDIR%%/resources/AppData/Plugins
-@dirrm %%INSTDIR%%/resources/AppData/LoginImages
 @dirrm %%INSTDIR%%/resources/AppData/Images
 @dirrm %%INSTDIR%%/resources/AppData/Games
 @dirrm %%INSTDIR%%/resources/AppData/CustomEmoticons