<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d46b399d06abd5f0a9bb9fb60f294d160ccad129">https://github.com/macports/macports-ports/commit/d46b399d06abd5f0a9bb9fb60f294d160ccad129</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 d46b399d06a emacs: Prevent Macports tree-sitter grammar libs from shadowing
</span>d46b399d06a is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    emacs: Prevent Macports tree-sitter grammar libs from shadowing
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * revert 2416784 prepending Apple Emoji is still needed for Emacs 29
</span>---
 editors/emacs/Portfile                | 32 +++++++++++++++++++++++---------
 editors/emacs/files/site-start-app.el |  6 +++---
 editors/emacs/files/site-start.el     |  3 ---
 3 files changed, 26 insertions(+), 15 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 f44d6bdc071..13986368e84 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;'>@@ -24,6 +24,8 @@ platforms       darwin freebsd
</span> homepage        https://www.gnu.org/software/emacs/emacs.html
 master_sites    gnu
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set rpaths [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {$subport eq $name} {
     conflicts   emacs-devel
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +58,12 @@ configure.args  --disable-silent-rules \
</span>                 --with-webp \
                 --infodir ${prefix}/share/info/${name}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[llength $rpaths] > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.ldflags-append "-Wl,-rpath " [join $rpaths " -Wl,-rpath "]
</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> depends_build-append   port:pkgconfig \
                        port:texinfo
 depends_lib-append     port:gmp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,11 +82,6 @@ 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:#ffe0e0;'>-        file copy ${filespath}/site-start.el \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${prefix}/share/emacs/site-lisp/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${prefix}/share/emacs/site-lisp/site-start.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>@@ -105,7 +108,7 @@ platform darwin {
</span> 
 if {$subport eq $name || $subport eq "emacs-app"} {
     version         29.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span>     checksums       rmd160  74592d7dba2f02b2d827a74b5a5aa5e2077fc73f \
                     sha256  2de8df5cab8ac697c69a1c46690772b0cf58fe7529f1d1999582c67d927d22e4 \
                     size    78508272
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,7 +125,7 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span>     github.setup    emacs-mirror emacs 2c887f497c723c2397888e2f406faa4de3a8208a
     epoch           5
     version         20240118
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span> 
     master_sites    ${github.master_sites}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,13 +291,18 @@ variant nativecomp description {Builds emacs with native compilation support} {
</span>     configure.args-append          --with-native-compilation=aot
     compiler.cpath-prepend         ${prefix}/include/gcc${gcc_v}
     compiler.library_path-prepend  ${prefix}/lib/gcc${gcc_v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.ldflags-append       "-Wl,-rpath ${prefix}/lib/gcc${gcc_v}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    lappend rpaths                 ${prefix}/lib/gcc${gcc_v}
</span> }
 
 variant treesitter description {Builds emacs with tree-sitter support} {
     configure.args-delete   --without-tree-sitter
     configure.args-append   --with-tree-sitter
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port: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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lappend rpaths ${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_run-append \
         port:tree-sitter-typescript \
         port:tree-sitter-javascript \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,6 +331,12 @@ variant treesitter description {Builds emacs with tree-sitter support} {
</span>             port:tree-sitter-elixir \
             port:tree-sitter-lua
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To install tree-sitter grammar libraries not required by built-in *-ts-modes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+please use M-x treesit-install-language-grammar.  For details, please refer to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+etc/NEWS or the Emacs Lisp reference manual.
</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 2b02e6611bb..1bdac7aee94 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;'>-;; Look in MacPorts ${prefix} for tree-sitter parser libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(when (boundp 'treesit-extra-load-path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  (setq treesit-extra-load-path (cons "__PREFIX__/lib" treesit-extra-load-path)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; Use the OS X Emoji font for Emoticons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(when (fboundp 'set-fontset-font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  (set-fontset-font t 'emoji '("Apple Color Emoji" . "iso10646-1") nil 'prepend))
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f057c90ece4..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-;; Look in MacPorts ${prefix} for tree-sitter parser libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(when (boundp 'treesit-extra-load-path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  (setq treesit-extra-load-path (cons "__PREFIX__/lib" treesit-extra-load-path)))
</span></pre><pre style='margin:0'>

</pre>