<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3251b5c49c354b3d99977719dbecf8c1aefe5c13">https://github.com/macports/macports-ports/commit/3251b5c49c354b3d99977719dbecf8c1aefe5c13</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 3251b5c49c3 emacs{,-app}: update to 29.1
</span>3251b5c49c3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3251b5c49c354b3d99977719dbecf8c1aefe5c13
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Sun Jul 30 21:08:21 2023 +0900

<span style='display:block; white-space:pre;color:#404040;'>    emacs{,-app}: update to 29.1
</span>---
 editors/emacs/Portfile                             | 102 +++++++++++----------
 .../files/{site-start.el => site-start-app.el}     |   0
 editors/emacs/files/site-start.el                  |  17 ----
 3 files changed, 53 insertions(+), 66 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 0bf730d7f52..935c1be15e4 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;'>@@ -46,11 +46,14 @@ configure.args  --disable-silent-rules \
</span>                 --without-gconf \
                 --without-libotf \
                 --without-m17n-flt \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                --without-tree-sitter \
</span>                 --with-libgmp \
                 --with-gnutls \
                 --with-json \
                 --with-xml2 \
                 --with-modules \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                --with-sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                --with-webp \
</span>                 --infodir ${prefix}/share/info/${name}
 
 depends_build-append   port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,15 +62,22 @@ depends_lib-append     port:gmp \
</span>                        path:lib/pkgconfig/gnutls.pc:gnutls \
                        port:jansson \
                        port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                       port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       port:webp
</span> 
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/emacs/${version}/leim
     delete ${destroot}${prefix}/bin/ctags
     delete ${destroot}${prefix}/share/man/man1/ctags.1.gz
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # avoid conflicts with xemacs
</span>     if {$subport eq $name || $subport eq "emacs-devel"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        file copy ${filespath}/site-start.el \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${prefix}/share/emacs/site-lisp/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${prefix}/share/emacs/site-lisp/site-start.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # avoid conflicts with xemacs
</span>         move ${destroot}${prefix}/bin/etags ${destroot}${prefix}/bin/etags-emacs
         move ${destroot}${prefix}/share/man/man1/etags.1.gz ${destroot}${prefix}/share/man/man1/etags-emacs.1.gz
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,12 +102,12 @@ platform darwin {
</span> }
 
 if {$subport eq $name || $subport eq "emacs-app"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         28.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         29.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       rmd160  4690d9ab3e7878cbb25eb19c2931c587f971b3bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  a6912b14ef4abb1edab7f88191bfd61c3edd7085e084de960a4f86485cb7cad8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    71332149
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  c306a0554d77ee472600ed28af4751211dc1ec70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  5b80e0475b0e619d2ad395ef5bc481b7cb9f13894ed23c301210572040e4b5b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    78324084
</span> }
 
 if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,50 +124,11 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span>                     sha256  815333b399dd6978c28bfd80828a086dcf54ed2266ea3a3ef8d73707b25749e1 \
                     size    48420650
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --with-sqlite3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --with-webp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --without-tree-sitter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:webp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     pre-configure {
         system -W ${worksrcpath} "sh ./autogen.sh"
     }
 
     livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant treesitter description {Builds emacs with tree-sitter support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-delete   --without-tree-sitter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   --with-tree-sitter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append  port:tree-sitter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_run-append  port:tree-sitter-typescript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-javascript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-tsx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-java \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-css \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-json \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-c-sharp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-bash \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-dockerfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-toml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-go \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-go-mod \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-yaml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-rust \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:tree-sitter-ruby \
</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;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants-append +treesitter
</span> } else {
     livecheck.type  regex
     livecheck.url   https://ftp.gnu.org/gnu/emacs/?C=M&O=D
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,8 +243,8 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span>             ${destroot}${applications_dir}
         # fix read-permission to resources
         system "chmod a+r ${destroot}${applications_dir}/Emacs.app/Contents/Resources/*"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        file copy ${filespath}/site-start.el \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file copy ${filespath}/site-start-app.el \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
</span>         reinplace "s|__PREFIX__|${prefix}|g" \
             ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,4 +284,37 @@ variant nativecomp description {Builds emacs with native compilation support} {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +nativecomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant treesitter description {Builds emacs with tree-sitter support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete   --without-tree-sitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --with-tree-sitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  port:tree-sitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-typescript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-javascript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-tsx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-java \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-json \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-c-sharp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-dockerfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-toml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-go \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-go-mod \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-rust \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:tree-sitter-ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_run-append \
</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;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +nativecomp +treesitter
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/site-start.el b/editors/emacs/files/site-start-app.el
</span>similarity index 100%
copy from editors/emacs/files/site-start.el
copy to editors/emacs/files/site-start-app.el
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/site-start.el b/editors/emacs/files/site-start.el
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d123484c7f..f057c90ece4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-;; load-path contains ${prefix}/share/emacs/site-lisp and its subdirecotries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-;; See #12115, #29232, #32146.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(setq load-path (cons "__PREFIX__/share/emacs/site-lisp" load-path))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(if (file-readable-p "__PREFIX__/share/emacs/site-lisp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    (let ((default-directory "__PREFIX__/share/emacs/site-lisp"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      (if (file-readable-p "__PREFIX__/share/emacs/site-lisp/subdirs.el")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          (load "__PREFIX__/share/emacs/site-lisp/subdirs.el")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        (if (fboundp 'normal-top-level-add-subdirs-to-load-path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            (normal-top-level-add-subdirs-to-load-path)))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-;; Info-directory-list contains ${prefix}/share/info. See #32148.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(setq Info-default-directory-list (cons "__PREFIX__/share/info" Info-default-directory-list))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-;; Use the OS X Emoji font for Emoticons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(when (fboundp 'set-fontset-font)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  (set-fontset-font t 'emoji '("Apple Color Emoji" . "iso10646-1") nil 'prepend))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ;; Look in MacPorts ${prefix} for tree-sitter parser libraries
 (when (boundp 'treesit-extra-load-path)
   (setq treesit-extra-load-path (cons "__PREFIX__/lib" treesit-extra-load-path)))
</pre><pre style='margin:0'>

</pre>