<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1af30d9c486642a3f7564e8212eb191652abcec7">https://github.com/macports/macports-ports/commit/1af30d9c486642a3f7564e8212eb191652abcec7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1af30d9c486642a3f7564e8212eb191652abcec7
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Feb 8 10:01:34 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> cctools: delete rsrc forks from Makefiles
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> stray rsrc forks cause errors during reinplace phase of patching
</span><span style='display:block; white-space:pre;color:#404040;'> of course, no one method works from 10.4 to present so we have
</span><span style='display:block; white-space:pre;color:#404040;'> to do this slightly different ways depending on OS version
</span>---
devel/cctools/Portfile | 9 +++++++++
1 file changed, 9 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/Portfile b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 838d335..3f41972 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,6 +178,15 @@ post-patch {
</span> reinplace "s:__TRY_SYSTEM_CLANG__:${try_system_clang}:" ${worksrcpath}/as/driver.c
foreach file [glob ${worksrcpath}/{*/,}Makefile] {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "deleting stray rsrc fork from ${file}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cp -X ${file} ${file}.tmp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "mv ${file}.tmp ${file}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cp /dev/null ${file}/rsrc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> reinplace -q "s:/usr/local:@PREFIX@:g" ${file}
reinplace -q "s:/usr:@PREFIX@:g" ${file}
reinplace -q "s:@PREFIX@:${prefix}:g" ${file}
</pre><pre style='margin:0'>
</pre>