Index: head/lang/kawa/Makefile
===================================================================
--- head/lang/kawa/Makefile	(revision 374529)
+++ head/lang/kawa/Makefile	(revision 374530)
@@ -1,46 +1,43 @@
 # Created by: Zach Garner <zach@neurosoft.org>
 # $FreeBSD$
 
 PORTNAME=	kawa
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	lang scheme java
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	kawa
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java-based Scheme implementation
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 
 USES=		gmake readline
 USE_JAVA=	yes
 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
+CONFIGURE_ENV=	MAKEINFO=${LOCALBASE}/bin/makeinfo
+MAKE_ENV=	READLINE_LIB_PATH=${LOCALBASE}/lib
 
 MAKE_JOBS_UNSAFE=yes
 
 INFO=		kawa
 
 PLIST_FILES=	bin/kawa bin/qexo share/java/kawa.jar \
 		share/java/kawa-${PORTVERSION}.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
+		${WRKSRC}/bin/Makefile.in ${WRKSRC}/bin/Makefile.am
 
 regression-test: build
-	cd ${WRKSRC} && ${MAKE_CMD} check
+	${MAKE_CMD} -C ${WRKSRC} check
 
 .include <bsd.port.mk>
Index: head/lang/kawa/distinfo
===================================================================
--- head/lang/kawa/distinfo	(revision 374529)
+++ head/lang/kawa/distinfo	(revision 374530)
@@ -1,2 +1,2 @@
-SHA256 (kawa-1.14.tar.gz) = 2201cf3f4c57f49f15cf929d8634855cb8ef4ffe79158cecd66ebd5bd9b4b909
-SIZE (kawa-1.14.tar.gz) = 2691484
+SHA256 (kawa-2.0.tar.gz) = bf73041cebff6e8bbf13883a9a5fefa8bffd88fc68547b9cb6d3314e616211e5
+SIZE (kawa-2.0.tar.gz) = 2652727
Index: head/lang/kawa/pkg-descr
===================================================================
--- head/lang/kawa/pkg-descr	(revision 374529)
+++ head/lang/kawa/pkg-descr	(revision 374530)
@@ -1,7 +1,7 @@
-Kawa is a full Scheme implementation written in Java. With Kawa
-you can access Java objects, methods, fields and classes within
-your scheme code. Scheme functions and files are compiled into
-optimized Java byte-code, allowing you to write Java
-applications, applets, classes, and servlets in scheme.
+Kawa is a full Scheme implementation written in Java.  With Kawa you can
+access Java objects, methods, fields and classes within your Scheme code.
+Scheme functions and files are compiled into optimized Java byte-code,
+allowing you to write Java applications, applets, classes, and servlets
+in Scheme.
 
 WWW: http://www.gnu.org/software/kawa/