4 files changed, 17 insertions, 23 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index 06409aa5ad28..a33b37aebce9 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1.9B10
+DISTVERSION=	1.9RC1
 PORTEPOCH=	6
 CATEGORIES=	net-im java
-MASTER_SITES=	${MASTER_SITE_LOCAL}		\
+MASTER_SITES=	${MASTER_SITE_LOCAL}			\
 		http://dknapp.ca/mirror/mercury/beta/	\
 		http://download.mercury.to/
 MASTER_SITE_SUBDIR=	thierry/${PORTNAME}
@@ -37,8 +37,10 @@ LINSTDIR?=	share/Mercury
 INSTDIR=	${PREFIX}/${LINSTDIR}
 PLIST_SUB=	INSTDIR=${LINSTDIR}
 SUB_DIRS=	lib resources
-DIR2PRUNE=	resources/AppData/Games		\
+DIR2PRUNE=	resources/AppData/Backgrounds	\
+		resources/AppData/Games		\
 		resources/AppData/Plugins
+BADOSLIBS=	linuxtray.jar wintray.jar
 
 .if defined(WITH_VIDEO)	# Experimental
 VIDJAR=		VidConf-libs.jar
@@ -49,6 +51,10 @@ PLIST_SUB+=	VID="" VIDJAR="${VIDJAR}"
 PLIST_SUB+=	VID="@comment " VIDJAR=""
 .endif
 
+.if !defined(WITHOUT_TRAY)
+LIB_DEPENDS+=	tray.0:${PORTSDIR}/x11-toolkits/jdic
+.endif
+
 do-install:
 	${MKDIR} ${INSTDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${INSTDIR}
@@ -60,6 +66,7 @@ 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 67909752bafc..7f7090614e05 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/1.9B10.zip) = 58dbfeb528fa08fd9cb8c9a8cd609582
-SHA256 (mercury/1.9B10.zip) = 4e0dc385b6b72aead636b4c795b037893d57ba566b2dfdee6d315af710054622
-SIZE (mercury/1.9B10.zip) = 5810177
+MD5 (mercury/1.9RC1.zip) = 43d1a14d8fdd11696ad179e5eaa18749
+SHA256 (mercury/1.9RC1.zip) = 464656577e246f70e107fa1aeb353e2c229d49c73d4d291dfa236749e515de74
+SIZE (mercury/1.9RC1.zip) = 4684804
 MD5 (mercury/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
 SHA256 (mercury/VidConf-libs.jar) = 13c7b81b1f60c10c347d5e3616c3a9881dea130891f2ebcdd2d7ffec03b0fe80
 SIZE (mercury/VidConf-libs.jar) = 617362
diff --git a/net-im/mercury/files/Mercury_Messenger.in b/net-im/mercury/files/Mercury_Messenger.in
index 0a662bd09b9d..b803ed959f8d 100644
--- a/net-im/mercury/files/Mercury_Messenger.in
+++ b/net-im/mercury/files/Mercury_Messenger.in
@@ -13,4 +13,5 @@ for file in %%JMF_JARS%%
 do
 classpath="$JMF_INSTALL_PATH/$file:$classpath"
 done
+classpath="%%JAVALIBDIR%%/jdic.jar:$classpath"
 JAVA_VERSION=%%JAVA_VERSION%% %%LOCALBASE%%/bin/java -Xmx512m -classpath $classpath com.dMSN.Main
diff --git a/net-im/mercury/pkg-plist b/net-im/mercury/pkg-plist
index c524f6971bbf..1b2acef0398f 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -1,15 +1,12 @@
 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/idle.jar
 %%INSTDIR%%/lib/jdom1_0.jar
-%%INSTDIR%%/lib/sbbi-upnplib-1.0.2.jar
+%%INSTDIR%%/lib/winflash.jar
 %%INSTDIR%%/lib/xmlpull.jar
-%%INSTDIR%%/resources/AppData/Backgrounds/Default.png
+%%INSTDIR%%/resources/AppData/Backgrounds/.keep_me
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN7.zip
 %%INSTDIR%%/resources/AppData/Games/.keep_me
 %%INSTDIR%%/resources/AppData/Images/Default.zip
@@ -31,7 +28,6 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Sounds/MSN Online.wav
 %%INSTDIR%%/resources/AppData/SplashWindow/Default.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/Mercury.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_Danny.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_Dave.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_MSN 16b.zip
@@ -56,7 +52,6 @@ bin/Mercury_Messenger
 %%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
@@ -72,15 +67,11 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Winks/Sunflower.zip
 %%INSTDIR%%/resources/AppData/Winks/Ufo.zip
 %%INSTDIR%%/resources/AppData/Winks/WaterBalloon.zip
-%%INSTDIR%%/resources/UI/dialogs/Jabber_ContactSubscribed.xml
-%%INSTDIR%%/resources/UI/dialogs/Jabber_JoinMUC.xml
-%%INSTDIR%%/resources/UI/panels/ConferencePanel.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/menu/XMPP.xml
 %%INSTDIR%%/resources/settings/Default_Account.xml
 %%INSTDIR%%/resources/settings/Default_Global.xml
 %%INSTDIR%%/resources/settings/Window_Advanced_Account.xml
@@ -91,7 +82,6 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/settings/Wizard_FirstTime_Account.xml
 %%INSTDIR%%/resources/text/EventExampleLog.xml
 %%INSTDIR%%/resources/text/EventLog.xsl
-%%INSTDIR%%/resources/text/JabberServers.xml
 %%INSTDIR%%/resources/text/Locations.xml
 %%INSTDIR%%/resources/text/MessageLog.xsl
 %%INSTDIR%%/resources/text/RSSFeeds.xml
@@ -99,11 +89,7 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/settings
 @dirrm %%INSTDIR%%/resources/menu
 @dirrm %%INSTDIR%%/resources/lang
-@dirrm %%INSTDIR%%/resources/UI/panels
-@dirrm %%INSTDIR%%/resources/UI/dialogs
-@dirrm %%INSTDIR%%/resources/UI
 @dirrm %%INSTDIR%%/resources/AppData/Winks
-@dirrm %%INSTDIR%%/resources/AppData/Views/XMPP
 @dirrm %%INSTDIR%%/resources/AppData/Views/MSN
 @dirrm %%INSTDIR%%/resources/AppData/Views/Global
 @dirrm %%INSTDIR%%/resources/AppData/Views