Upgrade to 1710-beta2.

3 files changed, 10 insertions, 17 deletions

diff --git a/net/mercury/Makefile b/net/mercury/Makefile
index 2abcc86db1bb..823018061c07 100644
--- a/net/mercury/Makefile
+++ b/net/mercury/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1709_RC13
-PORTEPOCH=	1
+DISTVERSION=	1710_B02
+PORTEPOCH=	2
 CATEGORIES=	net java
 MASTER_SITES=	http://70.25.151.230/		\
 		http://download.mercury.to/	\
@@ -37,6 +37,7 @@ LINSTDIR?=	share/Mercury
 INSTDIR=	${PREFIX}/${LINSTDIR}
 PLIST_SUB=	INSTDIR=${LINSTDIR}
 SUB_DIRS=	lib resources
+DIR2PRUNE=	resources/AppData/Games
 
 .if defined(WITH_VIDEO)	# Experimental
 VIDJAR=		VidConf-libs.jar
@@ -55,6 +56,7 @@ do-install:
 	cd ${WRKDIR} && ${FIND} ${sd} -type d -exec ${MKDIR} ${INSTDIR}/{} \;
 	cd ${WRKDIR} && ${FIND} ${sd} -type f -exec ${INSTALL_DATA} {} ${INSTDIR}/{} \;
 .endfor
+	@${RMDIR} ${DIR2PRUNE:S|^|${INSTDIR}/|}
 .if defined(WITH_VIDEO)
 	${INSTALL_DATA} ${_DISTDIR}/${VIDJAR} ${INSTDIR}/lib
 .endif
diff --git a/net/mercury/distinfo b/net/mercury/distinfo
index b97dac0e4620..6a3b8d83c37d 100644
--- a/net/mercury/distinfo
+++ b/net/mercury/distinfo
@@ -1,4 +1,4 @@
-MD5 (mercury/1709_RC13.zip) = 2fd910f80d1b16d238855e28f75209d9
-SIZE (mercury/1709_RC13.zip) = 5249705
+MD5 (mercury/1710_B02.zip) = 0ead81a7ded797145b44f908690107f1
+SIZE (mercury/1710_B02.zip) = 4767879
 MD5 (mercury/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
 SIZE (mercury/VidConf-libs.jar) = 617362
diff --git a/net/mercury/pkg-plist b/net/mercury/pkg-plist
index 3859dd468508..a2d19b5ca3e1 100644
--- a/net/mercury/pkg-plist
+++ b/net/mercury/pkg-plist
@@ -1,19 +1,14 @@
 bin/Mercury_Messenger
 %%INSTDIR%%/Mercury_Messenger
 %%INSTDIR%%/lib/JFlash.jar
-%%INSTDIR%%/lib/Skins.jar
-%%VID%%%%INSTDIR%%/lib/%%VIDJAR%%
+%%VID%%%%INSTDIR%%/lib/VidConf-libs.jar
+%%INSTDIR%%/lib/XML.jar
 %%INSTDIR%%/lib/dMSN.jar
 %%INSTDIR%%/lib/dllStuff.jar
 %%INSTDIR%%/lib/jdom1_0.jar
-%%INSTDIR%%/lib/looks-1.3b1.jar
 %%INSTDIR%%/lib/xmlpull.jar
 %%INSTDIR%%/resources/AppData/Backgrounds/Default.png
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN6.zip
-%%INSTDIR%%/resources/AppData/Games/ExampleGame/Game$1.class
-%%INSTDIR%%/resources/AppData/Games/ExampleGame/Game.class
-%%INSTDIR%%/resources/AppData/Games/ExampleGame/Game.java
-%%INSTDIR%%/resources/AppData/Games/ExampleGame/compile.bat
 %%INSTDIR%%/resources/AppData/LoginImages/Default.gif
 %%INSTDIR%%/resources/AppData/Plugins/ContactExample/Plugin.class
 %%INSTDIR%%/resources/AppData/Plugins/ContactExample/Plugin.java
@@ -142,11 +137,10 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/UI/dialogs/RemovedContact.xml
 %%INSTDIR%%/resources/UI/dialogs/RenameGroup.xml
 %%INSTDIR%%/resources/UI/panels/ConferencePanel.xml
-%%INSTDIR%%/resources/lang/Test/it.xml
-%%INSTDIR%%/resources/lang/Test/nl.xml
 %%INSTDIR%%/resources/lang/en.xml
-%%INSTDIR%%/resources/menu/AccountTab.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
@@ -171,7 +165,6 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/text
 @dirrm %%INSTDIR%%/resources/settings
 @dirrm %%INSTDIR%%/resources/menu
-@dirrm %%INSTDIR%%/resources/lang/Test
 @dirrm %%INSTDIR%%/resources/lang
 @dirrm %%INSTDIR%%/resources/UI/panels
 @dirrm %%INSTDIR%%/resources/UI/dialogs
@@ -203,8 +196,6 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/AppData/Plugins/ContactExample
 @dirrm %%INSTDIR%%/resources/AppData/Plugins
 @dirrm %%INSTDIR%%/resources/AppData/LoginImages
-@dirrm %%INSTDIR%%/resources/AppData/Games/ExampleGame
-@dirrm %%INSTDIR%%/resources/AppData/Games
 @dirrm %%INSTDIR%%/resources/AppData/CustomEmoticons
 @dirrm %%INSTDIR%%/resources/AppData/Backgrounds
 @dirrm %%INSTDIR%%/resources/AppData