diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2019-10-15 08:58:50 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2019-10-15 08:58:50 +0000 |
| commit | ffd08601d30f22582c6b0ad44dfb4a7d30a42b36 (patch) | |
| tree | fc2ebf926a409d2b82131a35f45d015821f5d352 /devel | |
| parent | 2df98e808d465d392fc22d3fae911b3bd4106973 (diff) | |
| download | ports-ffd08601d30f22582c6b0ad44dfb4a7d30a42b36.tar.gz ports-ffd08601d30f22582c6b0ad44dfb4a7d30a42b36.zip | |
Notes
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/sbt/Makefile | 2 | ||||
| -rw-r--r-- | devel/sbt/distinfo | 6 | ||||
| -rw-r--r-- | devel/sbt/files/patch-bin_sbt | 16 |
3 files changed, 13 insertions, 11 deletions
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile index 4e9589834587..4a3d6e6e967a 100644 --- a/devel/sbt/Makefile +++ b/devel/sbt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.3 CATEGORIES= devel java MASTER_SITES= https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/ diff --git a/devel/sbt/distinfo b/devel/sbt/distinfo index d27ace59e328..5c4700971c50 100644 --- a/devel/sbt/distinfo +++ b/devel/sbt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1569004421 -SHA256 (sbt-1.3.2.tgz) = ed8cef399129895ad0d757eea812b3f95830a36fa838f8ede1c6cdc2294f326f -SIZE (sbt-1.3.2.tgz) = 51817549 +TIMESTAMP = 1571129370 +SHA256 (sbt-1.3.3.tgz) = fe64a24ecd26ae02ac455336f664bbd7db6a040144b3106f1c45ebd42e8a476c +SIZE (sbt-1.3.3.tgz) = 51853861 diff --git a/devel/sbt/files/patch-bin_sbt b/devel/sbt/files/patch-bin_sbt index 7c19ac2641d7..acce41d9cecf 100644 --- a/devel/sbt/files/patch-bin_sbt +++ b/devel/sbt/files/patch-bin_sbt @@ -1,6 +1,6 @@ ---- bin/sbt.orig 2019-09-04 07:20:45 UTC +--- bin/sbt.orig 2019-10-14 14:34:15 UTC +++ bin/sbt -@@ -72,7 +72,7 @@ cygwinpath() { +@@ -76,7 +76,7 @@ cygwinpath() { declare -r sbt_bin_dir="$(dirname "$(realpathish "$0")")" @@ -9,7 +9,7 @@ echoerr () { echo 1>&2 "$@" -@@ -85,7 +85,7 @@ dlog () { +@@ -89,7 +89,7 @@ dlog () { } jar_file () { @@ -18,7 +18,7 @@ } acquire_sbt_jar () { -@@ -277,14 +277,14 @@ getPreloaded() { +@@ -281,14 +281,14 @@ getPreloaded() { } syncPreloaded() { @@ -35,16 +35,18 @@ [[ -d "$source_preloaded" ]] && { command -v rsync >/dev/null 2>&1 && { mkdir -p "$target_preloaded" -@@ -401,7 +401,7 @@ run() { +@@ -408,8 +408,8 @@ run() { 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" +-# this allows /etc/sbt/sbtopts location to be changed +declare -r etc_sbt_opts_file="%%PREFIX%%/etc/sbt/sbtopts" ++# this allows %%PREFIX%%/etc/sbt/sbtopts location to be changed + declare -r etc_file="${SBT_ETC_FILE:-$etc_sbt_opts_file}" declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts" declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt" - -@@ -446,7 +446,7 @@ Usage: `basename "$0"` [options] +@@ -459,7 +459,7 @@ Usage: `basename "$0"` [options] SBT_OPTS environment variable, if unset uses "$default_sbt_opts" .sbtopts if this file exists in the current directory, its contents are prepended to the runner args |