diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index b690bde6b65a..d8817aae77ca 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	sbt
-PORTVERSION=	1.10.6
+PORTVERSION=	1.10.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
 WWW=		https://www.scala-sbt.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	infocmp:devel/ncurses
 
 USES=		tar:tgz
 
 OPTIONS_DEFINE=	ADVANCED # PRELOADED
 OPTIONS_DEFAULT=ADVANCED
 ADVANCED_DESC=	Install advanced bash shell-script (required for Java 11+)
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 ADVANCED_RUN_DEPENDS+=	bash:shells/bash
 
 ADVANCED_SUB_FILES_OFF=	sbt.sh
 
 PLIST_FILES=	bin/sbt
 
 PORTDATA=	*
 
 .include <bsd.port.options.mk>
 
 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
 	${LN} -s ../${DATADIR_REL}/sbt ${STAGEDIR}${PREFIX}/bin/
 .else
 	${INSTALL_SCRIPT} ${WRKDIR}/sbt.sh ${STAGEDIR}${PREFIX}/bin/sbt
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/sbt/distinfo b/devel/sbt/distinfo
index adfda1a03811..0430638b4309 100644
--- a/devel/sbt/distinfo
+++ b/devel/sbt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733353086
-SHA256 (sbt-1.10.6.tgz) = 7e1b098effec80614e838aa61b753a8b46237b24b706ec9b37609030800c111a
-SIZE (sbt-1.10.6.tgz) = 57171398
+TIMESTAMP = 1734952932
+SHA256 (sbt-1.10.7.tgz) = 32c15233c636c233ee25a2c31879049db7021cfef70807c187515c39b96b0fe6
+SIZE (sbt-1.10.7.tgz) = 57171395
diff --git a/devel/sbt/files/patch-bin_sbt b/devel/sbt/files/patch-bin_sbt
index 22ba479c55cf..d9ee59f200e5 100644
--- a/devel/sbt/files/patch-bin_sbt
+++ b/devel/sbt/files/patch-bin_sbt
@@ -1,57 +1,57 @@
---- bin/sbt.orig	2020-10-05 00:22:37 UTC
+--- bin/sbt.orig	2024-12-23 03:25:31 UTC
 +++ bin/sbt
-@@ -80,7 +80,7 @@ cygwinpath() {
- 
+@@ -100,7 +100,7 @@ declare -r sbt_bin_dir="$(dirname "$(realpathish "$0")
+ }
  
  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 "$@"
-@@ -93,7 +93,7 @@ dlog () {
+@@ -122,7 +122,7 @@ jar_file () {
  }
  
  jar_file () {
 -  echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")"
 +  echo "$(cygwinpath "${sbt_home}/sbt-launch.jar")"
  }
  
- acquire_sbt_jar () {
-@@ -290,14 +290,14 @@ getPreloaded() {
+ jar_url () {
+@@ -430,14 +430,14 @@ syncPreloaded() {
  }
  
  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"
-@@ -406,8 +406,8 @@ run() {
+@@ -567,8 +567,8 @@ declare -r build_props_file="$(pwd)/project/build.prop
  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"
-@@ -455,7 +455,7 @@ Usage: `basename "$0"` [options]
+ declare machine_sbt_opts_file="${etc_sbt_opts_file}"
+ declare config_home="${XDG_CONFIG_HOME:-$HOME/.config}/sbt"
+ [[ -f "${config_home}/sbtopts" ]] && machine_sbt_opts_file="${config_home}/sbtopts"
+@@ -621,7 +621,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)