From owner-svn-ports-all@freebsd.org Mon Dec 3 08:56:35 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74661131B020; Mon, 3 Dec 2018 08:56:35 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1931778307; Mon, 3 Dec 2018 08:56:35 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE47313B13; Mon, 3 Dec 2018 08:56:34 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB38uYmv035172; Mon, 3 Dec 2018 08:56:34 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB38uYP4035169; Mon, 3 Dec 2018 08:56:34 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201812030856.wB38uYP4035169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Mon, 3 Dec 2018 08:56:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486504 - in head/devel/sbt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ale X-SVN-Commit-Paths: in head/devel/sbt: . files X-SVN-Commit-Revision: 486504 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1931778307 X-Spamd-Result: default: False [0.37 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.05)[0.050,0]; NEURAL_SPAM_MEDIUM(0.03)[0.029,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.29)[0.288,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2018 08:56:35 -0000 Author: ale Date: Mon Dec 3 08:56:34 2018 New Revision: 486504 URL: https://svnweb.freebsd.org/changeset/ports/486504 Log: Update to 1.2.7 release. Modified: head/devel/sbt/Makefile head/devel/sbt/distinfo head/devel/sbt/files/patch-bin_sbt-launch-lib.bash Modified: head/devel/sbt/Makefile ============================================================================== --- head/devel/sbt/Makefile Mon Dec 3 08:52:03 2018 (r486503) +++ head/devel/sbt/Makefile Mon Dec 3 08:56:34 2018 (r486504) @@ -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}/ Modified: head/devel/sbt/distinfo ============================================================================== --- head/devel/sbt/distinfo Mon Dec 3 08:52:03 2018 (r486503) +++ head/devel/sbt/distinfo Mon Dec 3 08:56:34 2018 (r486504) @@ -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 Modified: head/devel/sbt/files/patch-bin_sbt-launch-lib.bash ============================================================================== --- head/devel/sbt/files/patch-bin_sbt-launch-lib.bash Mon Dec 3 08:52:03 2018 (r486503) +++ head/devel/sbt/files/patch-bin_sbt-launch-lib.bash Mon Dec 3 08:56:34 2018 (r486504) @@ -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"