diff options
author | Antoine Brodin <antoine@FreeBSD.org> | 2014-11-11 09:59:46 +0000 |
---|---|---|
committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-11-11 09:59:46 +0000 |
commit | f51841701de632da6464090b21de7ab325ae2c1f (patch) | |
tree | 9054d786c44430da43d33134eec1368405ae8a97 /games | |
parent | Unbreak LICENSE_FILE (diff) |
Remove dependency on bash
PR: ports/193945
Submitted by: Jan Kokemuller
Notes
Notes:
svn path=/head/; revision=372439
Diffstat (limited to 'games')
-rw-r--r-- | games/minecraft-client/Makefile | 5 | ||||
-rw-r--r-- | games/minecraft-client/files/minecraft-runtime | 56 | ||||
-rw-r--r-- | games/minecraft-client/pkg-plist | 1 |
3 files changed, 29 insertions, 33 deletions
diff --git a/games/minecraft-client/Makefile b/games/minecraft-client/Makefile index 8c8ff1804444..b9cc3654d801 100644 --- a/games/minecraft-client/Makefile +++ b/games/minecraft-client/Makefile @@ -3,7 +3,7 @@ PORTNAME= minecraft-client PORTVERSION= 1.7.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games java MASTER_SITES= http://s3.amazonaws.com/Minecraft.Download/launcher/:minecraft \ http://media-mcw.cursecdn.com/c/c5/:icon @@ -15,8 +15,7 @@ EXTRACT_ONLY= MAINTAINER= ports@FreeBSD.org COMMENT= Client for the block building game -RUN_DEPENDS= ${JAVALIBDIR}/lwjgl/lwjgl.jar:${PORTSDIR}/games/lwjgl \ - bash:${PORTSDIR}/shells/bash +RUN_DEPENDS= ${JAVALIBDIR}/lwjgl/lwjgl.jar:${PORTSDIR}/games/lwjgl WRKSRC= ${WRKDIR} NO_BUILD= yes diff --git a/games/minecraft-client/files/minecraft-runtime b/games/minecraft-client/files/minecraft-runtime index 2ab6b4866e8b..238868957994 100644 --- a/games/minecraft-client/files/minecraft-runtime +++ b/games/minecraft-client/files/minecraft-runtime @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash +#!/bin/sh LWJGL_JLP_OVRD="/usr/local/lib/lwjgl2.9.1" LWJGL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl.jar" @@ -7,40 +7,38 @@ LWJGL_UTIL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl_util.jar" export JAVA_HOME=/usr/local/openjdk8 build_classpath() { - j=0 - ocp=`echo ${1} | sed 's/:/ /g'` - for p in ${ocp} + local IFS=":" + for p in ${1} do - if [[ $p == *lwjgl-* ]] - then - ncp[$j]=${LWJGL_OVRD} - elif [[ $p == *lwjgl_util* ]] - then - ncp[$j]=${LWJGL_UTIL_OVRD} - else - ncp[$j]=${p} - fi - j=$(( j + 1 )) + case "${p}" in + *lwjgl-*) + cp="${cp}:${LWJGL_OVRD}" + ;; + *lwjgl_util*) + cp="${cp}:${LWJGL_UTIL_OVRD}" + ;; + *) + cp="${cp}:${p}" + ;; + esac done - - cp=`echo ${ncp[@]} | sed 's/ /:/g'` + cp=${cp#?} } - -i=0 for var in "${@}" do - if [[ "$var" == -Djava.library* ]] - then - args[$i]="-Djava.library.path=${LWJGL_JLP_OVRD}" - elif [[ "$var" == *lwjgl_util* ]] - then + case "${var}" in + -Djava.library*) + args="${args} -Djava.library.path=${LWJGL_JLP_OVRD}" + ;; + *lwjgl_util*) build_classpath "${var}" - args[$i]="$cp" - else - args[$i]=$var - fi - i=$(( i + 1 )) + args="${args} ${cp}" + ;; + *) + args="${args} ${var}" + ;; + esac done -${JAVA_HOME}/jre/bin/java ${args[@]} +${JAVA_HOME}/jre/bin/java ${args} diff --git a/games/minecraft-client/pkg-plist b/games/minecraft-client/pkg-plist index ed52d70e1298..b84c0fc856e0 100644 --- a/games/minecraft-client/pkg-plist +++ b/games/minecraft-client/pkg-plist @@ -3,4 +3,3 @@ bin/minecraft-client %%DATADIR%%/minecraft-runtime %%DATADIR%%/Notifier.java share/pixmaps/minecraft-client.png -@dirrm %%DATADIR%% |