<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/32f4d735c979aac1ca873ce091dd1451a33da63d">https://github.com/macports/macports-ports/commit/32f4d735c979aac1ca873ce091dd1451a33da63d</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 32f4d735c97 emacs-mac-app-devel: simplify patch for self-contained bundle
</span>32f4d735c97 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32f4d735c979aac1ca873ce091dd1451a33da63d
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Sun Jan 30 13:59:55 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app-devel: simplify patch for self-contained bundle
</span>---
aqua/emacs-mac-app/Portfile | 15 +-
.../files/patch-lib-src_Makefile.in.diff | 19 ++
aqua/emacs-mac-app/files/patch-selfcontained.diff | 276 ---------------------
3 files changed, 26 insertions(+), 284 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 b11cb408ee0..59547d9b1a0 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;'>@@ -113,7 +113,7 @@ subport ${name}-devel {
</span> set date 2022-01-19
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;'>@@ -134,17 +134,16 @@ subport ${name}-devel {
</span>
conflicts emacs-mac-app
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-selfcontained.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Rename the app bundle to avoid a conflict with the emacs-app port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-selfcontained.diff handles everything but this directory rename.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/mac/Emacs.app ${worksrcpath}/mac/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-lib-src_Makefile.in.diff
</span>
configure.args-append --enable-mac-self-contained
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --enable-mac-app=${applications_dir} --enable-mac-app=${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.destdir {}
</span>
post-destroot {
<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:#e0ffe0;'>+
</span> post_destroot_common
}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0692faa4a58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit a4725daa5b93f8a50bd54d3c3dc64122fef8c838
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat Jan 29 12:53:12 2022 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ensure self-contained Mac app's libexec dir is defined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib-src/Makefile.in lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 338ba0d576..9aa30193cc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,8 @@ top_builddir =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ==================== Where To Install Things ====================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ # Location to install Emacs.app under GNUstep / macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Later values may use this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_appbindir=@ns_appbindir@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-selfcontained.diff b/aqua/emacs-mac-app/files/patch-selfcontained.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cbff034d3c1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/patch-selfcontained.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,276 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Makefile.in Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3f78b0d968..f6447239ce 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,23 +104,23 @@ USE_STARTUP_NOTIFICATION =
</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;'>--# Location to install Emacs.app on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Location to install EmacsMac.app on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac_appdir=@mac_appdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac_appbindir=@mac_appbindir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac_applibexecdir=@mac_applibexecdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac_appresdir=@mac_appresdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac_applibdir=@mac_applibdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Either yes or no depending on whether this is a relocatable Emacs.app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Either yes or no depending on whether this is a relocatable EmacsMac.app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac_self_contained=@mac_self_contained@
</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:#ffe0e0;'>-+# Location to install EmacsMac.app under GNUstep / macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Later values may use these.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_appdir=@ns_appdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_appbindir=@ns_appbindir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_applibexecdir=@ns_applibexecdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_appresdir=@ns_appresdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_applibdir=@ns_applibdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Either yes or no depending on whether this is a relocatable Emacs.app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Either yes or no depending on whether this is a relocatable EmacsMac.app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_self_contained=@ns_self_contained@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The default location for installation. Everything is placed in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -355,8 +355,8 @@ BIN_DESTDIR=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELN_DESTDIR = ${ns_applibdir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BIN_DESTDIR='${mac_appbindir}/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELN_DESTDIR = ${mac_applibdir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BIN_DESTDIR='$(DESTDIR)${mac_appbindir}/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELN_DESTDIR = $(DESTDIR)${mac_applibdir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: ${SUBDIR} info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -438,7 +438,7 @@ epaths-force-w32:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # bundle root itself with the relative path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epaths-force-mac-self-contained: epaths-force
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @(sed < src/epaths.h > epaths.h.$$$$ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -e 's;${mac_appdir}/Emacs.app/;;') && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -e 's;${mac_appdir}/EmacsMac.app/;;') && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epaths-force-ns-self-contained: epaths-force
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -541,9 +541,9 @@ install-arch-dep:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) -C lib-src install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$(realpath $(DESTDIR)${mac_appdir})" != "`cd mac && /bin/pwd`"; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- umask 022; ${MKDIR_P} $(DESTDIR)${mac_appdir}/Emacs.app; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cd mac/Emacs.app; (tar -chf - . | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cd $(DESTDIR)${mac_appdir}/Emacs.app; umask 022; tar -xvf - \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ umask 022; ${MKDIR_P} $(DESTDIR)${mac_appdir}/EmacsMac.app; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (cd mac/EmacsMac.app; (tar -chf - . | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (cd $(DESTDIR)${mac_appdir}/EmacsMac.app; umask 022; tar -xvf - \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && cat > /dev/null))) || exit 1; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq (${mac_self_contained},no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -562,8 +562,8 @@ install-arch-dep:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf ${ns_appresdir}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- subdir=${mac_appresdir}/site-lisp && ${write_subdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -rf ${mac_appresdir}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ subdir=$(DESTDIR)${mac_appresdir}/site-lisp && ${write_subdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -rf $(DESTDIR)${mac_appresdir}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### Windows-specific install target for installing programs produced
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6c09f86725..9792c534c4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,7 +536,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE(mac-app,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--enable-mac-app@<:@=DIR@:>@],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [specify install directory for Emacs.app on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [specify install directory for EmacsMac.app on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [DIR=/Application]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ mac_appdir_x=${enableval}])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1910,10 +1910,10 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mac_appbindir=${mac_appdir}/Emacs.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mac_applibexecdir=${mac_appdir}/Emacs.app/Contents/MacOS/libexec/${configuration}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mac_applibdir=${mac_appdir}/Emacs.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mac_appresdir=${mac_appdir}/Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mac_appbindir=${mac_appdir}/EmacsMac.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mac_applibexecdir=${mac_appdir}/EmacsMac.app/Contents/MacOS/libexec/${configuration}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mac_applibdir=${mac_appdir}/EmacsMac.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mac_appresdir=${mac_appdir}/EmacsMac.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${with_native_image_api}" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(HAVE_NATIVE_IMAGE_API, 1, [Define to use native OS APIs for images.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1937,7 +1937,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Even a headless Emacs can build macuvs.h, so this should let you bootstrap.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${opsys}" = darwin && test -f "$srcdir/src/macuvs.h"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NS_IMPL_COCOA=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ns_appdir=`pwd`/nextstep/Emacs.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ns_appdir=`pwd`/nextstep/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_appbindir=${ns_appdir}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_applibexecdir=${ns_appdir}/Contents/MacOS/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_applibdir=${ns_appdir}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1996,7 +1996,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $NS_IMPL_GNUSTEP = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ns_appdir=`pwd`/nextstep/Emacs.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ns_appdir=`pwd`/nextstep/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_appbindir=${ns_appdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_applibexecdir=${ns_appdir}/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_applibdir=${ns_appdir}/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4204,7 +4204,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We also have mouse menus.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_MENUS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell src/Makefile.in to create files in the macOS application
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # bundle mac/Emacs.app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # bundle mac/EmacsMac.app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OTHER_FILES=macosx-app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6162,7 +6162,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_ECHO(["Run '${MAKE-make}' to build Emacs, then run 'src/emacs' to test it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Run '${MAKE-make} install' in order to build an application bundle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--The application will go to nextstep/Emacs.app and can be run or moved
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+The application will go to nextstep/EmacsMac.app and can be run or moved
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from there."])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$EN_NS_SELF_CONTAINED" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "The application will be fully self-contained."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6194,8 +6194,8 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_TEMPLATE_FILES=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$HAVE_MACGUI" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CONFIG_FILES([mac/Emacs.app/Contents/Info.plist:mac/templates/Info.plist.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings:mac/templates/InfoPlist.strings.in])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CONFIG_FILES([mac/EmacsMac.app/Contents/Info.plist:mac/templates/Info.plist.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mac/EmacsMac.app/Contents/Resources/English.lproj/InfoPlist.strings:mac/templates/InfoPlist.strings.in])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_TEMPLATE_FILES="mac/templates/Info.plist.in mac/templates/InfoPlist.strings.in"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(MAC_TEMPLATE_FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib-src/Makefile.in lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 338ba0d576..9aa30193cc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib-src/Makefile.in
</span><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:#ffe0e0;'>- # Later values may use this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_appbindir=@ns_appbindir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mac/Emacs.app/Contents/MacOS/Emacs.sh mac/EmacsMac.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-similarity index 100%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename from mac/Emacs.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename to mac/EmacsMac.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mac/Emacs.app/Contents/PkgInfo mac/EmacsMac.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-similarity index 100%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename from mac/Emacs.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename to mac/EmacsMac.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mac/Emacs.app/Contents/Resources/Emacs.icns mac/EmacsMac.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-similarity index 100%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename from mac/Emacs.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename to mac/EmacsMac.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mac/Emacs.app/Contents/Resources/document.icns mac/EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-similarity index 100%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename from mac/Emacs.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rename to mac/EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mac/Makefile.in mac/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e1663c1a8f..7e1cdea452 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mac/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mac/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,9 +33,9 @@ mac_self_contained=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(DUMPING),pdumper)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq (${mac_self_contained},no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bundle_pdmp := Emacs.app/Contents/MacOS/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bundle_pdmp := EmacsMac.app/Contents/MacOS/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bundle_pdmp := Emacs.app/Contents/MacOS/libexec/${configuration}/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bundle_pdmp := EmacsMac.app/Contents/MacOS/libexec/${configuration}/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bundle_pdmp :=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,31 +44,31 @@ bundle_pdmp :=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lprojs = English Dutch French German Italian Japanese Spanish \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ar ca cs da el en_AU en_GB es_419 es_MX fi fr_CA he hi hr hu id ko ms no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl pt pt_BR pt_PT ro ru sk sv th tr uk vi zh_CN zh_HK zh_TW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--lprojdirs = $(patsubst %,Emacs.app/Contents/Resources/%.lproj,${lprojs})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+lprojdirs = $(patsubst %,EmacsMac.app/Contents/Resources/%.lproj,${lprojs})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${lprojdirs}:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${MKDIR_P} $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(CURDIR), $(realpath ${srcdir}))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Emacs.app/Contents/MacOS/Emacs.sh: ${srcdir}/Emacs.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${MKDIR_P} Emacs.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EmacsMac.app/Contents/MacOS/Emacs.sh: ${srcdir}/EmacsMac.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MKDIR_P} EmacsMac.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $< $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Emacs.app/Contents/PkgInfo: ${srcdir}/Emacs.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EmacsMac.app/Contents/PkgInfo: ${srcdir}/EmacsMac.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $< $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Emacs.app/Contents/Resources/Emacs.icns: ${srcdir}/Emacs.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${MKDIR_P} Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EmacsMac.app/Contents/Resources/Emacs.icns: ${srcdir}/EmacsMac.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MKDIR_P} EmacsMac.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $< $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Emacs.app/Contents/Resources/document.icns: ${srcdir}/Emacs.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${MKDIR_P} Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EmacsMac.app/Contents/Resources/document.icns: ${srcdir}/EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MKDIR_P} EmacsMac.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $< $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--macosx-bundle: ${lprojdirs} Emacs.app/Contents/MacOS/Emacs.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Emacs.app/Contents/PkgInfo Emacs.app/Contents/Resources/Emacs.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Emacs.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--macosx-app: macosx-bundle Emacs.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Emacs.app/Contents/MacOS/Emacs: ../src/emacs${EXEEXT}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${MKDIR_P} Emacs.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+macosx-bundle: ${lprojdirs} EmacsMac.app/Contents/MacOS/Emacs.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EmacsMac.app/Contents/PkgInfo EmacsMac.app/Contents/Resources/Emacs.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+macosx-app: macosx-bundle EmacsMac.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EmacsMac.app/Contents/MacOS/Emacs: ../src/emacs${EXEEXT}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MKDIR_P} EmacsMac.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $< $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(DUMPING),pdumper)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,12 +86,12 @@ .PHONY:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf ${lprojdirs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f Emacs.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f EmacsMac.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distclean: clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f Emacs.app/Contents/Info.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f EmacsMac.app/Contents/Info.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EmacsMac.app/Contents/Resources/English.lproj/InfoPlist.strings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bootstrap-clean maintainer-clean: distclean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/emacs.c src/emacs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c0df96f828..d598e8d48c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/emacs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/emacs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -531,10 +531,10 @@ init_cmdargs (int argc, char **argv, int skip_args, char const *original_pwd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined HAVE_MACGUI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If we are running from the build directory, set DIR to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src subdirectory of the Emacs tree. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (SBYTES (dir) > sizeof ("/mac/Emacs.app/Contents/MacOS/") - 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (SBYTES (dir) > sizeof ("/mac/EmacsMac.app/Contents/MacOS/") - 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && 0 == strcmp ((SSDATA (dir) + SBYTES (dir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- - sizeof ("/mac/Emacs.app/Contents/MacOS/") + 1),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "/mac/Emacs.app/Contents/MacOS/"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - sizeof ("/mac/EmacsMac.app/Contents/MacOS/") + 1),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "/mac/EmacsMac.app/Contents/MacOS/"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NILP (Vpurify_flag))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>