FreeBSD Bugzilla – Attachment 186166 Details for
Bug 222138
[PATCH] devel/sbt update to 1.0.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to update sbt from 1.0.0 to 1.0.1
patch-to-update-sbt-from-1.0.0-to-1.0.1.patch (text/plain), 4.08 KB, created by
j-keck
on 2017-09-08 10:59:50 UTC
(
hide
)
Description:
patch to update sbt from 1.0.0 to 1.0.1
Filename:
MIME Type:
Creator:
j-keck
Created:
2017-09-08 10:59:50 UTC
Size:
4.08 KB
patch
obsolete
>diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile >index 419228107..93da2173b 100644 >--- a/devel/sbt/Makefile >+++ b/devel/sbt/Makefile >@@ -2,9 +2,9 @@ > # $FreeBSD$ > > PORTNAME= sbt >-PORTVERSION= 1.0.0 >+PORTVERSION= 1.0.1 > CATEGORIES= devel java >-MASTER_SITES= https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/ >+MASTER_SITES= https://cocl.us/ > > MAINTAINER= ale@FreeBSD.org > COMMENT= Build tool for Scala projects >diff --git a/devel/sbt/distinfo b/devel/sbt/distinfo >index 960c17b61..190eb79ce 100644 >--- a/devel/sbt/distinfo >+++ b/devel/sbt/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1504078579 >-SHA256 (sbt-1.0.0.tgz) = 9ae04f4972145f2ac56c4deb868c9a5bb8b8b85c5151885dff3b997712645c5a >-SIZE (sbt-1.0.0.tgz) = 59735978 >+TIMESTAMP = 1504851545 >+SHA256 (sbt-1.0.1.tgz) = 5b68996a890b4a91efd9d13b9aca5e2b09f78c254c2907b3d548a9a7a73b0e5a >+SIZE (sbt-1.0.1.tgz) = 59744300 >diff --git a/devel/sbt/files/patch-bin_sbt b/devel/sbt/files/patch-bin_sbt >index a89c35c97..5243664ba 100644 >--- a/devel/sbt/files/patch-bin_sbt >+++ b/devel/sbt/files/patch-bin_sbt >@@ -1,20 +1,40 @@ >---- bin/sbt.orig 2016-10-28 17:46:00 UTC >+--- bin/sbt.orig 2017-09-08 07:31:36 UTC > +++ bin/sbt >-@@ -62,7 +62,7 @@ cygwinpath() { >+@@ -63,7 +63,7 @@ cygwinpath() { > > 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="${sbt_home}/conf/sbtopts" >-+declare -r etc_sbt_opts_file="${sbt_home}/etc/sbtopts" >+-declare -r etc_sbt_opts_file="/etc/sbt/sbtopts" >++declare -r etc_sbt_opts_file="/usr/local/etc/sbt/sbtopts" >+ declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts" > declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt" > >- usage() { >-@@ -99,7 +99,7 @@ Usage: $script_name [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 >+@@ -95,17 +95,17 @@ Usage: $script_name [options] >+ -java-home <path> alternate JAVA_HOME >+ >+ # jvm options and output control >+- JAVA_OPTS environment variable, if unset uses "$java_opts" >+- .jvmopts if this file exists in the current directory, its contents >+- are appended to JAVA_OPTS >+- 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 >-+ ${sbt_home}/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) >+- -Dkey=val pass -Dkey=val directly to the java runtime >+- -J-X pass option -X directly to the java runtime >+- (-J is stripped) >+- -S-X add -X to sbt's scalacOptions (-S is stripped) >++ JAVA_OPTS environment variable, if unset uses "$java_opts" >++ .jvmopts if this file exists in the current directory, its contents >++ are appended to JAVA_OPTS >++ 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 >++ /usr/local/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) >++ -S-X add -X to sbt's scalacOptions (-S is stripped) >+ >+ In the case of duplicated or conflicting options, the order above >+ shows precedence: JAVA_OPTS lowest, command line options highest.
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 222138
: 186166 |
186167