Index: head/devel/sbt/Makefile =================================================================== --- head/devel/sbt/Makefile (revision 449452) +++ head/devel/sbt/Makefile (revision 449453) @@ -1,49 +1,54 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= devel java -MASTER_SITES= https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://cocl.us/ MAINTAINER= ale@FreeBSD.org COMMENT= Build tool for Scala projects LICENSE= APACHE20 -OPTIONS_DEFINE= ADVANCED +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} -PLIST_FILES= bin/sbt \ - %%DATADIR%%/sbt-launch.jar +ADVANCED_RUN_DEPENDS+= bash:shells/bash +PRELOADED_RUN_DEPENDS+= rsync:net/rsync -.include +ADVANCED_SUB_FILES_OFF= sbt.sh -.if ${PORT_OPTIONS:MADVANCED} -RUN_DEPENDS= bash:shells/bash +PLIST_FILES= bin/sbt -PLIST_FILES+= %%DATADIR%%/sbt \ - %%DATADIR%%/sbt-launch-lib.bash -.else -SUB_FILES= sbt.sh -.endif +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} +.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 449452) +++ head/devel/sbt/distinfo (revision 449453) @@ -1,3 +1,3 @@ -TIMESTAMP = 1504078579 -SHA256 (sbt-1.0.0.tgz) = 9ae04f4972145f2ac56c4deb868c9a5bb8b8b85c5151885dff3b997712645c5a -SIZE (sbt-1.0.0.tgz) = 59735978 +TIMESTAMP = 1504873206 +SHA256 (sbt-1.0.1.tgz) = 5b68996a890b4a91efd9d13b9aca5e2b09f78c254c2907b3d548a9a7a73b0e5a +SIZE (sbt-1.0.1.tgz) = 59744300 Index: head/devel/sbt/files/patch-bin_sbt =================================================================== --- head/devel/sbt/files/patch-bin_sbt (revision 449452) +++ head/devel/sbt/files/patch-bin_sbt (revision 449453) @@ -1,20 +1,20 @@ ---- bin/sbt.orig 2016-10-28 17:46:00 UTC +--- bin/sbt.orig 2017-08-29 21:39:02 UTC +++ bin/sbt -@@ -62,7 +62,7 @@ cygwinpath() { +@@ -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="${sbt_home}/conf/sbtopts" -+declare -r etc_sbt_opts_file="${sbt_home}/etc/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" - usage() { -@@ -99,7 +99,7 @@ Usage: $script_name [options] +@@ -101,7 +101,7 @@ Usage: $script_name [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 -+ ${sbt_home}/etc/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 449452) +++ head/devel/sbt/files/patch-bin_sbt-launch-lib.bash (revision 449453) @@ -1,11 +1,38 @@ ---- bin/sbt-launch-lib.bash.orig 2016-10-28 17:46:00 UTC +--- bin/sbt-launch-lib.bash.orig 2017-08-29 21:39:02 UTC +++ bin/sbt-launch-lib.bash -@@ -26,7 +26,7 @@ dlog () { +@@ -26,7 +26,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 () { } jar_file () { - echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")" -+ echo "$(cygwinpath "${sbt_bin_dir}/sbt-launch.jar")" ++ echo "$(cygwinpath "${sbt_home}/sbt-launch.jar")" } acquire_sbt_jar () { +@@ -172,14 +172,14 @@ process_args () { + syncPreloaded() { + 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/")" + 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/" ]] && { + 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" + } + } + }