From b7346dae58873f23532adfcdb3c0336319f0271d Mon Sep 17 00:00:00 2001
From: hq <hq@FreeBSD.org>
Date: Mon, 15 Nov 2004 01:51:47 +0000
Subject: - Chase recent changes to java/javavmwrapper [1] - Update to
 bsd.java.mk 2.0 - Use INSTALL_DATA and INSTALL_SCRIPT macros - Register
 java/javavmwrapper as a run dependency - Use JAVAJARDIR in launcher script -
 Use LOCALBASE rather than PREFIX to invoke javavmwrapper in launcher script

PR:		73856 [1]
Submitted by:	maintainer [1]
---
 audio/musiccontrol/Makefile           | 15 +++++++++------
 audio/musiccontrol/files/musiccontrol |  4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/audio/musiccontrol/Makefile b/audio/musiccontrol/Makefile
index a959d63..4429f62 100644
--- a/audio/musiccontrol/Makefile
+++ b/audio/musiccontrol/Makefile
@@ -18,15 +18,18 @@ COMMENT=	An advanced music player
 
 RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \
 		${LOCALBASE}/bin/ogg123:${PORTSDIR}/audio/vorbis-tools \
-		${LOCALBASE}/bin/simplemod:${PORTSDIR}/audio/simplemod
+		${LOCALBASE}/bin/simplemod:${PORTSDIR}/audio/simplemod \
+		java:${PORTSDIR}/java/javavmwrapper
 
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	yes
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
-	${INSTALL} -o 0 -g 0 -m 0644 ${DISTDIR}/MusicControl-${PORTVERSION}.jar ${PREFIX}/share/java/classes
-	${SED} 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/musiccontrol > ${WRKDIR}/musiccontrol
-	${INSTALL} -o 0 -g 0 ${WRKDIR}/musiccontrol ${PREFIX}/bin
+	@${MKDIR} ${JAVAJARDIR}
+	${INSTALL_DATA} ${DISTDIR}/MusicControl-${PORTVERSION}.jar ${JAVAJARDIR}/
+	${SED} 's,%%LOCALBASE%%,${LOCALBASE},g ; s,%%JAVAJARDIR%%,${JAVAJARDIR},g' \
+		${FILESDIR}/musiccontrol > ${WRKDIR}/musiccontrol
+	${INSTALL_SCRIPT} ${WRKDIR}/musiccontrol ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/musiccontrol/files/musiccontrol b/audio/musiccontrol/files/musiccontrol
index d289c01..2a47e5d 100644
--- a/audio/musiccontrol/files/musiccontrol
+++ b/audio/musiccontrol/files/musiccontrol
@@ -1,3 +1,5 @@
 #!/bin/sh
+#
+# $FreeBSD$
 
-%%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/java/classes/MusicControl-0.2.jar $*
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/MusicControl-0.2.jar" "$*"
-- 
cgit v1.1