summaryrefslogtreecommitdiffstats
path: root/audio/musiccontrol
diff options
context:
space:
mode:
authorhq <hq@FreeBSD.org>2004-11-15 01:51:47 +0000
committerhq <hq@FreeBSD.org>2004-11-15 01:51:47 +0000
commitb7346dae58873f23532adfcdb3c0336319f0271d (patch)
tree7047a1cb8fc8fd6e28344adb58666fdc93beb2cd /audio/musiccontrol
parentb8faaa35ae092260c0a4bbc7deeb5cd19ef31917 (diff)
downloadFreeBSD-ports-b7346dae58873f23532adfcdb3c0336319f0271d.zip
FreeBSD-ports-b7346dae58873f23532adfcdb3c0336319f0271d.tar.gz
- 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]
Diffstat (limited to 'audio/musiccontrol')
-rw-r--r--audio/musiccontrol/Makefile15
-rw-r--r--audio/musiccontrol/files/musiccontrol4
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" "$*"
OpenPOWER on IntegriCloud