<pre style='margin:0'>
Sean Farley (seanfarley) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4727de8fe890e74a5e3db500ebe7df82d2e5564e">https://github.com/macports/macports-ports/commit/4727de8fe890e74a5e3db500ebe7df82d2e5564e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4727de8fe890e74a5e3db500ebe7df82d2e5564e
</span>Author: Sean Farley <sean@macports.org>
AuthorDate: Thu Aug 10 13:45:38 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app: fix error when app_dir is subdirectory of prefix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/53775
</span>---
aqua/emacs-mac-app/Portfile | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
<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 2def353..97378e6 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;'>@@ -66,7 +66,17 @@ post-destroot {
</span> foreach f [glob ${destroot}${prefix}/libexec/emacs/${emacs_version}/*/*] {
move ${f} ${app_dir}/../MacOS/libexec
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove everything from ${destroot}${prefix} except ${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {0 != [string first ${destroot}${prefix} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${app_dir} is not a subdirectory of ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [glob ${destroot}${prefix}/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {0 != [string first ${d} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${d}
</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;'>+ }
</span>
# make the application binary a hard link.
delete ${app_dir}/../MacOS/Emacs
</pre><pre style='margin:0'>
</pre>