diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-03-14 12:29:51 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-03-14 12:29:51 +0000 |
| commit | 29182efba13b9bbc979aefce4850765083275eab (patch) | |
| tree | 2f56997cc146eef924f2b4d83f74379ed7b2182d /lang/kawa/files/patch-bin_kawa.sh.in | |
| parent | Update to 18.0.1. (diff) | |
- Update `lang/kawa' to version 2.3
- Instead sed(1)ing over every file set needed variables via MAKE_ARGS
- Unbreak the tests (against JDK 1.8) and convert to test framework
TIMESTAMP (kawa-2.3.tar.gz) = 1484583959
Diffstat (limited to '')
| -rw-r--r-- | lang/kawa/files/patch-bin_kawa.sh.in | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/lang/kawa/files/patch-bin_kawa.sh.in b/lang/kawa/files/patch-bin_kawa.sh.in new file mode 100644 index 000000000000..7ad01b8a3ecf --- /dev/null +++ b/lang/kawa/files/patch-bin_kawa.sh.in @@ -0,0 +1,31 @@ +--- bin/kawa.sh.in.orig 2016-11-22 21:30:51 UTC ++++ bin/kawa.sh.in +@@ -1,13 +1,7 @@ + #!@KAWA_SHELL@ +-thisfile=`type -p $0` +-case "$thisfile" in +- "") echo "installation error - can't find path to $0"; exit -1 ;; +- /*) ;; +- *) thisfile="$PWD/$thisfile" ;; +-esac +-while test -L "$thisfile"; do thisfile=$(readlink -f "$thisfile"); done +-thisdir=`dirname "$thisfile"` +-kawadir=`echo "$thisdir" | sed -e 's|/bin\(/\.\)*$||'` ++ ++kawadir=`readlink -f "$(dirname "$0")/.."` ++ + if [ "$#" -eq 0 ] + then + command_line="$0" +@@ -19,9 +13,9 @@ test -t 0 || no_console="--no-console" + # If configured with --enable-kawa-frontend then kawa.sh is + # only used for pre-install testing. In that case + # we don't need to set KAWALIB, since kawapath.c looks for it in "..". +-@ENABLE_KAWA_FRONTEND_TRUE@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$thisdir ++@ENABLE_KAWA_FRONTEND_TRUE@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$kawadir/bin + @ENABLE_KAWA_FRONTEND_TRUE@ export LD_LIBRARY_PATH +-@ENABLE_KAWA_FRONTEND_TRUE@ exec $thisdir/kawa "$@" ++@ENABLE_KAWA_FRONTEND_TRUE@ exec $kawadir/bin/kawa "$@" + + KAWALIB=${KAWALIB-"`@CYGPATH_W@ $kawadir/lib/kawa.jar`"} + # MSYS: KAWALIB=${KAWALIB-"`cd $kawadir/lib/; pwd -W`@CLASSPATH_SEPARATOR@kawa.jar`"} |