diff --git a/editors/treesheets/Portfile b/editors/treesheets/Portfile
index eb2d896ac9dde..2523ca4375c2c 100644
--- a/editors/treesheets/Portfile
+++ b/editors/treesheets/Portfile
@@ -5,9 +5,31 @@ PortGroup           cmake 1.1
 PortGroup           github 1.0
 PortGroup           wxWidgets 1.0
 
-github.setup        aardappel treesheets 4640240271
-version             20230408
-revision            0
+if {${os.platform} ne "darwin" || ${os.major} > 17} {
+    github.setup    aardappel treesheets 9435739325
+    version         20240609
+    revision        0
+
+    checksums       rmd160  9e0a59e955007cf7b05558323cc2eeee75e1f2ac \
+                    sha256  e6497fac777caac8f55631ec63e93007d389d2e271939a73c34bd9a18d8ddc2a \
+                    size    3088087
+
+    compiler.cxx_standard \
+                    2020
+} else {
+    # Pegged version for older systems.
+    # https://github.com/aardappel/treesheets/issues/670
+    github.setup    aardappel treesheets 4640240271
+    version         20230408
+    revision        0
+
+    checksums       rmd160  9164ba2f3ff1678cbaeac267da4c87684eee1012 \
+                    sha256  394b6ab25126a0b9fc680ec8dfd53385170664eb8fcb40b4e24489afda9ab770 \
+                    size    3060894
+
+    compiler.cxx_standard \
+                    2017
+}
 
 homepage            https://strlen.com/treesheets
 
@@ -21,17 +43,17 @@ license             zlib
 maintainers         {gmail.com:herby.gillot @herbygillot} \
                     openmaintainer
 
-checksums           ${distname}${extract.suffix} \
-                    rmd160  9164ba2f3ff1678cbaeac267da4c87684eee1012 \
-                    sha256  394b6ab25126a0b9fc680ec8dfd53385170664eb8fcb40b4e24489afda9ab770 \
-                    size    3060894
-
 github.tarball_from archive
 
 # https://github.com/aardappel/treesheets/pull/671
 patchfiles-append   0001-lobster-tools.h-avoid-conflicting-define-for-ssize_t.patch
 
-# https://github.com/aardappel/treesheets/issues/670
+set ts_app_dir      ${applications_dir}/TreeSheets.app
+set ts_libexec_dir  ${prefix}/libexec/${name}
+
+cmake.install_prefix \
+                    ${ts_libexec_dir}
+
 if {${os.platform} eq "darwin" && ${os.major} > 17} {
     wxWidgets.use   wxWidgets-3.2
 } elseif {${os.platform} eq "darwin" && ${os.major} > 11} {
@@ -40,15 +62,6 @@ if {${os.platform} eq "darwin" && ${os.major} > 17} {
     wxWidgets.use   wxGTK-3.0-cxx11
 }
 
-compiler.cxx_standard \
-                    2017
-
-set ts_app_dir      ${applications_dir}/TreeSheets.app
-set ts_libexec_dir  ${prefix}/libexec/${name}
-
-cmake.install_prefix \
-                    ${ts_libexec_dir}
-
 depends_lib-append  port:${wxWidgets.port}
 
 configure.env-append \
@@ -57,6 +70,7 @@ configure.env-append \
 build.env-append    PATH=$env(PATH):${wxWidgets.prefix}/bin
 
 configure.args-append \
+                    -DGIT_WXWIDGETS_SUBMODULES=OFF \
                     -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig}
 
 if {${os.platform} eq "darwin" && ${configure.build_arch} in [list ppc ppc64]} {