Update to 0.13.0 release.

5 files changed, 23 insertions, 12 deletions

diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index 655f568f950c..321771ed2e4d 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sbt
-PORTVERSION=	0.12.4
+PORTVERSION=	0.13.0
 CATEGORIES=	devel java
 MASTER_SITES=	http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/${PORTVERSION}/
 DISTNAME=	${PORTNAME}
diff --git a/devel/sbt/distinfo b/devel/sbt/distinfo
index 15babd0bf4ff..fb709d832a40 100644
--- a/devel/sbt/distinfo
+++ b/devel/sbt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sbt/0.12.4/sbt.tgz) = 25fc4659effdefd13d2fed7bb75064cd782c7bad3ccec47929ad4e2db6cd4164
-SIZE (sbt/0.12.4/sbt.tgz) = 1087000
+SHA256 (sbt/0.13.0/sbt.tgz) = d646afe3693fcc03614ca835026a6ec789b7d09dc42c0ed7ebc9055de1023905
+SIZE (sbt/0.13.0/sbt.tgz) = 987161
diff --git a/devel/sbt/files/patch-bin_sbt b/devel/sbt/files/patch-bin_sbt
index b62ae11e66d0..eacecfefbbd3 100644
--- a/devel/sbt/files/patch-bin_sbt
+++ b/devel/sbt/files/patch-bin_sbt
@@ -1,20 +1,20 @@
---- bin/sbt.orig	2013-01-18 19:54:47.000000000 +0100
-+++ bin/sbt	2013-02-14 21:48:47.000000000 +0100
-@@ -25,7 +25,7 @@ realpath () {
+--- 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 @@
  
  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="/etc/sbt/sbtopts"
-+declare -r etc_sbt_opts_file="%%PREFIX%%/etc/sbt/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() {
-  cat <<EOM
-@@ -59,7 +59,7 @@ Usage: $script_name [options]
+@@ -98,7 +98,7 @@
    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
 -  /etc/sbt/sbtopts   if this file exists, it is prepended to the runner args
-+  %%PREFIX%%/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)
diff --git a/devel/sbt/files/patch-bin_sbt-launch-lib.bash b/devel/sbt/files/patch-bin_sbt-launch-lib.bash
new file mode 100644
index 000000000000..fc90ed82b447
--- /dev/null
+++ b/devel/sbt/files/patch-bin_sbt-launch-lib.bash
@@ -0,0 +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 @@
+ }
+ 
+ jar_file () {
+-  echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")"
++  echo "$(cygwinpath "${sbt_bin_dir}/sbt-launch.jar")"
+ }
+ 
+ acquire_sbt_jar () {
diff --git a/devel/sbt/files/sbt.sh.in b/devel/sbt/files/sbt.sh.in
index 70f9dc2a7449..0c4620f967f3 100644
--- a/devel/sbt/files/sbt.sh.in
+++ b/devel/sbt/files/sbt.sh.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec "%%LOCALBASE%%/bin/java" -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M -jar "%%DATADIR%%/sbt-launch.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -jar "%%DATADIR%%/sbt-launch.jar" "$@"