Date: Wed, 4 Sep 2019 07:31:27 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511064 - in head/devel/sbt: . files Message-ID: <201909040731.x847VRYO092305@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Wed Sep 4 07:31:27 2019 New Revision: 511064 URL: https://svnweb.freebsd.org/changeset/ports/511064 Log: Update to 1.3.0 release. Deleted: head/devel/sbt/files/patch-bin_sbt-launch-lib.bash Modified: head/devel/sbt/Makefile head/devel/sbt/distinfo head/devel/sbt/files/patch-bin_sbt head/devel/sbt/files/sbt.sh.in Modified: head/devel/sbt/Makefile ============================================================================== --- head/devel/sbt/Makefile Wed Sep 4 07:31:11 2019 (r511063) +++ head/devel/sbt/Makefile Wed Sep 4 07:31:27 2019 (r511064) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 1.2.8 +PORTVERSION= 1.3.0 CATEGORIES= devel java MASTER_SITES= https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/ @@ -11,12 +11,13 @@ COMMENT= Build tool for Scala projects LICENSE= APACHE20 +USES= tar:tgz + OPTIONS_DEFINE= ADVANCED PRELOADED OPTIONS_DEFAULT=ADVANCED ADVANCED_DESC= Install advanced bash shell-script PRELOADED_DESC= Install preloaded jars for offline usage -USES= tar:tgz NO_BUILD= yes NO_ARCH= yes USE_JAVA= yes @@ -41,7 +42,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MADVANCED} ${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt-launch-lib.bash ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/conf ${INSTALL_DATA} ${FILESDIR}/sbtopts ${STAGEDIR}${DATADIR}/conf .if ${PORT_OPTIONS:MPRELOADED} Modified: head/devel/sbt/distinfo ============================================================================== --- head/devel/sbt/distinfo Wed Sep 4 07:31:11 2019 (r511063) +++ head/devel/sbt/distinfo Wed Sep 4 07:31:27 2019 (r511064) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546262528 -SHA256 (sbt-1.2.8.tgz) = 9bb9212541176d6fcce7bd12e4cf8a9c9649f5b63f88b3aff474e0b02c7cfe58 -SIZE (sbt-1.2.8.tgz) = 47179935 +TIMESTAMP = 1567580745 +SHA256 (sbt-1.3.0.tgz) = c9bc6bcbbe7a65773f4526ad5613d93f220ce21bd2456c3cf35363c4cdd52648 +SIZE (sbt-1.3.0.tgz) = 51621435 Modified: head/devel/sbt/files/patch-bin_sbt ============================================================================== --- head/devel/sbt/files/patch-bin_sbt Wed Sep 4 07:31:11 2019 (r511063) +++ head/devel/sbt/files/patch-bin_sbt Wed Sep 4 07:31:27 2019 (r511064) @@ -1,20 +1,55 @@ ---- bin/sbt.orig 2018-12-30 07:45:19 UTC +--- bin/sbt.orig 2019-09-04 07:20:45 UTC +++ bin/sbt -@@ -63,7 +63,7 @@ cygwinpath() { +@@ -72,7 +72,7 @@ cygwinpath() { + + declare -r sbt_bin_dir="$(dirname "$(realpathish "$0")")" +-declare -r sbt_home="$(dirname "$sbt_bin_dir")" ++declare -r sbt_home="$sbt_bin_dir" + + echoerr () { + echo 1>&2 "$@" +@@ -85,7 +85,7 @@ dlog () { + } + + jar_file () { +- echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")" ++ echo "$(cygwinpath "${sbt_home}/sbt-launch.jar")" + } + + acquire_sbt_jar () { +@@ -277,14 +277,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 "$source_preloaded/org/scala-sbt/sbt/")" + fi + [[ -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 "$target_preloaded" +@@ -401,7 +401,7 @@ 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" -+declare -r etc_sbt_opts_file="%%PREFIX%%/etc/sbtopts" ++declare -r etc_sbt_opts_file="%%PREFIX%%/etc/sbt/sbtopts" declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts" declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt" -@@ -101,7 +101,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 -- /etc/sbt/sbtopts if this file exists, it is prepended to the runner args -+ %%PREFIX%%/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) +@@ -446,7 +446,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 +- /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 + -Dkey=val pass -Dkey=val directly to the java runtime + -J-X pass option -X directly to the java runtime + (-J is stripped) Modified: head/devel/sbt/files/sbt.sh.in ============================================================================== --- head/devel/sbt/files/sbt.sh.in Wed Sep 4 07:31:11 2019 (r511063) +++ head/devel/sbt/files/sbt.sh.in Wed Sep 4 07:31:27 2019 (r511064) @@ -1,2 +1,2 @@ #!/bin/sh -exec "%%LOCALBASE%%/bin/java" -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -Dsbt.watch.mode=polling -Dsbt.io.jdktimestamps=true -jar "%%DATADIR%%/sbt-launch.jar" "$@" +exec "%%LOCALBASE%%/bin/java" -Xms1024M -Xmx1024M -Xss4M -XX:ReservedCodeCacheSize=128m -Dsbt.io.jdktimestamps=true -jar "%%DATADIR%%/sbt-launch.jar" "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909040731.x847VRYO092305>