<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/35ef993098949e48d6a95ea6a052ca0a0f76c4fd">https://github.com/macports/macports-ports/commit/35ef993098949e48d6a95ea6a052ca0a0f76c4fd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 35ef993098949e48d6a95ea6a052ca0a0f76c4fd
</span>Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
AuthorDate: Mon Feb 24 08:40:30 2025 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs{,-app}: update to 30.1
</span>---
editors/emacs/Portfile | 60 ++++++++--------------
editors/emacs/files/patch-allow-powerpc-devel.diff | 14 -----
editors/emacs/files/patch-allow-powerpc.diff | 10 ++--
3 files changed, 26 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f75eb1d1728..ebf49ba804f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,24 +54,29 @@ configure.args --disable-silent-rules \
</span> --without-tree-sitter \
--with-libgmp \
--with-gnutls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-json \
</span> --with-xml2 \
--with-modules \
--with-sqlite3 \
--with-webp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-native-compilation=no \
</span> --infodir ${prefix}/share/info/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Later-on this could potentially be a variant, given enough demand. See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/emacs-mirror/emacs/commit/4c6f45fa8eef1a15d5790c1f3d3e608b548015db#diff-731c852b7c27c6ee90c44c871e2988ecfc2d225bc720156d7a47c1d563c2683aR59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --disable-gc-mark-trace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
if {[llength $rpaths] > 0} {
configure.ldflags-append "-Wl,-rpath " [join $rpaths " -Wl,-rpath "]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "sh ./autogen.sh"
</span> }
depends_build-append port:pkgconfig \
port:texinfo
depends_lib-append port:gmp \
path:lib/pkgconfig/gnutls.pc:gnutls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jansson \
</span> port:libxml2 \
port:ncurses \
port:sqlite3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,16 +115,15 @@ platform darwin {
</span> }
if {$subport eq $name || $subport eq "emacs-app"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 29.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b32b86be6f600ba745ad023efd7238088dfa5952 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1adb1b9a2c6cdb316609b3e86b0ba1ceb523f8de540cfdda2aec95b6a5343abf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 78519074
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-allow-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 30.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d84d527bb0db3d56d558e8f4bed80af5e3eddef3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 54404782ea5de37e8fcc4391fa9d4a41359a4ba9689b541f6bc97dd1ac283f6c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 82678582
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-allow-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,28 +142,11 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span> sha256 8ad85e7ee9eaaa193207919d51c1ce26966dde8fe2bc90fa5326ea149ffa4cc8 \
size 51709184
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-allow-powerpc-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "sh ./autogen.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Emacs 30 removes libjansson in favour of native JSON support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:jansson
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-native-compilation=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Later-on this could potentially be a variant, given enough demand. See: https://github.com/emacs-mirror/emacs/commit/4c6f45fa8eef1a15d5790c1f3d3e608b548015db#diff-731c852b7c27c6ee90c44c871e2988ecfc2d225bc720156d7a47c1d563c2683aR59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-gc-mark-trace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[variant_isset nativecomp]} {
notes "emacs devel subports don't always keep compatibility for native\
compiled files. Better to cleanup your ~/.emacs.d/.local/cache/eln"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-native-compilation=no --with-native-compilation=aot
</span> }
} else {
livecheck.type regex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -303,7 +290,8 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> variant nativecomp description {Builds emacs with native compilation support} {
set gcc_v 14
depends_lib-append port:gcc${gcc_v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-native-compilation=aot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --with-native-compilation=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-native-compilation=aot
</span> compiler.cpath-prepend ${prefix}/include/gcc${gcc_v}
compiler.library_path-prepend ${prefix}/lib/gcc${gcc_v}
lappend rpaths ${prefix}/lib/gcc${gcc_v}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -337,16 +325,12 @@ variant treesitter description {Builds emacs with tree-sitter support} {
</span> port:tree-sitter-go-mod \
port:tree-sitter-yaml \
port:tree-sitter-rust \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tree-sitter-ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tree-sitter-html \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tree-sitter-heex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tree-sitter-elixir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tree-sitter-lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tree-sitter-php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-ruby \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-heex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-elixir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-lua \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-php
</span>
notes-append "
To install tree-sitter grammar libraries not required by built-in *-ts-modes,\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-allow-powerpc-devel.diff b/editors/emacs/files/patch-allow-powerpc-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cd6bc122a11..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-allow-powerpc-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac 2024-03-24 21:02:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2024-04-05 10:19:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -738,11 +738,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Apple Darwin / macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-apple-darwin* )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case "${canonical}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-apple-darwin[0-9].*) unported=yes ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i[3456]86-* | x86_64-* | arm-* | aarch64-* ) ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * ) unported=yes ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opsys=darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## FIXME: Find a way to use Fink if available (Bug#11507).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-allow-powerpc.diff b/editors/emacs/files/patch-allow-powerpc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d73f863917..cd6bc122a11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-allow-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-allow-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure 2024-03-24 21:15:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2024-04-05 10:22:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6108,13 +6108,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2024-03-24 21:02:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-04-05 10:19:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,11 +738,6 @@
</span>
## Apple Darwin / macOS
*-apple-darwin* )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,5 @@
</span> - * ) unported=yes ;;
- esac
opsys=darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ## FIXME: Find a way to use Fink if available (Bug#11507).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## FIXME: Find a way to use Fink if available (Bug#11507).
</span> ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Chromium Native Client
</span></pre><pre style='margin:0'>
</pre>