Index: head/lang/kawa/Makefile
===================================================================
--- head/lang/kawa/Makefile	(revision 451697)
+++ head/lang/kawa/Makefile	(revision 451698)
@@ -1,38 +1,37 @@
 # Created by: Zach Garner <zach@neurosoft.org>
 # $FreeBSD$
 
 PORTNAME=	kawa
-PORTVERSION=	2.4
-PORTREVISION=	1
+PORTVERSION=	3.0
 CATEGORIES=	lang scheme java
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java-based Scheme implementation
 
 LICENSE=	MIT
 
 USES=		gmake groff readline
 USE_JAVA=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-kawa-frontend \
 		--with-java-source=${JAVA_PORT_VERSION}
 CONFIGURE_ENV=	JAVA="${JAVA}" JAVAC="${JAVAC}"
 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/kawa/bin/kawa share/kawa/lib/kawa.jar \
 		man/man1/kawa.1.gz man/man1/qexo.1.gz \
 
 post-patch:
 	@${REINPLACE_CMD} -e '/life-grid.log$$/s,>&,>,' \
 		${WRKSRC}/testsuite/Makefile.in
 
 .include <bsd.port.mk>
Index: head/lang/kawa/distinfo
===================================================================
--- head/lang/kawa/distinfo	(revision 451697)
+++ head/lang/kawa/distinfo	(revision 451698)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493585268
-SHA256 (kawa-2.4.tar.gz) = 14c08be81631a1eb8b8926ca235198ca165156c0c179ecbe6e838d3f4b47635d
-SIZE (kawa-2.4.tar.gz) = 3285436
+TIMESTAMP = 1507639439
+SHA256 (kawa-3.0.tar.gz) = 1e6e85217bd6d8c2a0c3478882a4570314df6b95078fe7b1225911c39abf38cd
+SIZE (kawa-3.0.tar.gz) = 3393879
Index: head/lang/kawa/files/patch-bin_kawa.sh.in
===================================================================
--- head/lang/kawa/files/patch-bin_kawa.sh.in	(revision 451697)
+++ head/lang/kawa/files/patch-bin_kawa.sh.in	(revision 451698)
@@ -1,31 +1,31 @@
---- bin/kawa.sh.in.orig	2016-11-22 21:30:51 UTC
+--- bin/kawa.sh.in.orig	2017-05-02 13:54:41 UTC
 +++ bin/kawa.sh.in
 @@ -1,13 +1,7 @@
  #!@KAWA_SHELL@
--thisfile=`type -p $0`
+-thisfile=`command -v $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`"}