<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c24a043cf527a480299015c3b5a16f1f7dc71a9b">https://github.com/macports/macports-ports/commit/c24a043cf527a480299015c3b5a16f1f7dc71a9b</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 c24a043cf52 semgrep: Delete old docs in pre-activate
</span>c24a043cf52 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c24a043cf527a480299015c3b5a16f1f7dc71a9b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jun 18 01:56:09 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> semgrep: Delete old docs in pre-activate
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This port previously inadvertently installed documentation directly,
</span><span style='display:block; white-space:pre;color:#404040;'> bypassing the destroot. That's been fixed, but if the port had ever been
</span><span style='display:block; white-space:pre;color:#404040;'> installed before, the old documentation would already be there, which
</span><span style='display:block; white-space:pre;color:#404040;'> would prevent activation of the new version.
</span>---
devel/semgrep/Portfile | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/semgrep/Portfile b/devel/semgrep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2e7f01c1cd..7fb7ec48166 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/semgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/semgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,12 +46,19 @@ build {
</span> system -W ${worksrcpath}/semgrep-core ". ${opam_env_file} && ${build.cmd} all"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sg_doc_dir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set sg_doc_dir ${prefix}/share/doc/${name}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span> xinstall -m 755 ${worksrcpath}/semgrep-core/_build/default/bin/Main.exe \
${destroot}${prefix}/bin/${name}
file mkdir ${destroot}${sg_doc_dir}
copy {*}[glob ${worksrcpath}/docs/*] ${destroot}${sg_doc_dir}/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When building from source, semgrep < 0.11 inadvertently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # installed documentation bypassing the destroot.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This cleanup hack can be removed after June 2021.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${sg_doc_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>