Update Emacs ports for 30.1 release

devel/tree-sitter-go-work/Portfile

@@ -0,0 +1,28 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
+PortSystem          1.0
+PortGroup           github 1.0
+PortGroup           tree_sitter 1.0
+
+github.setup        omertuc tree-sitter-go-work 949a8a470559543857a62102c84700d291fc984c
+version             20221004
+github.tarball_from archive
+revision            0
+
+checksums           rmd160  dc373d0f831d28768c1e861f77823c4daa94c97b \
+                    sha256  e72981468f9d17af91d5a0f2d54b082b86a863d5cbba6cce792e0d4f54bb4e38 \
+                    size    15273
+
+description         A tree-sitter parser for go.work files
+
+long_description    {*}${description}
+
+categories          devel
+license             MIT
+maintainers         {amake @amake} openmaintainer
+
+worksrcdir          ${worksrcdir}/src
+
+tree_sitter.libname gowork
+
+github.livecheck.branch main

editors/emacs/Portfile

@@ -1,4 +1,4 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem      1.0
 PortGroup       active_variants 1.1
@@ -54,24 +54,29 @@
                 --without-tree-sitter \
                 --with-libgmp \
                 --with-gnutls \
-                --with-json \
                 --with-xml2 \
                 --with-modules \
                 --with-sqlite3 \
                 --with-webp \
+                --with-native-compilation=no \
                 --infodir ${prefix}/share/info/${name}
 
+# Later-on this could potentially be a variant, given enough demand. See:
+# https://github.com/emacs-mirror/emacs/commit/4c6f45fa8eef1a15d5790c1f3d3e608b548015db#diff-731c852b7c27c6ee90c44c871e2988ecfc2d225bc720156d7a47c1d563c2683aR59
+configure.args-append  --disable-gc-mark-trace
+
 pre-configure {
     if {[llength $rpaths] > 0} {
         configure.ldflags-append "-Wl,-rpath " [join $rpaths " -Wl,-rpath "]
     }
+
+    system -W ${worksrcpath} "sh ./autogen.sh"
 }
 
 depends_build-append   port:pkgconfig \
                        port:texinfo
 depends_lib-append     port:gmp \
                        path:lib/pkgconfig/gnutls.pc:gnutls \
-                       port:jansson \
                        port:libxml2 \
                        port:ncurses \
                        port:sqlite3 \
@@ -110,56 +115,37 @@
 }
 
 if {$subport eq $name || $subport eq "emacs-app"} {
-    version         29.4
-    revision        2
-    checksums       rmd160  b32b86be6f600ba745ad023efd7238088dfa5952 \
-                    sha256  1adb1b9a2c6cdb316609b3e86b0ba1ceb523f8de540cfdda2aec95b6a5343abf \
-                    size    78519074
-
-    patchfiles-append \
-                    patch-allow-powerpc.diff
+    version         30.1
+    revision        0
+    checksums       rmd160  d84d527bb0db3d56d558e8f4bed80af5e3eddef3 \
+                    sha256  54404782ea5de37e8fcc4391fa9d4a41359a4ba9689b541f6bc97dd1ac283f6c \
+                    size    82678582
 }
 
+patchfiles-append   patch-allow-powerpc.diff
+
 if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
     PortGroup       github 1.0
 
     # do not forget to check that configure hasn't introduce some suprises via
     # git diff [old]..[new] -- '**/configure.ac'
-    github.setup    emacs-mirror emacs b3af195213518514f78ac6f66f9598e45befd1ec
-    # Change github.tarball_from to 'releases' or 'archive' next update
-    github.tarball_from tarball
+    github.setup    emacs-mirror emacs ae8522af41bb67bf417b94ed54146a43fe2150ec
+    github.tarball_from archive
     epoch           5
-    version         20241021
+    version         20250223
     revision        0
 
     master_sites    ${github.master_sites}
 
-    checksums       rmd160  5cfa75f07bd15346f131ec7313939f7ada06251c \
-                    sha256  8ad85e7ee9eaaa193207919d51c1ce26966dde8fe2bc90fa5326ea149ffa4cc8 \
-                    size    51709184
-
-    patchfiles-append \
-                    patch-allow-powerpc-devel.diff
-
-    pre-configure {
-        system -W ${worksrcpath} "sh ./autogen.sh"
-    }
+    checksums       rmd160  a27dee7593339d1d16421f9ed8e60e1adc30aefd \
+                    sha256  8614111d9478bf3293ba0cf66bf5494a46b49fc6cc403fb0d445a6a69f5d620e \
+                    size    51933907
 
     livecheck.type none
 
-    # Emacs 30 removes libjansson in favour of native JSON support.
-    configure.args-delete   --with-json
-    depends_lib-delete  port:jansson
-    configure.args-append   --with-native-compilation=no
-
-    # Later-on this could potentially be a variant, given enough demand. See: https://github.com/emacs-mirror/emacs/commit/4c6f45fa8eef1a15d5790c1f3d3e608b548015db#diff-731c852b7c27c6ee90c44c871e2988ecfc2d225bc720156d7a47c1d563c2683aR59
-    configure.args-append   --disable-gc-mark-trace
-
     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"
-
-        configure.args-replace  --with-native-compilation=no --with-native-compilation=aot
     }
 } else {
     livecheck.type  regex
@@ -303,7 +289,8 @@
 variant nativecomp description {Builds emacs with native compilation support} {
     set gcc_v                      14
     depends_lib-append             port:gcc${gcc_v}
-    configure.args-append          --with-native-compilation=aot
+    configure.args-replace         --with-native-compilation=no \
+                                   --with-native-compilation=aot
     compiler.cpath-prepend         ${prefix}/include/gcc${gcc_v}
     compiler.library_path-prepend  ${prefix}/lib/gcc${gcc_v}
     lappend rpaths                 ${prefix}/lib/gcc${gcc_v}
@@ -337,15 +324,17 @@
         port:tree-sitter-go-mod \
         port:tree-sitter-yaml \
         port:tree-sitter-rust \
-        port:tree-sitter-ruby
+        port:tree-sitter-ruby \
+        port:tree-sitter-html \
+        port:tree-sitter-heex \
+        port:tree-sitter-elixir \
+        port:tree-sitter-lua \
+        port:tree-sitter-php
 
     if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
         depends_run-append \
-            port:tree-sitter-html \
-            port:tree-sitter-heex \
-            port:tree-sitter-elixir \
-            port:tree-sitter-lua \
-            port:tree-sitter-php
+            port:tree-sitter-markdown \
+            port:tree-sitter-go-work
     }
 
     notes-append "

editors/emacs/files/patch-allow-powerpc.diff

@@ -1,6 +1,6 @@
---- configure	2024-03-24 21:15:23.000000000 +0800
-+++ configure	2024-04-05 10:22:30.000000000 +0800
-@@ -6108,13 +6108,7 @@
+--- configure.ac	2024-03-24 21:02:33.000000000 +0800
++++ configure.ac	2024-04-05 10:19:13.000000000 +0800
+@@ -738,11 +738,6 @@
 
    ## Apple Darwin / macOS
    *-apple-darwin* )
@@ -10,7 +10,5 @@
 -      * )            unported=yes ;;
 -    esac
      opsys=darwin
--    ## FIXME: Find a way to use Fink if available (Bug#11507).
+     ## FIXME: Find a way to use Fink if available (Bug#11507).
    ;;
-
-   ## Chromium Native Client