- Upgrade to 1709_RC11f;

- Add an experimental support for video.

3 files changed, 37 insertions, 5 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index 6151f9ed39dd..46d8723a15fd 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1709_RC10
+DISTVERSION=	1709_RC11f
 CATEGORIES=	net java
-MASTER_SITES=	http://rebel.chillhoek.nl/	\
-		http://www.mcroney.com/nss-folder/uploadfileshere/	\
+MASTER_SITES=	http://70.25.151.230/		\
 		http://download.mercury.to/	\
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry/${PORTNAME}
@@ -38,6 +37,15 @@ INSTDIR=	${PREFIX}/${LINSTDIR}
 PLIST_SUB=	INSTDIR=${LINSTDIR}
 SUB_DIRS=	lib resources
 
+.if defined(WITH_VIDEO)	# Experimental
+VIDJAR=		VidConf-libs.jar
+EXTRACT_ONLY+=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} ${VIDJAR}
+PLIST_SUB+=	VID="" VIDJAR="${VIDJAR}"
+.else
+PLIST_SUB+=	VID="@comment " VIDJAR=""
+.endif
+
 do-install:
 	${MKDIR} ${INSTDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${INSTDIR}
@@ -46,5 +54,8 @@ do-install:
 	cd ${WRKDIR} && ${FIND} ${sd} -type d -exec ${MKDIR} ${INSTDIR}/{} \;
 	cd ${WRKDIR} && ${FIND} ${sd} -type f -exec ${INSTALL_DATA} {} ${INSTDIR}/{} \;
 .endfor
+.if defined(WITH_VIDEO)
+	${INSTALL_DATA} ${_DISTDIR}/${VIDJAR} ${INSTDIR}/lib
+.endif
 
 .include <bsd.port.mk>
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index 3416abc97ee2..b587e299b8fa 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,2 +1,4 @@
-MD5 (mercury/1709_RC10.zip) = 1869de110454a45bd0283e2c0ef321ad
-SIZE (mercury/1709_RC10.zip) = 5157177
+MD5 (mercury/1709_RC11f.zip) = 77413c77fffe7f36e92b7e28bc9dea41
+SIZE (mercury/1709_RC11f.zip) = 5292200
+MD5 (mercury/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
+SIZE (mercury/VidConf-libs.jar) = 617362
diff --git a/net-im/mercury/pkg-plist b/net-im/mercury/pkg-plist
index 832364e1ff20..30f87459ab3e 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -2,9 +2,11 @@ bin/Mercury_Messenger
 %%INSTDIR%%/Mercury_Messenger
 %%INSTDIR%%/lib/JFlash.jar
 %%INSTDIR%%/lib/Skins.jar
+%%VID%%%%INSTDIR%%/lib/%%VIDJAR%%
 %%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
@@ -48,6 +50,7 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/SplashWindow/Default.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/Girl.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/Mercury.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/Thumbs.db
 %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/away.gif
 %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/chat.gif
 %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/dnd.gif
@@ -61,6 +64,20 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/StatusIcons/M_Henk.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_MSN 16b.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_MSN default.zip
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/Thumbs.db
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/a.html
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/away.png
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/block.png
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/busy.png
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/gif/Thumbs.db
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/gif/away.gif
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/gif/block.gif
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/gif/busy.gif
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/gif/offline.gif
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/gif/online.gif
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/icondef.xml
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/offline.png
+%%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/online.png
 %%INSTDIR%%/resources/AppData/StatusIcons/M_Maarten.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_MacOS-New.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_MacOS-Old.zip
@@ -183,6 +200,8 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/AppData/Winks/NVNZQXpvRkwyR3VtL0VOMnVMc2tPaURNMGFFPQ==
 @dirrm %%INSTDIR%%/resources/AppData/Winks/L0g4WmxDZ1JTOXlsZmFvTCtnd0ZIektleXA4PQ==
 @dirrm %%INSTDIR%%/resources/AppData/Winks
+@dirrm %%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7/gif
+@dirrm %%INSTDIR%%/resources/AppData/StatusIcons/M_MSN7
 @dirrm %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ
 @dirrm %%INSTDIR%%/resources/AppData/StatusIcons
 @dirrm %%INSTDIR%%/resources/AppData/SplashWindow