diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2018-12-03 08:56:34 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2018-12-03 08:56:34 +0000 |
| commit | f59186412adb6aa82ec7f4149bbd377cdcd88916 (patch) | |
| tree | 30ee200fc750b1830c61497edbe7734ef8aa66db | |
| parent | biology/gatk: Correct the target (diff) | |
Update to 1.2.7 release.
Notes
Notes:
svn path=/head/; revision=486504
| -rw-r--r-- | devel/sbt/Makefile | 2 | ||||
| -rw-r--r-- | devel/sbt/distinfo | 6 | ||||
| -rw-r--r-- | devel/sbt/files/patch-bin_sbt-launch-lib.bash | 31 |
3 files changed, 19 insertions, 20 deletions
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile index 00eb86fb915e..24f6fff4b4ed 100644 --- a/devel/sbt/Makefile +++ b/devel/sbt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.7 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 2f9916ba625a..b3d8ed87f696 100644 --- a/devel/sbt/distinfo +++ b/devel/sbt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540280683 -SHA256 (sbt-1.2.6.tgz) = 96597d4310ef1332aed439bf7d3edfd52ce8b8417688b01646e3c22de4c868db -SIZE (sbt-1.2.6.tgz) = 46954760 +TIMESTAMP = 1543826287 +SHA256 (sbt-1.2.7.tgz) = 2625cbd8db75ec9b4a57e9a0af55a5ee8ad7700e1eba7d97ad78d9296450e781 +SIZE (sbt-1.2.7.tgz) = 47171488 diff --git a/devel/sbt/files/patch-bin_sbt-launch-lib.bash b/devel/sbt/files/patch-bin_sbt-launch-lib.bash index b33892183f5e..f973c28e3925 100644 --- a/devel/sbt/files/patch-bin_sbt-launch-lib.bash +++ b/devel/sbt/files/patch-bin_sbt-launch-lib.bash @@ -1,6 +1,6 @@ ---- bin/sbt-launch-lib.bash.orig 2017-08-29 21:39:02 UTC +--- bin/sbt-launch-lib.bash.orig 2018-12-03 08:50:53 UTC +++ bin/sbt-launch-lib.bash -@@ -26,7 +26,7 @@ while [ -h "$SCRIPT" ] ; do +@@ -27,7 +27,7 @@ while [ -h "$SCRIPT" ] ; do fi done declare -r sbt_bin_dir="$(dirname "$SCRIPT")" @@ -9,7 +9,7 @@ echoerr () { echo 1>&2 "$@" -@@ -39,7 +39,7 @@ dlog () { +@@ -40,7 +40,7 @@ dlog () { } jar_file () { @@ -18,21 +18,20 @@ } acquire_sbt_jar () { -@@ -172,14 +172,14 @@ process_args () { +@@ -249,14 +249,14 @@ getPreloaded() { + } + syncPreloaded() { +- local source_preloaded="$sbt_home/lib/local-preloaded" ++ local source_preloaded="$sbt_home/local-preloaded" + local target_preloaded="$(getPreloaded)" if [[ "$init_sbt_version" == "" ]]; then # FIXME: better $init_sbt_version detection -- init_sbt_version="$(ls -1 "$sbt_home/lib/local-preloaded/org.scala-sbt/sbt/")" -+ init_sbt_version="$(ls -1 "$sbt_home/local-preloaded/org.scala-sbt/sbt/")" + init_sbt_version="$(ls -1 "$source_preloaded/org.scala-sbt/sbt/")" fi - [[ -f "$HOME/.sbt/preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || { - # lib/local-preloaded exists (This is optional) -- [[ -d "$sbt_home/lib/local-preloaded/" ]] && { -+ [[ -d "$sbt_home/local-preloaded/" ]] && { + [[ -f "$target_preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || { +- # lib/local-preloaded exists (This is optional) ++ # local-preloaded exists (This is optional) + [[ -d "$source_preloaded" ]] && { command -v rsync >/dev/null 2>&1 && { - mkdir -p "$HOME/.sbt/preloaded" -- rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$HOME/.sbt/preloaded" -+ rsync -a --ignore-existing "$sbt_home/local-preloaded/" "$HOME/.sbt/preloaded" - } - } - } + mkdir -p "$target_preloaded" |