3 files changed, 25 insertions, 17 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index dfb23c30025a..385fc05b890e 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1.9F
-PORTREVISION=	1
+DISTVERSION=	2.0RC1
 PORTEPOCH=	8
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}		\
-		http://files.mercury.im/1.9/
+		http://files.mercury.im/${PORTVERSION:R}/release/
 MASTER_SITE_SUBDIR=	thierry/${PORTNAME}
 DISTNAME=	${DISTVERSION}
 DIST_SUBDIR=	${PORTNAME}
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index 798cdc83031a..038c88dd9bca 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/1.9F.zip) = 46d46a353f80f71ce8a999da4aa59abf
-SHA256 (mercury/1.9F.zip) = 992fb268835dfa8b0fc485cb52d25724756c5418270072d77dab8192bee65beb
-SIZE (mercury/1.9F.zip) = 3482864
+MD5 (mercury/2.0RC1.zip) = 16e8a1094fbeb6abf7543e6265f0caed
+SHA256 (mercury/2.0RC1.zip) = 2e92a0bf7f798796eca494442cef5df373c31c39c15e97f98b2b2ecc0000b9a3
+SIZE (mercury/2.0RC1.zip) = 4593439
 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 6cf6d5d54a91..6b816aa8de5c 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -3,15 +3,25 @@ bin/Mercury_Messenger
 %%INSTDIR%%/lib/dMSN.jar
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN7.zip
 %%INSTDIR%%/resources/AppData/Games/.keep_me
+%%INSTDIR%%/resources/AppData/Images/BlackMediaIcons.zip
+%%INSTDIR%%/resources/AppData/Images/CaleLaresLogo.zip
 %%INSTDIR%%/resources/AppData/Images/Default.zip
+%%INSTDIR%%/resources/AppData/Images/EinsteinBlack.zip
+%%INSTDIR%%/resources/AppData/Images/EinsteinBlue.zip
+%%INSTDIR%%/resources/AppData/Images/EinsteinGreen.zip
+%%INSTDIR%%/resources/AppData/Images/EinsteinRed.zip
+%%INSTDIR%%/resources/AppData/Images/EinsteinYellow.zip
+%%INSTDIR%%/resources/AppData/Images/Flags.zip
+%%INSTDIR%%/resources/AppData/Images/TpvgamesLogo1.zip
+%%INSTDIR%%/resources/AppData/Images/TpvgamesLogo2.zip
+%%INSTDIR%%/resources/AppData/MusicPlayerInfo/default.xml
 %%INSTDIR%%/resources/AppData/Plugins/.keep_me
 %%INSTDIR%%/resources/AppData/Skins/.keep_me
 %%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/SplashWindow/Old Default.zip
+%%INSTDIR%%/resources/AppData/SplashWindow/EinsteinYellow.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/Danny.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/Dave.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/MMercury.zip
@@ -32,6 +42,8 @@ bin/Mercury_Messenger
 %%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_IM2.2.zip
+%%INSTDIR%%/resources/AppData/Views/Default_IM2.zip
 %%INSTDIR%%/resources/AppData/Views/Default_MultiConvoList.zip
 %%INSTDIR%%/resources/AppData/Views/Default_OSD.zip
 %%INSTDIR%%/resources/AppData/Views/Default_Participants.zip
@@ -53,27 +65,22 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Winks/Sunflower.zip
 %%INSTDIR%%/resources/AppData/Winks/Ufo.zip
 %%INSTDIR%%/resources/AppData/Winks/WaterBalloon.zip
+%%INSTDIR%%/resources/AppData/i18n/en_GB.zip
 %%INSTDIR%%/resources/config/HotKeys.xml
 %%INSTDIR%%/resources/config/Locations.xml
-%%INSTDIR%%/resources/config/RSSFeeds.xml
-%%INSTDIR%%/resources/lang/en.xml
 %%INSTDIR%%/resources/menu/FirstTab.xml
 %%INSTDIR%%/resources/menu/MSN.xml
-%%INSTDIR%%/resources/menu/RSS.xml
 %%INSTDIR%%/resources/menu/Tray.xml
 %%INSTDIR%%/resources/online.png
-%%INSTDIR%%/resources/settings/Default_Account.xml
-%%INSTDIR%%/resources/settings/Default_Global.xml
-%%INSTDIR%%/resources/settings/Window_Advanced_Account.xml
-%%INSTDIR%%/resources/settings/Window_Advanced_Global.xml
-%%INSTDIR%%/resources/settings/Window_View.xml
+%%INSTDIR%%/resources/settings/DefaultSettings.xml
+%%INSTDIR%%/resources/settings/SettingsDialog_Account.xml
+%%INSTDIR%%/resources/settings/SettingsDialog_Global.xml
 %%INSTDIR%%/resources/xsl/EventLog.xsl
 %%INSTDIR%%/resources/xsl/MessageLog.xsl
 %%VID%%%%INSTDIR%%/lib/VidConf-libs.jar
 @dirrm %%INSTDIR%%/resources/xsl
 @dirrm %%INSTDIR%%/resources/settings
 @dirrm %%INSTDIR%%/resources/menu
-@dirrm %%INSTDIR%%/resources/lang
 @dirrm %%INSTDIR%%/resources/config
 @dirrm %%INSTDIR%%/resources/AppData/Winks
 @dirrm %%INSTDIR%%/resources/AppData/Views
@@ -82,9 +89,11 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/AppData/Skins
 @dirrm %%INSTDIR%%/resources/AppData/Sounds
 @dirrm %%INSTDIR%%/resources/AppData/Plugins
+@dirrm %%INSTDIR%%/resources/AppData/MusicPlayerInfo
 @dirrm %%INSTDIR%%/resources/AppData/Images
 @dirrm %%INSTDIR%%/resources/AppData/Games
 @dirrm %%INSTDIR%%/resources/AppData/CustomEmoticons
+@dirrm %%INSTDIR%%/resources/AppData/i18n
 @dirrm %%INSTDIR%%/resources/AppData
 @dirrm %%INSTDIR%%/resources
 @dirrm %%INSTDIR%%/lib