From da1cdd96b3307331299d9e6bfe2a304e107576c1 Mon Sep 17 00:00:00 2001
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Mon, 30 May 2005 20:14:35 +0000
Subject: - Upgrade to 1709_RC8;

- use javavmwrapper and don't load unnecessary classes.
---
 net-im/mercury/Makefile                   | 9 ++++++---
 net-im/mercury/distinfo                   | 4 ++--
 net-im/mercury/files/Mercury_Messenger.in | 8 +++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'net-im')

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index 110bf618c714..ac02bfc083bb 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1709_RC6b
+DISTVERSION=	1709_RC8
 CATEGORIES=	net java
 MASTER_SITES=	http://download.mercury.to/	\
 		${MASTER_SITE_LOCAL}
@@ -18,15 +18,18 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Java Based MSN client
 
-RUN_DEPENDS=	jmfinit:${PORTSDIR}/java/jmf
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper	\
+		jmfinit:${PORTSDIR}/java/jmf
 
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	yes
 
+JMF_JARS=	customizer jmf mediaplayer multiplayer
+
 SUB_FILES=	Mercury_Messenger
-SUB_LIST=	JAVA=${JAVA}
+SUB_LIST=	JAVA_VERSION="${JAVA_VERSION}" JMF_JARS="${JMF_JARS:S|$|.jar|}"
 
 LINSTDIR?=	share/Mercury
 INSTDIR=	${PREFIX}/${LINSTDIR}
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index 9c172e01e0fa..9da575002f2b 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,2 +1,2 @@
-MD5 (mercury/1709_RC6b.zip) = caad8b76f57d505c6e1640855650046b
-SIZE (mercury/1709_RC6b.zip) = 5109978
+MD5 (mercury/1709_RC8.zip) = 51fc8ac2f1635b4fca7bbd03823bc0d3
+SIZE (mercury/1709_RC8.zip) = 5100494
diff --git a/net-im/mercury/files/Mercury_Messenger.in b/net-im/mercury/files/Mercury_Messenger.in
index 2e5f63f48221..8322bd859ce5 100644
--- a/net-im/mercury/files/Mercury_Messenger.in
+++ b/net-im/mercury/files/Mercury_Messenger.in
@@ -1,4 +1,6 @@
-#!/bin/sh
+#! /bin/sh
+# $FreeBSD$
+
 MERCURY_INSTALL_PATH="%%PREFIX%%/share/Mercury"
 JMF_INSTALL_PATH="%%JAVALIBDIR%%"
 cd $MERCURY_INSTALL_PATH
@@ -7,8 +9,8 @@ for file in `ls $MERCURY_INSTALL_PATH/lib`
 do
 classpath="$MERCURY_INSTALL_PATH/lib/$file:$classpath"
 done
-for file in `ls $JMF_INSTALL_PATH`
+for file in %%JMF_JARS%%
 do
 classpath="$JMF_INSTALL_PATH/$file:$classpath"
 done
-%%JAVA%% -classpath $classpath com.dMSN.Main
+JAVA_VERSION=%%JAVA_VERSION%% %%LOCALBASE%%/bin/java -classpath $classpath com.dMSN.Main
-- 
cgit v1.2.3