<pre style='margin:0'>
Jimmy Yuen Ho Wong (wyuenho) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6112b96acfbc7bc98c344edf0cf75d3728027a6e">https://github.com/macports/macports-ports/commit/6112b96acfbc7bc98c344edf0cf75d3728027a6e</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 6112b96acfb Revert "emacs: remove extraneous tree-sitter dependencies"
</span>6112b96acfb is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6112b96acfbc7bc98c344edf0cf75d3728027a6e
</span>Author: Jimmy Yuen Ho Wong <wyuenho@gmail.com>
AuthorDate: Sat Jun 1 01:52:45 2024 +0100

<span style='display:block; white-space:pre;color:#404040;'>    Revert "emacs: remove extraneous tree-sitter dependencies"
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This reverts commit 4b37b676a0879da7cd034b4e6c55274e324bcd55.
</span>---
 editors/emacs/Portfile                | 33 +++++++++++++++++++++++++++++++++
 editors/emacs/files/site-start-app.el |  6 +++---
 editors/emacs/files/site-start.el     |  3 +++
 3 files changed, 39 insertions(+), 3 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 e51c88651e2..f44d6bdc071 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;'>@@ -74,6 +74,11 @@ post-destroot {
</span>     delete ${destroot}${prefix}/share/man/man1/ctags.1.gz
 
     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>         # avoid conflicts with xemacs
         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;'>@@ -290,6 +295,34 @@ variant treesitter description {Builds emacs with tree-sitter support} {
</span>     configure.args-delete   --without-tree-sitter
     configure.args-append   --with-tree-sitter
     depends_lib-append  port:tree-sitter
<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;'>+            port:tree-sitter-lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 default_variants-append     +treesitter
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/site-start-app.el b/editors/emacs/files/site-start-app.el
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bdac7aee94..2b02e6611bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/site-start-app.el
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/site-start-app.el
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +11,6 @@
</span> ;; Info-directory-list contains ${prefix}/share/info. See #32148.
 (setq Info-default-directory-list (cons "__PREFIX__/share/info" Info-default-directory-list))
 
<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:#e0ffe0;'>+;; Look in MacPorts ${prefix} for tree-sitter parser libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(when (boundp 'treesit-extra-load-path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  (setq treesit-extra-load-path (cons "__PREFIX__/lib" treesit-extra-load-path)))
</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.el
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f057c90ece4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; Look in MacPorts ${prefix} for tree-sitter parser libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(when (boundp 'treesit-extra-load-path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  (setq treesit-extra-load-path (cons "__PREFIX__/lib" treesit-extra-load-path)))
</span></pre><pre style='margin:0'>

</pre>