<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/076a47c379b61bef3d57cfb48e8b620bd9a4f4e0">https://github.com/macports/macports-ports/commit/076a47c379b61bef3d57cfb48e8b620bd9a4f4e0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 076a47c379b61bef3d57cfb48e8b620bd9a4f4e0
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Sun Jan 30 16:47:05 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app: use self-contained build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Unify with -devel
</span>---
aqua/emacs-mac-app/Portfile | 65 ++++------------------
.../files/patch-lib-src_Makefile.in.diff | 20 +++----
2 files changed, 20 insertions(+), 65 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 59547d9b1a0..73eb0adef4f 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;'>@@ -9,7 +9,7 @@ set emacs_mac_ver 8.3
</span> bitbucket.setup mituharu emacs-mac emacs-${emacs_version}-mac-${emacs_mac_ver}
name emacs-mac-app
version ${emacs_mac_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories aqua editors
maintainers {amake @amake} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,44 +39,6 @@ if {${subport} eq ${name}} {
</span> conflicts emacs-mac-app-devel
patchfiles-append patch-apple-silicon-arch.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move files into the app bundle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/railwaycat/emacs-mac-port/blob/master/build-emacs.app.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set app_dir ${destroot}${applications_dir}/Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob ${destroot}${prefix}/share/emacs/${emacs_version}/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${d} ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/info ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/man ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/var ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin ${app_dir}/../MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${app_dir}/../MacOS/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob ${destroot}${prefix}/libexec/emacs/${emacs_version}/*/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${f} ${app_dir}/../MacOS/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove everything from ${destroot}${prefix} except ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {0 != [string first ${destroot}${prefix} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${app_dir} is not a subdirectory of ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob ${destroot}${prefix}/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {0 != [string first ${d} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${d}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make the application binary a hard link.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${app_dir}/../MacOS/Emacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file link -hard ${app_dir}/../MacOS/Emacs ${app_dir}/../MacOS/bin/emacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 ${destroot}${applications_dir}/Emacs.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post_destroot_common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +59,8 @@ depends_build port:autoconf \
</span>
# The Mac port uses CoreText instead of HarfBuzz
configure.args --with-mac \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-mac-app=${applications_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-mac-app=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-mac-self-contained \
</span> --with-modules \
--without-rsvg \
--without-imagemagick \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,17 +99,6 @@ subport ${name}-devel {
</span>
patchfiles-append patch-lib-src_Makefile.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-mac-self-contained
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --enable-mac-app=${applications_dir} --enable-mac-app=${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post_destroot_common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant nativecomp description {Builds emacs with native compilation support} {
depends_lib-append port:gcc11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,16 +122,19 @@ subport ${name}-devel {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc post_destroot_common {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global destroot applications_dir site_lisp filespath prefix worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Rename the app bundle to avoid a conflict with emacs-app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/Emacs.app ${destroot}${applications_dir}/EmacsMac.app
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # install site-start.el.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install site-start.el
</span> set site_lisp ${destroot}${applications_dir}/EmacsMac.app/Contents/Resources/site-lisp
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:#ffe0e0;'>- # install emacs-module.h header file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install emacs-module.h header file
</span> xinstall -m 0755 -d ${destroot}${prefix}/include/emacs-mac
xinstall -m 0644 ${worksrcpath}/src/emacs-module.h \
${destroot}${prefix}/include/emacs-mac
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-lib-src_Makefile.in.diff b/aqua/emacs-mac-app/files/patch-lib-src_Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0692faa4a58..76851b06976 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/patch-lib-src_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/patch-lib-src_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit a4725daa5b93f8a50bd54d3c3dc64122fef8c838
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 6bb99f247ad01729676fc75f43e360555694d480
</span> Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
Date: Sat Jan 29 12:53:12 2022 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Ensure self-contained Mac app's libexec dir is defined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Add missing Mac vars to lib-src/Makefile.in
</span>
diff --git lib-src/Makefile.in lib-src/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 338ba0d576..9aa30193cc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 338ba0d576..fd4983e290 100644
</span> --- lib-src/Makefile.in
+++ lib-src/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +49,8 @@ top_builddir =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ==================== Where To Install Things ====================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+mac_applibexecdir=@mac_applibexecdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Location to install Emacs.app under GNUstep / macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +53,8 @@ top_builddir =
</span> # Later values may use this.
ns_appbindir=@ns_appbindir@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_applibexecdir=@ns_applibexecdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mac_appbindir=@mac_appbindir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mac_applibexecdir=@mac_applibexecdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The default location for installation. Everything is placed in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # subdirectories of this directory. The default values for many of
</span></pre><pre style='margin:0'>
</pre>