- Update to 4.0.8 [1]

- Update to bsd.java.mk 2.0
- Honor rules from the porter's handbook regarding Java ports (data files
  installed in overriden DATADIR=${JAVASHAREDIR}/${PORTNAME})
- Removed pkg-plist by using PLIST_FILES
- Use a plain shell script rather than a patch for 'limewire' executable
- Register run dependency on java/javavmwrapper

PR:		71911 [1]
Submitted by:	Nicolas Blais <nb_root@videotron.ca> [1]

5 files changed, 27 insertions, 49 deletions

diff --git a/net-p2p/limewire/Makefile b/net-p2p/limewire/Makefile
index bd43e40d8c11..9667b649fb5e 100644
--- a/net-p2p/limewire/Makefile
+++ b/net-p2p/limewire/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	limewire
-PORTVERSION=	4.0.7
+PORTVERSION=	4.0.8
 CATEGORIES=	net java
 MASTER_SITES=	http://www9.limewire.com:82/download/
 DISTNAME=	LimeWireLinux
@@ -15,7 +15,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Java based gnutella client
 
-USE_JAVA=	1.3+
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -23,17 +26,21 @@ RESTRICTED=	License does not allow redistribution of any kind
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
 
-JAR_DIR=	${PREFIX}/share/java/jar/limewire
-PLIST_SUB=	JAR_DIR="${JAR_DIR:S/${PREFIX}\///}"
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+DATAFILES=	LimeWire.jar MessagesBundle.properties MessagesBundles.jar \
+		ProgressTabs.jar collections.jar commons-httpclient.jar \
+		commons-logging.jar hashes i18n.jar icu4j.jar id3v2.jar \
+		jl011.jar logicrypto.jar mp3sp14.jar themes.jar update.ver \
+		xerces.jar xml.war
+PLIST_FILES=	bin/limewire ${DATAFILES:S,^,%%DATADIR%%/,}
 
 post-patch:
-	@${SED} 's|%%JAR_DIR%%|${JAR_DIR}|; s|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/runLime.sh > ${WRKSRC}/runLime.sh.sed
+	${SED} 's|%%DATADIR%%|${DATADIR}|; s|%%LOCALBASE%%|${LOCALBASE}|' \
+		${FILESDIR}/limewire.sh > ${WRKSRC}/limewire
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/runLime.sh.sed ${PREFIX}/bin/limewire
-	@${MKDIR} ${JAR_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.jar ${WRKSRC}/MessagesBundle.properties \
-		${WRKSRC}/xml.war ${WRKSRC}/update.ver ${WRKSRC}/hashes ${JAR_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/limewire ${PREFIX}/bin/
+	${MKDIR} ${DATADIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DATAFILES} ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/net-p2p/limewire/distinfo b/net-p2p/limewire/distinfo
index 6799da904e59..de2c3b229b6c 100644
--- a/net-p2p/limewire/distinfo
+++ b/net-p2p/limewire/distinfo
@@ -1,2 +1,2 @@
-MD5 (LimeWireLinux.tgz) = 8a0bc458ee8b66e31d830c35ecd0b529
-SIZE (LimeWireLinux.tgz) = 4642309
+MD5 (LimeWireLinux.tgz) = c57ffaafbd92606a0fefdee3afa760b9
+SIZE (LimeWireLinux.tgz) = 4642601
diff --git a/net-p2p/limewire/files/limewire.sh b/net-p2p/limewire/files/limewire.sh
new file mode 100644
index 000000000000..a0a3da820dad
--- /dev/null
+++ b/net-p2p/limewire/files/limewire.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+J2SE_PREEMPTCLOSE=1
+export J2SE_PREEMPTCLOSE
+
+cd %%DATADIR%% && %%LOCALBASE%%/bin/javavm -jar LimeWire.jar
diff --git a/net-p2p/limewire/files/patch-runLime.sh b/net-p2p/limewire/files/patch-runLime.sh
deleted file mode 100644
index bca21ac79633..000000000000
--- a/net-p2p/limewire/files/patch-runLime.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- runLime.sh.orig	Mon Jun  9 22:45:57 2003
-+++ runLime.sh	Wed Nov 26 15:30:04 2003
-@@ -7,8 +7,10 @@
- # work around some limitations in the JDK1.3.  For more information
- # see http://java.sun.com/j2se/1.3/relnotes.html#vm
- #
--CLASSPATH=".:collections.jar:xerces.jar:jl011.jar:MessagesBundles.jar:themes.jar:logicrypto.jar:GURL.jar"
--export CLASSPATH
-+CLASSPATH="%%JAR_DIR%%"
- J2SE_PREEMPTCLOSE=1
- export J2SE_PREEMPTCLOSE
--java -jar LimeWire.jar
-+cd ${CLASSPATH}
-+exec %%LOCALBASE%%/bin/javavm \
-+	-cp "${CLASSPATH}/collections.jar:${CLASSPATH}/xerces.jar:${CLASSPATH}/jl011.jar:${CLASSPATH}/MessagesBundles.jar:${CLASSPATH}/themes.jar:${CLASSPATH}/logicrypto.jar:${CLASSPATH}/GURL.jar" \
-+	-jar ${CLASSPATH}/LimeWire.jar
diff --git a/net-p2p/limewire/pkg-plist b/net-p2p/limewire/pkg-plist
deleted file mode 100644
index 1aa2df461ec4..000000000000
--- a/net-p2p/limewire/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/limewire
-%%JAR_DIR%%/LimeWire.jar
-%%JAR_DIR%%/MessagesBundle.properties
-%%JAR_DIR%%/MessagesBundles.jar
-%%JAR_DIR%%/ProgressTabs.jar
-%%JAR_DIR%%/collections.jar
-%%JAR_DIR%%/commons-httpclient.jar
-%%JAR_DIR%%/commons-logging.jar
-%%JAR_DIR%%/hashes
-%%JAR_DIR%%/i18n.jar
-%%JAR_DIR%%/icu4j.jar
-%%JAR_DIR%%/id3v2.jar
-%%JAR_DIR%%/jl011.jar
-%%JAR_DIR%%/logicrypto.jar
-%%JAR_DIR%%/mp3sp14.jar
-%%JAR_DIR%%/themes.jar
-%%JAR_DIR%%/update.ver
-%%JAR_DIR%%/xerces.jar
-%%JAR_DIR%%/xml.war
-@dirrm %%JAR_DIR%%
-@unexec rmdir %D/share/java/jar 2>/dev/null || true