<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/268dd032877d98e283bd0d3c2cad2023446e1337">https://github.com/macports/macports-ports/commit/268dd032877d98e283bd0d3c2cad2023446e1337</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 268dd032877 emacs-mac-app: Add renameapp variant
</span>268dd032877 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 268dd032877d98e283bd0d3c2cad2023446e1337
</span>Author: Emre Yolcu <mail@emreyolcu.com>
AuthorDate: Mon May 6 19:34:18 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app: Add renameapp variant
</span>---
aqua/emacs-mac-app/Portfile | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 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 2be1a3cf74e..5637c56e018 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;'>@@ -8,6 +8,7 @@ set emacs_mac_ver 10.0
</span>
bitbucket.setup mituharu emacs-mac emacs-${emacs_version}-mac-${emacs_mac_ver}
name emacs-mac-app
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts emacs-app emacs-app-devel
</span> version ${emacs_mac_ver}
revision 1
categories aqua editors
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,7 @@ depends_lib port:ncurses \
</span> patchfiles patch-src_emacs.c.diff
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts emacs-mac-app-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-prepend emacs-mac-app-devel
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +104,7 @@ subport ${name}-devel {
</span> depends_fetch-append port:git
git.cmd ${prefix}/bin/git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts emacs-mac-app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-prepend emacs-mac-app
</span>
livecheck.version ${git.branch}
bitbucket.livecheck work
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,11 +113,12 @@ subport ${name}-devel {
</span> destroot.destdir {}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Rename the app bundle to avoid a conflict with emacs-app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/Emacs.app ${destroot}${applications_dir}/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set appname [expr {[variant_isset renameapp] ? "EmacsMac" : "Emacs"}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/Emacs.app ${destroot}${applications_dir}/${appname}.app
</span>
# Install site-start.el
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set site_lisp ${destroot}${applications_dir}/EmacsMac.app/Contents/Resources/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set site_lisp ${destroot}${applications_dir}/${appname}.app/Contents/Resources/site-lisp
</span> xinstall -d ${site_lisp}
file copy ${filespath}/site-start.el ${site_lisp}
reinplace "s|__PREFIX__|${prefix}|g" ${site_lisp}/site-start.el
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,7 +184,11 @@ variant metal description {Enable experimental Metal support} {
</span> configure.args-append --with-mac-metal
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +nativecomp +treesitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant renameapp description {Rename app bundle to avoid conflict with emacs-app} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-delete emacs-app emacs-app-devel
</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 +renameapp
</span>
if {${subport} eq ${name}} {
livecheck.regex {"emacs-[0-9.]+-mac-([0-9.]+)"}
</pre><pre style='margin:0'>
</pre>