Attachment 147689 Details for Bug 193945 – Remove run-time dependency on bash

[patch] Remove run-time dependency on bash

minecraft-client-remove-bash-dependency.patch (text/plain), 2.56 KB, created by Jan Kokemüller on 2014-09-26 12:54:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kokemüller

Created: 2014-09-26 12:54:32 UTC

Size: 2.56 KB

patch

obsolete

>diff --git a/games/minecraft-client/Makefile b/games/minecraft-client/Makefile
>index 8c8ff18..b9cc365 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 2ab6b48..2388689 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}

Actions: View | Diff

Attachments on bug 193945: 147689