<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e325f15cc8253b1eacef9bc0a9a5de770e778d6e">https://github.com/macports/macports-ports/commit/e325f15cc8253b1eacef9bc0a9a5de770e778d6e</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 e325f15cc82 emacs{,-app}: update to 28.1
</span>e325f15cc82 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e325f15cc8253b1eacef9bc0a9a5de770e778d6e
</span>Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
AuthorDate: Mon Apr 4 22:14:46 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs{,-app}: update to 28.1
</span>---
editors/emacs/Portfile | 76 ++++++++++------------
editors/emacs/files/patch-Info.plist.in-devel.diff | 13 ----
editors/emacs/files/site-start.el | 4 +-
3 files changed, 35 insertions(+), 58 deletions(-)
<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 1282dd5eb2c..29bcbaf5e75 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;'>@@ -3,6 +3,10 @@
</span> PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Need openat()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name emacs
categories editors
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,20 +86,15 @@ platform darwin {
</span> }
if {$subport eq $name || $subport eq "emacs-app"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 27.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 28.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5cf2927984b34cfd611114190c8b7f498093e994 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 80ff6118fb730a6d8c704dccd6915a6c0e0a166ab1daeef9fe68afa9073ddb73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 67153050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 989dc9e81924efb940434d5843616d1e70424a3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1439bf7f24e5769f35601dbf332e74dfc07634da6b1e9500af67188a92340a28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 71292728
</span> }
if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Need openat()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set date 2022-02-13
epoch 5
version [string map {- {}} ${date}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,20 +122,6 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span> }
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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;'>- default_variants-append +nativecomp
</span> } else {
livecheck.type regex
livecheck.url https://ftp.gnu.org/gnu/emacs/?C=M&O=D
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,10 +196,14 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> depends_lib-append port:dbus
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant xwidgets requires gtk description {Enable use of xwidgets in Emacs buffers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-xwidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/include/emacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/src/emacs-module.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/include/emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/src/emacs-module.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/emacs
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,18 +223,15 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Info.plist.in-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s,@PATH@,${prefix}/bin:${prefix}/sbin:/usr/bin:/bin:/usr/sbin:/sbin," ${worksrcpath}/nextstep/templates/Info.plist.in
}
destroot {
system -W ${worksrcpath} "make install"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${applications_dir}
</span> file copy ${worksrcpath}/nextstep/Emacs.app \
${destroot}${applications_dir}
# fix read-permission to resources
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,17 +254,23 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> configure.args-append --with-rsvg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +rsvg
</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;'>-if {$subport eq $name || $subport eq "emacs-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant xwidgets requires gtk description {Enable use of xwidgets in Emacs buffers} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-xwidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {$subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Quartz support was added after 27.1 had released via commit: d089c4fbfc8be432dc3015a99b4044dab0a0de97
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # As soon as the next version is released it should support also emacs-app
</span> variant xwidgets description {Enable use of xwidgets in Emacs buffers} {
configure.args-append --with-xwidgets
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +rsvg
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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;'>+default_variants-append +nativecomp
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-Info.plist.in-devel.diff b/editors/emacs/files/patch-Info.plist.in-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 057ad5b0b0e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-Info.plist.in-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nextstep/templates/Info.plist.in.orig 2020-05-26 00:33:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nextstep/templates/Info.plist.in 2020-05-26 00:34:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -685,5 +685,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Emacs requires permission to access the Downloads folder.</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>NSRemovableVolumesUsageDescription</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Emacs requires permission to access files on Removable Volumes.</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>LSEnvironment</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>PATH</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@PATH@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/site-start.el b/editors/emacs/files/site-start.el
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fc5f3d725d..1bdac7aee94 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,6 +13,4 @@
</span>
;; Use the OS X Emoji font for Emoticons
(when (fboundp 'set-fontset-font)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- (set-fontset-font "fontset-default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'symbol
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (font-spec :name "Apple Color Emoji") nil 'prepend))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (set-fontset-font t 'emoji '("Apple Color Emoji" . "iso10646-1") nil 'prepend))
</span></pre><pre style='margin:0'>
</pre>