Attachment #176302 for bug #213913

View | Details | Raw Unified | Return to bug 213913
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/devel/sbt/Makefile 412346 2016-04-01 14:00:51Z mat $	2	# $FreeBSD: head/devel/sbt/Makefile 412346 2016-04-01 14:00:51Z mat $
3		3
4	PORTNAME= sbt	4	PORTNAME= sbt
5	PORTVERSION= 0.13.11	5	PORTVERSION= 0.13.13
6	CATEGORIES= devel java	6	CATEGORIES= devel java
7	MASTER_SITES= http://dl.bintray.com/sbt/native-packages/sbt/${PORTVERSION}/	7	MASTER_SITES= http://dl.bintray.com/sbt/native-packages/sbt/${PORTVERSION}/
8		8
Lines 18-24 ADVANCED_DESC= Install advanced bash shell-script Link Here
18	USES= tar:tgz	18	USES= tar:tgz
19	NO_BUILD= yes	19	NO_BUILD= yes
20	USE_JAVA= yes	20	USE_JAVA= yes
21	WRKSRC= ${WRKDIR}/${PORTNAME}	21	WRKSRC= ${WRKDIR}/${PORTNAME}-launcher-packaging-${PORTVERSION}
22		22
23	PLIST_FILES= bin/sbt \	23	PLIST_FILES= bin/sbt \
24	%%DATADIR%%/sbt-launch.jar	24	%%DATADIR%%/sbt-launch.jar

Lines 1-2 Link Here

(-)b/distinfo (-2 / +2 lines)
1	SHA256 (sbt-0.13.11.tgz) = a36a6fbf6dd70afd93fb8db16c40e8ac00798fdddfa0b4c678786dc15617afa6	1	SHA256 (sbt-0.13.13.tgz) = 40d03d21a260c5a6a43f8349298f41c9d047f97972057d9d915afd8945faf979
2	SIZE (sbt-0.13.11.tgz) = 1049516	2	SIZE (sbt-0.13.13.tgz) = 1049906




--- bin/sbt.orig	2016-10-30 10:52:10.050293000 +0100
+++ bin/sbt	2016-10-30 10:53:30.346273000 +0100
@@ -62,7 +62,7 @@
 
 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 win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
 
 usage() {
@@ -99,7 +99,7 @@
   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/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)

Lines 1-6 Link Here

(-)b/files/patch-bin_sbt-launch-lib.bash (-3 / +3 lines)
1	--- bin/sbt-launch-lib.bash.orig 2013-08-28 10:14:44.000000000 +0200	1	--- bin/sbt-launch-lib.bash.orig 2016-10-30 10:54:51.920516000 +0100
2	+++ bin/sbt-launch-lib.bash 2013-08-28 10:20:01.000000000 +0200	2	+++ bin/sbt-launch-lib.bash 2016-10-30 10:55:41.401276000 +0100
3	@@ -31,7 +31,7 @@	3	@@ -26,7 +26,7 @@
4	}	4	}
5		5
6	jar_file () {	6	jar_file () {

Return to bug 213913

Lines 1-6 Link Here

(-)b/files/patch-bin_sbt (-7 / +7 lines)
1	--- bin/sbt.orig 2013-08-28 10:14:39.000000000 +0200	1	--- bin/sbt.orig 2016-10-30 10:52:10.050293000 +0100
2	+++ bin/sbt 2013-08-28 10:16:02.000000000 +0200	2	+++ bin/sbt 2016-10-30 10:53:30.346273000 +0100
3	@@ -63,7 +63,7 @@	3	@@ -62,7 +62,7 @@
4		4
5	declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"	5	declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
6	declare -r sbt_opts_file=".sbtopts"	6	declare -r sbt_opts_file=".sbtopts"
Lines 9-20 Link Here
9	declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"	9	declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
10		10
11	usage() {	11	usage() {
12	@@ -98,7 +98,7 @@	12	@@ -99,7 +99,7 @@
13	SBT_OPTS environment variable, if unset uses "$default_sbt_opts"	13	SBT_OPTS environment variable, if unset uses "$default_sbt_opts"
14	.sbtopts if this file exists in the current directory, it is	14	.sbtopts if this file exists in the current directory, its contents
15	prepended to the runner args	15	are prepended to the runner args
16	- /etc/sbt/sbtopts if this file exists, it is prepended to the runner args	16	- /etc/sbt/sbtopts if this file exists, it is prepended to the runner args
17	+ ${sbt_home}/etc/sbtopts if this file exists, it is prepended to the runner args	17	+ ${sbt_home}/etc/sbt/sbtopts if this file exists, it is prepended to the runner args
18	-Dkey=val pass -Dkey=val directly to the java runtime	18	-Dkey=val pass -Dkey=val directly to the java runtime
19	-J-X pass option -X directly to the java runtime	19	-J-X pass option -X directly to the java runtime
20	(-J is stripped)	20	(-J is stripped)