From owner-svn-ports-head@freebsd.org Tue Oct 15 08:58:51 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E82811588CA; Tue, 15 Oct 2019 08:58:51 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46sq975qDRz3Q8X; Tue, 15 Oct 2019 08:58:51 +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 90D7E1C2DC; Tue, 15 Oct 2019 08:58:51 +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 x9F8wpph009615; Tue, 15 Oct 2019 08:58:51 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9F8wp5k009612; Tue, 15 Oct 2019 08:58:51 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201910150858.x9F8wp5k009612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Tue, 15 Oct 2019 08:58:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514496 - 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: 514496 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2019 08:58:52 -0000 Author: ale Date: Tue Oct 15 08:58:50 2019 New Revision: 514496 URL: https://svnweb.freebsd.org/changeset/ports/514496 Log: Update to 1.3.3 release. Modified: head/devel/sbt/Makefile head/devel/sbt/distinfo head/devel/sbt/files/patch-bin_sbt Modified: head/devel/sbt/Makefile ============================================================================== --- head/devel/sbt/Makefile Tue Oct 15 08:28:55 2019 (r514495) +++ head/devel/sbt/Makefile Tue Oct 15 08:58:50 2019 (r514496) @@ -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}/ Modified: head/devel/sbt/distinfo ============================================================================== --- head/devel/sbt/distinfo Tue Oct 15 08:28:55 2019 (r514495) +++ head/devel/sbt/distinfo Tue Oct 15 08:58:50 2019 (r514496) @@ -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 Modified: head/devel/sbt/files/patch-bin_sbt ============================================================================== --- head/devel/sbt/files/patch-bin_sbt Tue Oct 15 08:28:55 2019 (r514495) +++ head/devel/sbt/files/patch-bin_sbt Tue Oct 15 08:58:50 2019 (r514496) @@ -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