Index: head/net-im/mercury/Makefile
===================================================================
--- head/net-im/mercury/Makefile	(revision 263146)
+++ head/net-im/mercury/Makefile	(revision 263147)
@@ -1,90 +1,90 @@
 # New ports collection makefile for:	mercury
 # Date created:			1 May 2005
 # Whom:				Thierry Thomas <thierry@pompo.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mercury
 DISTVERSION=	2.0${RCVER:U}
 PORTEPOCH=	8
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}	\
-		http://files.mercury.im/${PORTVERSION:R}/release/${RCVER}/
+		http://files.mercury.im/${PORTVERSION:R:R}/release/${RCVER}/
 MASTER_SITE_SUBDIR=	thierry/${PORTNAME}/${RCVER}
 DISTNAME=	core
 DIST_SUBDIR=	${PORTNAME}/${RCVER}
 
 # Maintainership available: drop me a line if interested
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Java Based MSN client
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper	\
 		jmfinit:${PORTSDIR}/java/jmf
 
-RCVER=		rc6
+RCVER=		rc7e
 
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 JMF_JARS=	customizer jmf mediaplayer multiplayer
 
 SUB_FILES=	Mercury_Messenger
 SUB_LIST=	JAVA_VERSION="${JAVA_VERSION}" JMF_JARS="${JMF_JARS:S|$|.jar|}"
 
 LINSTDIR?=	share/Mercury
 INSTDIR=	${PREFIX}/${LINSTDIR}
 PLIST_SUB=	INSTDIR=${LINSTDIR}
 SUB_DIRS=	lib resources
 DIR2PRUNE=	resources/AppData/Games		\
 		resources/AppData/Plugins	\
 		resources/AppData/Skins
 
 DESKTOP_ENTRIES="Mercury Messenger" "${COMMENT}"	\
 		"${INSTDIR}/resources/online.png"	\
 		"${SUB_FILES}"				\
 		"Application;InstantMessaging;Java;Network;" true
 
 .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
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
 WITHOUT_TRAY=	yes
 .endif
 
 .if !defined(WITHOUT_TRAY)
 LIB_DEPENDS+=	tray.0:${PORTSDIR}/x11-toolkits/jdic
 .endif
 
 post-extract:
 	${MKDIR} ${WRKDIR}/icons
 	cd ${WRKDIR}/icons &&	\
 	${EXTRACT_CMD} ${WRKDIR}/resources/AppData/StatusIcons/MMercury.zip
 
 do-install:
 	${MKDIR} ${INSTDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${INSTDIR}
 	${LN} -sf ${INSTDIR}/${SUB_FILES} ${PREFIX}/bin
 .for sd in ${SUB_DIRS}
 	cd ${WRKDIR} && ${FIND} ${sd} -type d -exec ${MKDIR} ${INSTDIR}/{} \;
 	cd ${WRKDIR} && ${FIND} ${sd} -type f -exec ${INSTALL_DATA} {} ${INSTDIR}/{} \;
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/icons/online.png ${INSTDIR}/resources
 .for ed in ${DIR2PRUNE}
 	${TOUCH} ${INSTDIR}/${ed}/.keep_me
 .endfor
 .if defined(WITH_VIDEO)
 	${INSTALL_DATA} ${_DISTDIR}/${VIDJAR} ${INSTDIR}/lib
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net-im/mercury/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.49
\ No newline at end of property
+1.50
\ No newline at end of property
Index: head/net-im/mercury/distinfo
===================================================================
--- head/net-im/mercury/distinfo	(revision 263146)
+++ head/net-im/mercury/distinfo	(revision 263147)
@@ -1,6 +1,6 @@
-MD5 (mercury/rc6/core.zip) = dbc2a9f65f68ca699ab3652d0a480851
-SHA256 (mercury/rc6/core.zip) = 7b5af03d224300475ee6bc99836509bb8c6cec4ad277801670d22388099b8c5d
-SIZE (mercury/rc6/core.zip) = 3990091
-MD5 (mercury/rc6/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
-SHA256 (mercury/rc6/VidConf-libs.jar) = 13c7b81b1f60c10c347d5e3616c3a9881dea130891f2ebcdd2d7ffec03b0fe80
-SIZE (mercury/rc6/VidConf-libs.jar) = 617362
+MD5 (mercury/rc7e/core.zip) = c91442adf43cb3718840d8933bcfca5b
+SHA256 (mercury/rc7e/core.zip) = dce3a99224d4dd14205aa5fd1798e32d6c4626a1790ee7f27483ea8766888264
+SIZE (mercury/rc7e/core.zip) = 4009037
+MD5 (mercury/rc7e/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
+SHA256 (mercury/rc7e/VidConf-libs.jar) = 13c7b81b1f60c10c347d5e3616c3a9881dea130891f2ebcdd2d7ffec03b0fe80
+SIZE (mercury/rc7e/VidConf-libs.jar) = 617362

Property changes on: head/net-im/mercury/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.43
\ No newline at end of property
+1.44
\ No newline at end of property