Index: head/devel/sbt/Makefile
===================================================================
--- head/devel/sbt/Makefile	(revision 424989)
+++ head/devel/sbt/Makefile	(revision 424990)
@@ -1,52 +1,49 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sbt
-PORTVERSION=	0.13.11
+PORTVERSION=	0.13.13
 CATEGORIES=	devel java
 MASTER_SITES=	http://dl.bintray.com/sbt/native-packages/sbt/${PORTVERSION}/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Build tool for Scala projects
 
 LICENSE=	APACHE20
 
 OPTIONS_DEFINE=	ADVANCED
 OPTIONS_DEFAULT=ADVANCED
 ADVANCED_DESC=	Install advanced bash shell-script
 
 USES=		tar:tgz
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_JAVA=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-launcher-packaging-${PORTVERSION}
 
 PLIST_FILES=	bin/sbt \
 		%%DATADIR%%/sbt-launch.jar
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MADVANCED}
 RUN_DEPENDS=	bash:shells/bash
 
 PLIST_FILES+=	%%DATADIR%%/sbt \
 		%%DATADIR%%/sbt-launch-lib.bash
 .else
 SUB_FILES=	sbt.sh
 .endif
-
-post-patch:
-	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" \
-		${WRKSRC}/bin/sbt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MADVANCED}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt-launch-lib.bash ${STAGEDIR}${DATADIR}
 	${LN} -s ${DATADIR}/sbt ${STAGEDIR}${PREFIX}/bin/
 .else
 	${INSTALL_SCRIPT} ${WRKDIR}/sbt.sh ${STAGEDIR}${PREFIX}/bin/sbt
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/sbt/distinfo
===================================================================
--- head/devel/sbt/distinfo	(revision 424989)
+++ head/devel/sbt/distinfo	(revision 424990)
@@ -1,2 +1,3 @@
-SHA256 (sbt-0.13.11.tgz) = a36a6fbf6dd70afd93fb8db16c40e8ac00798fdddfa0b4c678786dc15617afa6
-SIZE (sbt-0.13.11.tgz) = 1049516
+TIMESTAMP = 1477900389
+SHA256 (sbt-0.13.13.tgz) = 40d03d21a260c5a6a43f8349298f41c9d047f97972057d9d915afd8945faf979
+SIZE (sbt-0.13.13.tgz) = 1049906
Index: head/devel/sbt/files/patch-bin_sbt
===================================================================
--- head/devel/sbt/files/patch-bin_sbt	(revision 424989)
+++ head/devel/sbt/files/patch-bin_sbt	(revision 424990)
@@ -1,20 +1,20 @@
---- bin/sbt.orig	2013-08-28 10:14:39.000000000 +0200
-+++ bin/sbt	2013-08-28 10:16:02.000000000 +0200
-@@ -63,7 +63,7 @@
+--- bin/sbt.orig	2016-10-28 17:46:00 UTC
++++ bin/sbt
+@@ -62,7 +62,7 @@ cygwinpath() {
  
  declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
  declare -r sbt_opts_file=".sbtopts"
 -declare -r etc_sbt_opts_file="${sbt_home}/conf/sbtopts"
 +declare -r etc_sbt_opts_file="${sbt_home}/etc/sbtopts"
  declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
  
  usage() {
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,7 @@ Usage: $script_name [options]
    SBT_OPTS           environment variable, if unset uses "$default_sbt_opts"
-   .sbtopts           if this file exists in the current directory, it is
-                      prepended to the runner args
+   .sbtopts           if this file exists in the current directory, its contents
+                      are prepended to the runner args
 -  /etc/sbt/sbtopts   if this file exists, it is prepended to the runner args
 +  ${sbt_home}/etc/sbtopts   if this file exists, it is prepended to the runner args
    -Dkey=val          pass -Dkey=val directly to the java runtime
    -J-X               pass option -X directly to the java runtime 
                       (-J is stripped)
Index: head/devel/sbt/files/patch-bin_sbt-launch-lib.bash
===================================================================
--- head/devel/sbt/files/patch-bin_sbt-launch-lib.bash	(revision 424989)
+++ head/devel/sbt/files/patch-bin_sbt-launch-lib.bash	(revision 424990)
@@ -1,11 +1,11 @@
---- bin/sbt-launch-lib.bash.orig	2013-08-28 10:14:44.000000000 +0200
-+++ bin/sbt-launch-lib.bash	2013-08-28 10:20:01.000000000 +0200
-@@ -31,7 +31,7 @@
+--- bin/sbt-launch-lib.bash.orig	2016-10-28 17:46:00 UTC
++++ bin/sbt-launch-lib.bash
+@@ -26,7 +26,7 @@ dlog () {
  }
  
  jar_file () {
 -  echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")"
 +  echo "$(cygwinpath "${sbt_bin_dir}/sbt-launch.jar")"
  }
  
  acquire_sbt_jar () {