<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b26ffd1bcddd1ea72061b3e36a358755aa11b764">https://github.com/macports/macports-ports/commit/b26ffd1bcddd1ea72061b3e36a358755aa11b764</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 b26ffd1bcdd emacs{,-app}-devel: fix native-lisp path for +nativecomp
</span>b26ffd1bcdd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b26ffd1bcddd1ea72061b3e36a358755aa11b764
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Mon Nov 30 22:05:03 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> emacs{,-app}-devel: fix native-lisp path for +nativecomp
</span>---
editors/emacs/Portfile | 21 ++++++---------------
1 file changed, 6 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 59ec462f603..5d107b07349 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;'>@@ -133,8 +133,12 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span> build.args-append NATIVE_FULL_AOT=1 \
{BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 2)"'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # currently installs into ${prefix}/native-lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|^ELN_DESTDIR =.*|ELN_DESTDIR="${ns_appbindir}/../"|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
livecheck.type regex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,12 +218,6 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> xinstall -m 755 -d ${destroot}${prefix}/include/emacs
xinstall -m 644 ${worksrcpath}/src/emacs-module.h \
${destroot}${prefix}/include/emacs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset nativecomp]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make special symlink (temporarily?) necessary for nativecomp on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set emacs_version [file tail [glob ${destroot}${prefix}/lib/emacs/*]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s lib/emacs/${emacs_version}/native-lisp ${destroot}${prefix}/native-lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,13 +257,6 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset nativecomp]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make special symlink (temporarily?) necessary for nativecomp on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set app_contents ${destroot}${applications_dir}/Emacs.app/Contents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set emacs_version [file tail [glob ${app_contents}/MacOS/lib/emacs/*]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s MacOS/lib/emacs/${emacs_version}/native-lisp ${app_contents}/native-lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant imagemagick description {Use ImageMagick} {
</pre><pre style='margin:0'>
</pre>