3 files changed, 44 insertions, 13 deletions

diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile
index 763c4da9abc3..af07ab5747e7 100644
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kawa
-PORTVERSION=	2.1
+PORTVERSION=	2.3
 CATEGORIES=	lang scheme java
 MASTER_SITES=	GNU
 
@@ -19,25 +19,24 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-kawa-frontend \
 		--with-java-source=${JAVA_PORT_VERSION}
 CONFIGURE_ENV=	MAKEINFO=${LOCALBASE}/bin/makeinfo
-MAKE_ENV=	READLINE_LIB_PATH=${LOCALBASE}/lib
+MAKE_ARGS=	JAR="${JAR}" READLINE_LIB_PATH="-L${LOCALBASE}/lib"
+MAKE_ENV=	JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+TEST_TARGET=	check
+TEST_ARGS=	# must be empty, otherwise tests fail
+TEST_ENV=	# must be empty, otherwise tests fail
 
 MAKE_JOBS_UNSAFE=yes
 
 INFO=		kawa
 
-PLIST_FILES=	bin/kawa bin/qexo share/java/kawa.jar \
-		share/java/kawa-${PORTVERSION}.jar \
+PLIST_FILES=	bin/kawa bin/qexo \
+		share/kawa/bin/kawa share/kawa/lib/kawa.jar \
 		man/man1/kawa.1.gz man/man1/qexo.1.gz \
 
 pre-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
-		-e '/^JAR =/s|[a-zA-Z]*$$|${JAR}|g;'
 	@${REINPLACE_CMD} -e 's|{JAVAC-javac}|{JAVAC-${JAVAC}}|g;' \
 		-e 's|{JAVA-java}|{JAVA-${JAVA}}|g;' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^READLINE_LIB_PATH =/s|$$|-L${LOCALBASE}/lib|' \
-		${WRKSRC}/bin/Makefile.in ${WRKSRC}/bin/Makefile.am
-
-regression-test: build
-	${MAKE_CMD} -C ${WRKSRC} check
+	@${REINPLACE_CMD} -e '/life-grid.log$$/s,>&,>,' \
+		${WRKSRC}/testsuite/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/lang/kawa/distinfo b/lang/kawa/distinfo
index 2c9ff08687d0..e45679483ffb 100644
--- a/lang/kawa/distinfo
+++ b/lang/kawa/distinfo
@@ -1,2 +1,3 @@
-SHA256 (kawa-2.1.tar.gz) = caf8eb01fbefe82f3e44b5ad08d4356ee56335da79499d9cca2b720f7d04fd39
-SIZE (kawa-2.1.tar.gz) = 3015953
+TIMESTAMP = 1484583959
+SHA256 (kawa-2.3.tar.gz) = ecddb2b149e41f7c1614c3009138556b954e8cc6a3135a953eb97e7e86dc47fe
+SIZE (kawa-2.3.tar.gz) = 3273722
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`"}