<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/f5a69de6dfd04007491e3b8ef5c0dd817456f42d">https://github.com/macports/macports-ports/commit/f5a69de6dfd04007491e3b8ef5c0dd817456f42d</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 f5a69de emacs-app(-devel): set PATH when starting app to include MacPorts prefix
</span>f5a69de is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f5a69de6dfd04007491e3b8ef5c0dd817456f42d
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Tue May 26 19:58:55 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> emacs-app(-devel): set PATH when starting app to include MacPorts prefix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Stop using a separate revision for emacs and emacs-app to simplify the
</span><span style='display:block; white-space:pre;color:#404040;'> portfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56801
</span>---
editors/emacs/Portfile | 13 +++++++++++--
editors/emacs/files/patch-Info.plist.in-devel.diff | 13 +++++++++++++
editors/emacs/files/patch-Info.plist.in.diff | 13 +++++++++++++
3 files changed, 37 insertions(+), 2 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 25a4b48..d42c6b1 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;'>@@ -79,7 +79,7 @@ platform darwin {
</span>
if {$subport eq $name || $subport eq "emacs-app"} {
version 26.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span>
checksums rmd160 263c0152f538d3371c60accb710f3825b01ae097 \
sha256 09c747e048137c99ed35747b012910b704e0974dde4db6696fde7054ce387591 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,6 +95,7 @@ if {$subport eq $name || $subport eq "emacs-app"} {
</span> if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
epoch 1
version 20200524
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
fetch.type git
git.url https://github.com/emacs-mirror/emacs.git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,6 +208,15 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-Info.plist.in-devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PATH@,${prefix}/bin:${prefix}/sbin:/usr/bin:/bin:/usr/sbin:/sbin," ${worksrcpath}/nextstep/templates/Info.plist.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
system -W ${worksrcpath} "make install"
xinstall -m 755 -d ${destroot}${applications_dir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,7 +231,6 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> }
if {$subport eq "emacs-app"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span> variant multicolor_font description {Apply multicolor font patch} {
# Revert "Disable multicolor fonts on OS X..."
# This reverts commit 9344612d3cd164317170b6189ec43175757e4231.
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..057ad5b
</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/patch-Info.plist.in-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nextstep/templates/Info.plist.in.orig 2020-05-26 00:33:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nextstep/templates/Info.plist.in 2020-05-26 00:34:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -685,5 +685,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Emacs requires permission to access the Downloads folder.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSRemovableVolumesUsageDescription</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Emacs requires permission to access files on Removable Volumes.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>LSEnvironment</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>PATH</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@PATH@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-Info.plist.in.diff b/editors/emacs/files/patch-Info.plist.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..302db45
</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/patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nextstep/templates/Info.plist.in.orig 2020-05-26 19:02:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nextstep/templates/Info.plist.in 2020-05-26 19:03:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -677,5 +677,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>YES</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSAppleEventsUsageDescription</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Emacs requires permission to send AppleEvents to other applications.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>LSEnvironment</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>PATH</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@PATH@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </plist>
</span></pre><pre style='margin:0'>
</pre>