<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/be3fc2472d14a7c60587ef5d9de8df2bbdf1de9f">https://github.com/macports/macports-ports/commit/be3fc2472d14a7c60587ef5d9de8df2bbdf1de9f</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 be3fc2472d1 emacs-mac-app: update to 9.0 (Emacs 28.1); -devel: update to 20220405
</span>be3fc2472d1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit be3fc2472d14a7c60587ef5d9de8df2bbdf1de9f
</span>Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
AuthorDate: Wed Apr 6 14:43:27 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app: update to 9.0 (Emacs 28.1); -devel: update to 20220405
</span>---
aqua/emacs-mac-app/Portfile | 66 +++++++++++-----------
.../files/patch-apple-silicon-arch.diff | 11 ----
2 files changed, 32 insertions(+), 45 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 0fbbddaeed8..41fed592233 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;'>@@ -3,13 +3,13 @@
</span> PortSystem 1.0
PortGroup bitbucket 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set emacs_version 27.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set emacs_mac_ver 8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set emacs_version 28.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set emacs_mac_ver 9.0
</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 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories aqua editors
maintainers {amake @amake} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,9 @@ long_description ${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
</span> platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3544f2607e6002e066bcdd967c88aa7162ef6451 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4263e4e1897a950c16252b58c9af8ae4d369b25790873d0777c9547a89b90198 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 43674348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5496d49592fd3c69f6f32f4ab23973a4c68db87b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 967d5642ca47ae3de2626f0fc7163424e36925642827e151c3906179020dd90e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 45985554
</span>
depends_lib port:ncurses \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,8 +36,6 @@ patchfiles patch-src_emacs.c.diff
</span>
if {${subport} eq ${name}} {
conflicts emacs-mac-app-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-apple-silicon-arch.diff
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,13 +74,17 @@ configure.args --disable-silent-rules \
</span> --with-lcms2 \
--with-modules \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 11 && ${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span> configure.cflags-append -fobjc-arc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set emacs_version 28.0.92
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set date 2022-03-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set emacs_version 28.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set date 2022-04-05
</span>
version [string map {- {}} ${date}]
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,13 +93,9 @@ subport ${name}-devel {
</span> ${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
This provides a native GUI with tight OS integration.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> fetch.type git
git.url --shallow-since=${date}T00:00:00 --branch work https://bitbucket.org/mituharu/emacs-mac.git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 0d76339e74fa2a1d7b2ad2da007ba5a0360717b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 1be8ebee4895b668a9a92d9ba34a1dd75a9c3ce1
</span>
# --shallow-since needs a newer version of git than on some older systems,
# so use MacPorts version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,24 +104,6 @@ subport ${name}-devel {
</span>
conflicts emacs-mac-app
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant nativecomp description {Builds emacs with native compilation support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gcc11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-native-compilation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cpath-prepend ${prefix}/include/gcc11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/lib/gcc11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append NATIVE_FULL_AOT=1
</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;'>- variant metal description {Enable experimental Metal support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mac-metal
</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;'>- default_variants-append +nativecomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Bitbucket doesn't seem to have a good way to get the latest commit on a
# branch
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,4 +143,22 @@ variant imagemagick description {Enable ImageMagick bindings} {
</span> configure.args-append --with-imagemagick
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant nativecomp description {Builds emacs with native compilation support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gcc11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-native-compilation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/gcc11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/gcc11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append NATIVE_FULL_AOT=1
</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;'>+variant metal description {Enable experimental Metal support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mac-metal
</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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.version ${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-apple-silicon-arch.diff b/aqua/emacs-mac-app/files/patch-apple-silicon-arch.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 868d26060bd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/patch-apple-silicon-arch.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in 2021-03-27 16:38:19.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2021-04-02 16:50:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -346,7 +346,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## ARM Macs require that all code have a valid signature. Since pump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## invalidates the signature, we must re-sign to fix it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DO_CODESIGN=$(patsubst arm-apple-darwin%,yes,@configuration@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DO_CODESIGN=$(patsubst aarch64-apple-darwin%,yes,@configuration@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 'make' verbosity.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
</span></pre><pre style='margin:0'>
</pre>