<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/395b1d4e186176a1595dc253a4c666556b7922bc">https://github.com/macports/macports-ports/commit/395b1d4e186176a1595dc253a4c666556b7922bc</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 395b1d4e186 emacs: Update emacs and emacs-app subports for Apple silicon
</span>395b1d4e186 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 395b1d4e186176a1595dc253a4c666556b7922bc
</span>Author: Gary Palter <palter@clozure.com>
AuthorDate: Sun Nov 29 22:21:57 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    emacs: Update emacs and emacs-app subports for Apple silicon
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Building emacs modifies the binary, via make-fingerprint, after compilation which
</span><span style='display:block; white-space:pre;color:#404040;'>    invalidates its code signature. Explicitly re-sign the binary after updating the
</span><span style='display:block; white-space:pre;color:#404040;'>    fingerprint.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    (The emacs-devel and emacs-app-devel subports were already updated to do this.)
</span>---
 editors/emacs/Portfile                          |  3 ++-
 editors/emacs/files/apple-silicon-codesign.diff | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

<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 403f46a42cb..59d88c6bfdf 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;'>@@ -92,7 +92,8 @@ if {$subport eq $name || $subport eq "emacs-app"} {
</span>     # apply upstream patch to fix configure on arm machines
     # See https://trac.macports.org/ticket/61594 and
     # https://git.savannah.gnu.org/cgit/emacs.git/commit/configure.ac?id=4cba236749aafade7bd88cf2a10be48f44983faa
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-4cba236749aafade7bd88cf2a10be48f44983faa.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-4cba236749aafade7bd88cf2a10be48f44983faa.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      apple-silicon-codesign.diff
</span>     use_autoreconf  yes
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/apple-silicon-codesign.diff b/editors/emacs/files/apple-silicon-codesign.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..84f2c9d39c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/apple-silicon-codesign.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig   2020-07-29 17:40:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in        2020-11-29 21:58:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -337,6 +337,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_STRUCTS = @CHECK_STRUCTS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_PDUMPER = @HAVE_PDUMPER@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## ARM Macs require that all code have a valid signature.  Since pump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## invalidates the signature, we must re-sign to fix it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DO_CODESIGN=$(patsubst arm-apple-darwin%,yes,@configuration@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 'make' verbosity.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -653,6 +657,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_PDUMPER),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   $(AM_V_at)$(MAKE_PDUMPER_FINGERPRINT) $@.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(DO_CODESIGN),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  codesign -s - -f $@.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   $(AM_V_at)mv $@.tmp $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   $(MKDIR_P) $(etc)
</span></pre><pre style='margin:0'>

</pre>