Index: head/devel/sbt/Makefile =================================================================== --- head/devel/sbt/Makefile (revision 486503) +++ head/devel/sbt/Makefile (revision 486504) @@ -1,56 +1,56 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.7 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 486503) +++ head/devel/sbt/distinfo (revision 486504) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540280683 -SHA256 (sbt-1.2.6.tgz) = 96597d4310ef1332aed439bf7d3edfd52ce8b8417688b01646e3c22de4c868db -SIZE (sbt-1.2.6.tgz) = 46954760 +TIMESTAMP = 1543826287 +SHA256 (sbt-1.2.7.tgz) = 2625cbd8db75ec9b4a57e9a0af55a5ee8ad7700e1eba7d97ad78d9296450e781 +SIZE (sbt-1.2.7.tgz) = 47171488 Index: head/devel/sbt/files/patch-bin_sbt-launch-lib.bash =================================================================== --- head/devel/sbt/files/patch-bin_sbt-launch-lib.bash (revision 486503) +++ head/devel/sbt/files/patch-bin_sbt-launch-lib.bash (revision 486504) @@ -1,38 +1,37 @@ ---- bin/sbt-launch-lib.bash.orig 2017-08-29 21:39:02 UTC +--- bin/sbt-launch-lib.bash.orig 2018-12-03 08:50:53 UTC +++ bin/sbt-launch-lib.bash -@@ -26,7 +26,7 @@ while [ -h "$SCRIPT" ] ; do +@@ -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 "$@" -@@ -39,7 +39,7 @@ dlog () { +@@ -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 () { -@@ -172,14 +172,14 @@ process_args () { +@@ -249,14 +249,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 "$sbt_home/lib/local-preloaded/org.scala-sbt/sbt/")" -+ init_sbt_version="$(ls -1 "$sbt_home/local-preloaded/org.scala-sbt/sbt/")" + init_sbt_version="$(ls -1 "$source_preloaded/org.scala-sbt/sbt/")" fi - [[ -f "$HOME/.sbt/preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || { - # lib/local-preloaded exists (This is optional) -- [[ -d "$sbt_home/lib/local-preloaded/" ]] && { -+ [[ -d "$sbt_home/local-preloaded/" ]] && { + [[ -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 "$HOME/.sbt/preloaded" -- rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$HOME/.sbt/preloaded" -+ rsync -a --ignore-existing "$sbt_home/local-preloaded/" "$HOME/.sbt/preloaded" - } - } - } + mkdir -p "$target_preloaded"