Index: head/games/minecraft-client/Makefile =================================================================== --- head/games/minecraft-client/Makefile (revision 372438) +++ head/games/minecraft-client/Makefile (revision 372439) @@ -1,50 +1,49 @@ # Created by: Martin Kropfinger # $FreeBSD$ 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 DISTFILES= Minecraft.jar:minecraft \ Grass.png:icon DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} 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 USE_JAVA= yes JAVA_OS= native JAVA_VENDOR= openjdk JAVA_VERSION= 1.8+ DESKTOP_ENTRIES="Minecraft" \ "Block building game" \ "${PREFIX}/share/pixmaps/minecraft-client.png" \ "${PORTNAME}" \ "Game;Java;" \ false do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Minecraft.jar \ ${STAGEDIR}${DATADIR}/Minecraft.jar ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Grass.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/minecraft-client.png ${SED} -e 's|=JAVA_HOME|=${JAVA_HOME}|' \ -e 's|PREFIX|${PREFIX}|' \ -e 's|JAVA_CMD|${JAVA}|' ${FILESDIR}/minecraft-client \ > ${WRKDIR}/minecraft-client ${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/Notifier.java \ > ${WRKDIR}/Notifier.java ${INSTALL_SCRIPT} ${WRKDIR}/minecraft-client ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/minecraft-runtime ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/Notifier.java ${STAGEDIR}${DATADIR} .include Index: head/games/minecraft-client/files/minecraft-runtime =================================================================== --- head/games/minecraft-client/files/minecraft-runtime (revision 372438) +++ head/games/minecraft-client/files/minecraft-runtime (revision 372439) @@ -1,46 +1,44 @@ -#!/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" 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} Index: head/games/minecraft-client/pkg-plist =================================================================== --- head/games/minecraft-client/pkg-plist (revision 372438) +++ head/games/minecraft-client/pkg-plist (revision 372439) @@ -1,6 +1,5 @@ bin/minecraft-client %%DATADIR%%/Minecraft.jar %%DATADIR%%/minecraft-runtime %%DATADIR%%/Notifier.java share/pixmaps/minecraft-client.png -@dirrm %%DATADIR%%