8 files changed, 42 insertions, 44 deletions
diff --git a/net-p2p/limewire/Makefile b/net-p2p/limewire/Makefile
index d0bca835d748..7c0a3d031920 100644
--- a/net-p2p/limewire/Makefile
+++ b/net-p2p/limewire/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	limewire
-PORTVERSION=	4.2.5
+PORTVERSION=	4.2.8
 CATEGORIES=	net java
 MASTER_SITES=	http://www9.limewire.com:82/download/
 DISTNAME=	LimeWireLinux
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ports@edini.net
 COMMENT=	A Java based gnutella client
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
@@ -27,19 +27,18 @@ NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-DATAFILES=	LimeWire.jar MessagesBundle.properties MessagesBundles.jar \
-		ProgressTabs.jar commons-httpclient.jar commons-logging.jar \
-		daap.jar hashes i18n.jar icu4j.jar id3v2.jar jcraft.jar \
-		jl011.jar jmdns.jar logicrypto.jar looks.jar mp3sp14.jar \
-		themes.jar tritonus.jar update.ver vorbis.jar xerces.jar xml.war
+DATAFILES=	LimeWire.jar MessagesBundles.jar ProgressTabs.jar \
+		clink.jar commons-httpclient.jar commons-logging.jar \
+		daap.jar i18n.jar icu4j.jar id3v2.jar jcraft.jar jl011.jar \
+		jmdns.jar logicrypto.jar looks.jar mp3sp14.jar themes.jar \
+		tritonus.jar update.ver vorbis.jar xerces.jar \
+		xml-apis.jar xml.war hashes
 PLIST_FILES=	bin/limewire ${DATAFILES:S,^,%%DATADIR%%/,}
 
-post-patch:
-	${SED} 's|%%DATADIR%%|${DATADIR}|; s|%%LOCALBASE%%|${LOCALBASE}|' \
-		${FILESDIR}/limewire.sh > ${WRKSRC}/limewire
+SUB_FILES=	limewire.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/limewire ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/limewire.sh ${PREFIX}/bin/limewire
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DATAFILES} ${DATADIR}/
 
diff --git a/net-p2p/limewire/distinfo b/net-p2p/limewire/distinfo
index 5eaea24937e8..5e4c6ece9806 100644
--- a/net-p2p/limewire/distinfo
+++ b/net-p2p/limewire/distinfo
@@ -1,2 +1,2 @@
-MD5 (LimeWireLinux.tgz) = d6f89b52dc1c93c31105a69428fb98d0
-SIZE (LimeWireLinux.tgz) = 5199773
+MD5 (LimeWireLinux.tgz) = da4f4d9bc0a6aeea137b7933a4845b75
+SIZE (LimeWireLinux.tgz) = 5825263
diff --git a/net-p2p/limewire/files/limewire.sh b/net-p2p/limewire/files/limewire.sh
deleted file mode 100644
index a0a3da820dad..000000000000
--- a/net-p2p/limewire/files/limewire.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-J2SE_PREEMPTCLOSE=1
-export J2SE_PREEMPTCLOSE
-
-cd %%DATADIR%% && %%LOCALBASE%%/bin/javavm -jar LimeWire.jar
diff --git a/net-p2p/limewire/files/limewire.sh.in b/net-p2p/limewire/files/limewire.sh.in
new file mode 100644
index 000000000000..81864b7a3d4a
--- /dev/null
+++ b/net-p2p/limewire/files/limewire.sh.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+export J2SE_PREEMPTCLOSE=1
+export JAVA_VERSION="1.3+"
+
+cd "%%DATADIR%%" && "%%LOCALBASE%%/bin/java" -jar LimeWire.jar
diff --git a/net/limewire/Makefile b/net/limewire/Makefile
index d0bca835d748..7c0a3d031920 100644
--- a/net/limewire/Makefile
+++ b/net/limewire/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	limewire
-PORTVERSION=	4.2.5
+PORTVERSION=	4.2.8
 CATEGORIES=	net java
 MASTER_SITES=	http://www9.limewire.com:82/download/
 DISTNAME=	LimeWireLinux
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ports@edini.net
 COMMENT=	A Java based gnutella client
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
@@ -27,19 +27,18 @@ NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-DATAFILES=	LimeWire.jar MessagesBundle.properties MessagesBundles.jar \
-		ProgressTabs.jar commons-httpclient.jar commons-logging.jar \
-		daap.jar hashes i18n.jar icu4j.jar id3v2.jar jcraft.jar \
-		jl011.jar jmdns.jar logicrypto.jar looks.jar mp3sp14.jar \
-		themes.jar tritonus.jar update.ver vorbis.jar xerces.jar xml.war
+DATAFILES=	LimeWire.jar MessagesBundles.jar ProgressTabs.jar \
+		clink.jar commons-httpclient.jar commons-logging.jar \
+		daap.jar i18n.jar icu4j.jar id3v2.jar jcraft.jar jl011.jar \
+		jmdns.jar logicrypto.jar looks.jar mp3sp14.jar themes.jar \
+		tritonus.jar update.ver vorbis.jar xerces.jar \
+		xml-apis.jar xml.war hashes
 PLIST_FILES=	bin/limewire ${DATAFILES:S,^,%%DATADIR%%/,}
 
-post-patch:
-	${SED} 's|%%DATADIR%%|${DATADIR}|; s|%%LOCALBASE%%|${LOCALBASE}|' \
-		${FILESDIR}/limewire.sh > ${WRKSRC}/limewire
+SUB_FILES=	limewire.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/limewire ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/limewire.sh ${PREFIX}/bin/limewire
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DATAFILES} ${DATADIR}/
 
diff --git a/net/limewire/distinfo b/net/limewire/distinfo
index 5eaea24937e8..5e4c6ece9806 100644
--- a/net/limewire/distinfo
+++ b/net/limewire/distinfo
@@ -1,2 +1,2 @@
-MD5 (LimeWireLinux.tgz) = d6f89b52dc1c93c31105a69428fb98d0
-SIZE (LimeWireLinux.tgz) = 5199773
+MD5 (LimeWireLinux.tgz) = da4f4d9bc0a6aeea137b7933a4845b75
+SIZE (LimeWireLinux.tgz) = 5825263
diff --git a/net/limewire/files/limewire.sh b/net/limewire/files/limewire.sh
deleted file mode 100644
index a0a3da820dad..000000000000
--- a/net/limewire/files/limewire.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-J2SE_PREEMPTCLOSE=1
-export J2SE_PREEMPTCLOSE
-
-cd %%DATADIR%% && %%LOCALBASE%%/bin/javavm -jar LimeWire.jar
diff --git a/net/limewire/files/limewire.sh.in b/net/limewire/files/limewire.sh.in
new file mode 100644
index 000000000000..81864b7a3d4a
--- /dev/null
+++ b/net/limewire/files/limewire.sh.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+export J2SE_PREEMPTCLOSE=1
+export JAVA_VERSION="1.3+"
+
+cd "%%DATADIR%%" && "%%LOCALBASE%%/bin/java" -jar LimeWire.jar