Index: head/devel/sbt/Makefile =================================================================== --- head/devel/sbt/Makefile (revision 514495) +++ head/devel/sbt/Makefile (revision 514496) @@ -1,56 +1,56 @@ # Created by: Alex Dupre # $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}/ MAINTAINER= ale@FreeBSD.org 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 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} ${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 514495) +++ head/devel/sbt/distinfo (revision 514496) @@ -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 Index: head/devel/sbt/files/patch-bin_sbt =================================================================== --- head/devel/sbt/files/patch-bin_sbt (revision 514495) +++ head/devel/sbt/files/patch-bin_sbt (revision 514496) @@ -1,55 +1,57 @@ ---- 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")")" -declare -r sbt_home="$(dirname "$sbt_bin_dir")" +declare -r sbt_home="$sbt_bin_dir" echoerr () { echo 1>&2 "$@" -@@ -85,7 +85,7 @@ dlog () { +@@ -89,7 +89,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() { +@@ -281,14 +281,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() { +@@ -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 - /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)