<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/575dc77c9586252ea783ba723e13686757f0340f">https://github.com/macports/macports-ports/commit/575dc77c9586252ea783ba723e13686757f0340f</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 575dc77c958 emacs-mac-app{,devel}: fix resolving tree-sitter libraries
</span>575dc77c958 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 575dc77c9586252ea783ba723e13686757f0340f
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Tue Jun 4 23:09:18 2024 +0900

<span style='display:block; white-space:pre;color:#404040;'>    emacs-mac-app{,devel}: fix resolving tree-sitter libraries
</span>---
 aqua/emacs-mac-app/Portfile            | 17 ++++++++++++++---
 aqua/emacs-mac-app/files/site-start.el |  4 ----
 2 files changed, 14 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/Portfile b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5637c56e018..340e4dd28dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ bitbucket.setup     mituharu emacs-mac emacs-${emacs_version}-mac-${emacs_mac_ve
</span> name                emacs-mac-app
 conflicts           emacs-app emacs-app-devel
 version             ${emacs_mac_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> categories          aqua editors
 maintainers         {amake @amake} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +57,8 @@ depends_build       port:autoconf \
</span>                     port:sqlite3 \
                     port:webp
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set rpaths [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # The Mac port uses CoreText instead of HarfBuzz
 configure.args      --disable-silent-rules \
                     --with-mac \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,12 +86,18 @@ platform darwin {
</span>     configure.cflags-append -fobjc-arc
 }
 
<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> subport ${name}-devel {
     set emacs_version   29.3
     set date            2024-03-25
 
     version         [string map {- {}} ${date}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span> 
     long_description \
         ${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,13 +159,16 @@ 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
     depends_lib-append  port:tree-sitter
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>     depends_run-append \
         port:tree-sitter-typescript \
         port:tree-sitter-javascript \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/site-start.el b/aqua/emacs-mac-app/files/site-start.el
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b02e6611bb..6138a9d495d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,3 @@
</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;'>-
</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>