Index: head/devel/sbt/Makefile =================================================================== --- head/devel/sbt/Makefile (revision 551480) +++ head/devel/sbt/Makefile (revision 551481) @@ -1,56 +1,56 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 1.3.13 +PORTVERSION= 1.4.0 CATEGORIES= devel java -MASTER_SITES= https://piccolo.link/ +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 (required for Java 11+) #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_DATA} ${WRKSRC}/bin/java9-rt-export.jar ${STAGEDIR}${DATADIR} ${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_SCRIPT} ${WRKDIR}/sbt.sh ${STAGEDIR}${PREFIX}/bin/sbt .endif .include Index: head/devel/sbt/distinfo =================================================================== --- head/devel/sbt/distinfo (revision 551480) +++ head/devel/sbt/distinfo (revision 551481) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593425558 -SHA256 (sbt-1.3.13.tgz) = 854154de27a7d8c13b5a0f9a297cd1f254cc13b44588dae507e5d4fb2741bd22 -SIZE (sbt-1.3.13.tgz) = 1227567 +TIMESTAMP = 1601885260 +SHA256 (sbt-1.4.0.tgz) = b4775b470920e03de7a5d81121b4dc741c00513f041e65dbb981052ec6d1eed5 +SIZE (sbt-1.4.0.tgz) = 17594029 Index: head/devel/sbt/files/patch-bin_sbt =================================================================== --- head/devel/sbt/files/patch-bin_sbt (revision 551480) +++ head/devel/sbt/files/patch-bin_sbt (revision 551481) @@ -1,57 +1,57 @@ ---- bin/sbt.orig 2019-12-26 02:47:03 UTC +--- bin/sbt.orig 2020-10-05 00:22:37 UTC +++ bin/sbt -@@ -76,7 +76,7 @@ cygwinpath() { +@@ -80,7 +80,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 "$@" -@@ -89,7 +89,7 @@ dlog () { +@@ -93,7 +93,7 @@ dlog () { } jar_file () { - echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")" + echo "$(cygwinpath "${sbt_home}/sbt-launch.jar")" } acquire_sbt_jar () { -@@ -286,14 +286,14 @@ getPreloaded() { +@@ -290,14 +290,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/" ]] || { - # 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" -@@ -413,8 +413,8 @@ run() { - - declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" +@@ -406,8 +406,8 @@ run() { + declare -ra 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 build_props_file="$(pwd)/project/build.properties" -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" -@@ -462,7 +462,7 @@ Usage: `basename "$0"` [options] +@@ -455,7 +455,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)