Upgrade to 1710 RC2b.

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

3 files changed, 22 insertions, 20 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index d91185cf1ecd..bc5acee797b1 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1710_B15
+DISTVERSION=	1710_RC2b
 PORTEPOCH=	2
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}		\
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index 4cdf4ffb1a4e..d9ce5e69ec59 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/1710_B15.zip) = 4bb7ba73e0909e9521fc2e46f7be1ba5
-SHA256 (mercury/1710_B15.zip) = 6dc513b27ccb69ca6e2870727dd6b39fef6a05d5a2043185df14739980700f82
-SIZE (mercury/1710_B15.zip) = 5139243
+MD5 (mercury/1710_RC2b.zip) = 9dad2ffb24cd0d633de9e4fb371d8b42
+SHA256 (mercury/1710_RC2b.zip) = f0794064317d338c914826986eb7d01928c9fb74acf4da961ef47f09461c63a1
+SIZE (mercury/1710_RC2b.zip) = 5437246
 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 ca55c47d3a37..50c2c6ea9d2e 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -1,6 +1,7 @@
 bin/Mercury_Messenger
 %%INSTDIR%%/Mercury_Messenger
 %%INSTDIR%%/lib/JFlash.jar
+%%INSTDIR%%/lib/Skins.jar
 %%INSTDIR%%/lib/commons-jxpath-1.1.jar
 %%INSTDIR%%/lib/dMSN.jar
 %%INSTDIR%%/lib/dllStuff.jar
@@ -71,6 +72,22 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Views/Default_CLGroup/View.xml
 %%INSTDIR%%/resources/AppData/Views/Default_Chat/Default.html
 %%INSTDIR%%/resources/AppData/Views/Default_Chat/View.xml
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/View.xml
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/close_button.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/dpimg_border.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/index.html
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/left_arrow.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_back.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_back_bot.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_back_left.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_back_right.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_left.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_left_bot.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_right.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_right_bot.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_shadow.png
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/page2.html
+%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/right_arrow.png
 %%INSTDIR%%/resources/AppData/Views/Default_General/Alias.txt
 %%INSTDIR%%/resources/AppData/Views/Default_General/Alias_MSNName.txt
 %%INSTDIR%%/resources/AppData/Views/Default_General/Email.txt
@@ -141,21 +158,6 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Winks/eTRzZjMrT0pmQnlwSHZZSlJzR2VBUi9xVmQ0PQ==/ufo.png
 %%INSTDIR%%/resources/AppData/Winks/eTRzZjMrT0pmQnlwSHZZSlJzR2VBUi9xVmQ0PQ==/ufo.swf
 %%INSTDIR%%/resources/Images.zip
-%%INSTDIR%%/resources/UI/contactcard/close_button.png
-%%INSTDIR%%/resources/UI/contactcard/dpimg_border.png
-%%INSTDIR%%/resources/UI/contactcard/index.html
-%%INSTDIR%%/resources/UI/contactcard/left_arrow.png
-%%INSTDIR%%/resources/UI/contactcard/msn_back.png
-%%INSTDIR%%/resources/UI/contactcard/msn_back_bot.png
-%%INSTDIR%%/resources/UI/contactcard/msn_back_left.png
-%%INSTDIR%%/resources/UI/contactcard/msn_back_right.png
-%%INSTDIR%%/resources/UI/contactcard/msn_left.png
-%%INSTDIR%%/resources/UI/contactcard/msn_left_bot.png
-%%INSTDIR%%/resources/UI/contactcard/msn_right.png
-%%INSTDIR%%/resources/UI/contactcard/msn_right_bot.png
-%%INSTDIR%%/resources/UI/contactcard/msn_shadow.png
-%%INSTDIR%%/resources/UI/contactcard/page2.html
-%%INSTDIR%%/resources/UI/contactcard/right_arrow.png
 %%INSTDIR%%/resources/UI/dialogs/Jabber_ContactSubscribed.xml
 %%INSTDIR%%/resources/UI/dialogs/Jabber_JoinMUC.xml
 %%INSTDIR%%/resources/UI/dialogs/RemoveContact.xml
@@ -195,7 +197,6 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/lang
 @dirrm %%INSTDIR%%/resources/UI/panels
 @dirrm %%INSTDIR%%/resources/UI/dialogs
-@dirrm %%INSTDIR%%/resources/UI/contactcard
 @dirrm %%INSTDIR%%/resources/UI
 @dirrm %%INSTDIR%%/resources/AppData/Winks/eTRzZjMrT0pmQnlwSHZZSlJzR2VBUi9xVmQ0PQ==
 @dirrm %%INSTDIR%%/resources/AppData/Winks/eHV6bWRQcm1xQXpVN0ViZDBUV3FCcWNHb0tBPQ==
@@ -215,6 +216,7 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/AppData/Winks
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_IM
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_General
+@dirrm %%INSTDIR%%/resources/AppData/Views/Default_ContactCard
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_Chat
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_CLGroup
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_CLContact