Index: head/devel/sbt/Makefile =================================================================== --- head/devel/sbt/Makefile (revision 488783) +++ head/devel/sbt/Makefile (revision 488784) @@ -1,57 +1,56 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 1.2.7 -PORTREVISION= 2 +PORTVERSION= 1.2.8 CATEGORIES= devel java MASTER_SITES= https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/ MAINTAINER= ale@FreeBSD.org COMMENT= Build tool for Scala projects LICENSE= APACHE20 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 WRKSRC= ${WRKDIR}/${PORTNAME} ADVANCED_RUN_DEPENDS+= bash:shells/bash PRELOADED_RUN_DEPENDS+= rsync:net/rsync ADVANCED_SUB_FILES_OFF= sbt.sh PLIST_FILES= bin/sbt PORTDATA= * .include post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/bin/sbt do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${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} cd ${WRKSRC}/lib && ${COPYTREE_SHARE} local-preloaded ${STAGEDIR}${DATADIR} .endif ${LN} -s ../${DATADIR_REL}/sbt ${STAGEDIR}${PREFIX}/bin/ .else ${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/sbt.sh ${STAGEDIR}${PREFIX}/bin/sbt .endif .include Index: head/devel/sbt/distinfo =================================================================== --- head/devel/sbt/distinfo (revision 488783) +++ head/devel/sbt/distinfo (revision 488784) @@ -1,3 +1,3 @@ -TIMESTAMP = 1543826287 -SHA256 (sbt-1.2.7.tgz) = 2625cbd8db75ec9b4a57e9a0af55a5ee8ad7700e1eba7d97ad78d9296450e781 -SIZE (sbt-1.2.7.tgz) = 47171488 +TIMESTAMP = 1546262528 +SHA256 (sbt-1.2.8.tgz) = 9bb9212541176d6fcce7bd12e4cf8a9c9649f5b63f88b3aff474e0b02c7cfe58 +SIZE (sbt-1.2.8.tgz) = 47179935 Index: head/devel/sbt/files/patch-bin_sbt =================================================================== --- head/devel/sbt/files/patch-bin_sbt (revision 488783) +++ head/devel/sbt/files/patch-bin_sbt (revision 488784) @@ -1,20 +1,20 @@ ---- bin/sbt.orig 2017-08-29 21:39:02 UTC +--- bin/sbt.orig 2018-12-30 07:45:19 UTC +++ bin/sbt @@ -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="/etc/sbt/sbtopts" +declare -r etc_sbt_opts_file="%%PREFIX%%/etc/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: $script_name [options] +@@ -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) Index: head/devel/sbt/files/patch-bin_sbt-launch-lib.bash =================================================================== --- head/devel/sbt/files/patch-bin_sbt-launch-lib.bash (revision 488783) +++ head/devel/sbt/files/patch-bin_sbt-launch-lib.bash (revision 488784) @@ -1,37 +1,37 @@ ---- bin/sbt-launch-lib.bash.orig 2018-12-03 08:50:53 UTC +--- bin/sbt-launch-lib.bash.orig 2018-12-30 07:45:19 UTC +++ bin/sbt-launch-lib.bash @@ -27,7 +27,7 @@ while [ -h "$SCRIPT" ] ; do fi done declare -r sbt_bin_dir="$(dirname "$SCRIPT")" -declare -r sbt_home="$(dirname "$sbt_bin_dir")" +declare -r sbt_home="$sbt_bin_dir" echoerr () { echo 1>&2 "$@" @@ -40,7 +40,7 @@ dlog () { } jar_file () { - echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")" + echo "$(cygwinpath "${sbt_home}/sbt-launch.jar")" } acquire_sbt_jar () { @@ -249,14 +249,14 @@ getPreloaded() { } syncPreloaded() { -- local source_preloaded="$sbt_home/lib/local-preloaded" -+ local source_preloaded="$sbt_home/local-preloaded" +- 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"