Upgrade to 1.9 B10.

3 files changed, 20 insertions, 99 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index 6f39ca939115..06409aa5ad28 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1.9B08
+DISTVERSION=	1.9B10
 PORTEPOCH=	6
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}		\
@@ -38,8 +38,7 @@ INSTDIR=	${PREFIX}/${LINSTDIR}
 PLIST_SUB=	INSTDIR=${LINSTDIR}
 SUB_DIRS=	lib resources
 DIR2PRUNE=	resources/AppData/Games		\
-		resources/AppData/Plugins	\
-		resources/AppData/Themes
+		resources/AppData/Plugins
 
 .if defined(WITH_VIDEO)	# Experimental
 VIDJAR=		VidConf-libs.jar
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index 13d0954b54a4..67909752bafc 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/1.9B08.zip) = c4525816e44aef8b20665f95881e5921
-SHA256 (mercury/1.9B08.zip) = 5751abb64bbcd0798cb0a98bc1fea4abdd7d007ff7aed22f83993cb42ee4ec56
-SIZE (mercury/1.9B08.zip) = 5801782
+MD5 (mercury/1.9B10.zip) = 58dbfeb528fa08fd9cb8c9a8cd609582
+SHA256 (mercury/1.9B10.zip) = 4e0dc385b6b72aead636b4c795b037893d57ba566b2dfdee6d315af710054622
+SIZE (mercury/1.9B10.zip) = 5810177
 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 41bd72531778..c524f6971bbf 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -2,13 +2,13 @@ bin/Mercury_Messenger
 %%INSTDIR%%/Mercury_Messenger
 %%INSTDIR%%/lib/JFlash.jar
 %%INSTDIR%%/lib/Skins.jar
+%%VID%%%%INSTDIR%%/lib/VidConf-libs.jar
 %%INSTDIR%%/lib/commons-jxpath-1.1.jar
 %%INSTDIR%%/lib/dMSN.jar
 %%INSTDIR%%/lib/dllStuff.jar
 %%INSTDIR%%/lib/jdom1_0.jar
 %%INSTDIR%%/lib/sbbi-upnplib-1.0.2.jar
 %%INSTDIR%%/lib/xmlpull.jar
-%%VID%%%%INSTDIR%%/lib/VidConf-libs.jar
 %%INSTDIR%%/resources/AppData/Backgrounds/Default.png
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN7.zip
 %%INSTDIR%%/resources/AppData/Games/.keep_me
@@ -26,19 +26,10 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Skins/Toxic.zip
 %%INSTDIR%%/resources/AppData/Skins/Whistler.zip
 %%INSTDIR%%/resources/AppData/Skins/XP.zip
-%%INSTDIR%%/resources/AppData/Sounds/ICQ Chat request.wav
-%%INSTDIR%%/resources/AppData/Sounds/ICQ Contact.wav
-%%INSTDIR%%/resources/AppData/Sounds/ICQ Email.wav
-%%INSTDIR%%/resources/AppData/Sounds/ICQ File.wav
-%%INSTDIR%%/resources/AppData/Sounds/ICQ Message Sent.wav
-%%INSTDIR%%/resources/AppData/Sounds/ICQ Message.wav
-%%INSTDIR%%/resources/AppData/Sounds/ICQ Online.wav
-%%INSTDIR%%/resources/AppData/Sounds/ICQ Ring.wav
 %%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/Girl.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/Mercury.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_Danny.zip
@@ -52,73 +43,20 @@ bin/Mercury_Messenger
 %%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/Themes/.keep_me
-%%INSTDIR%%/resources/AppData/Views/Global/EventBox_Default/Default.html
-%%INSTDIR%%/resources/AppData/Views/Global/EventBox_Default/View.xml
-%%INSTDIR%%/resources/AppData/Views/Global/OSD_Default/Default.html
-%%INSTDIR%%/resources/AppData/Views/Global/OSD_Default/View.xml
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/View.xml
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/event.html
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images/bot.png
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images/bot_left.png
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images/bot_right.png
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images/mid.png
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images/top.png
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images/top_left.png
-%%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images/top_right.png
-%%INSTDIR%%/resources/AppData/Views/MSN/ColorExample_GroupView/Example.html
-%%INSTDIR%%/resources/AppData/Views/MSN/ColorExample_GroupView/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/Alias_DP.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/Alias_MSNName.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/Alias_SI.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/D1.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/DP_SI.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/Email.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/LargeDP_Alias_PM_Song.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/LargeDP_MsnName_PM_Song.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/MSN7.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/MSN7_Full.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/MSNName.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLGroup/Default.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLGroup/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLGroup/collapsed.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_CLGroup/expanded.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_Chat/Default.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_Chat/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/close_button.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/dpimg_border.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/index.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/left_arrow.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_back.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_back_bot.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_back_left.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_back_right.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_left.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_left_bot.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_right.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_right_bot.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/msn_shadow.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard/right_arrow.png
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactTooltip/Default.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactTooltip/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_General/Alias.txt
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_General/Alias_MSNName.txt
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_General/Email.txt
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_General/MSNName.txt
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_General/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_IM/Colors1.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_IM/Colors2.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_IM/Default.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_IM/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_MultiConvoList/Default.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_MultiConvoList/View.xml
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_Participants/MSNName_Email.html
-%%INSTDIR%%/resources/AppData/Views/MSN/Default_Participants/View.xml
-%%INSTDIR%%/resources/AppData/Views/XMPP/Default_CLContact/D1.html
-%%INSTDIR%%/resources/AppData/Views/XMPP/Default_CLContact/JID.html
-%%INSTDIR%%/resources/AppData/Views/XMPP/Default_CLContact/View.xml
+%%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/Views/XMPP/Default_CLContact.zip
 %%INSTDIR%%/resources/AppData/Winks/BouncyBall.zip
 %%INSTDIR%%/resources/AppData/Winks/Crying.zip
 %%INSTDIR%%/resources/AppData/Winks/Dancer.zip
@@ -165,26 +103,10 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/UI/dialogs
 @dirrm %%INSTDIR%%/resources/UI
 @dirrm %%INSTDIR%%/resources/AppData/Winks
-@dirrm %%INSTDIR%%/resources/AppData/Views/XMPP/Default_CLContact
 @dirrm %%INSTDIR%%/resources/AppData/Views/XMPP
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_Participants
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_MultiConvoList
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_IM
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_General
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactTooltip
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_ContactCard
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_Chat
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_CLGroup
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/Default_CLContact
-@dirrm %%INSTDIR%%/resources/AppData/Views/MSN/ColorExample_GroupView
 @dirrm %%INSTDIR%%/resources/AppData/Views/MSN
-@dirrm %%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent/images
-@dirrm %%INSTDIR%%/resources/AppData/Views/Global/Rob_MLEvent
-@dirrm %%INSTDIR%%/resources/AppData/Views/Global/OSD_Default
-@dirrm %%INSTDIR%%/resources/AppData/Views/Global/EventBox_Default
 @dirrm %%INSTDIR%%/resources/AppData/Views/Global
 @dirrm %%INSTDIR%%/resources/AppData/Views
-@dirrm %%INSTDIR%%/resources/AppData/Themes
 @dirrm %%INSTDIR%%/resources/AppData/StatusIcons
 @dirrm %%INSTDIR%%/resources/AppData/SplashWindow
 @dirrm %%INSTDIR%%/resources/AppData/Sounds