<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6fb77c0e3b922159d04b8f6534c93c6bf303c4c7">https://github.com/macports/macports-ports/commit/6fb77c0e3b922159d04b8f6534c93c6bf303c4c7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6fb77c0e3b922159d04b8f6534c93c6bf303c4c7
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Sep 30 12:23:01 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> squeak: unbreak destroot
</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/70992
</span>---
lang/squeak/Portfile | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/squeak/Portfile b/lang/squeak/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fe6fd265a2..4a00cfa9fdf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/squeak/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/squeak/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,20 +71,19 @@ destroot.destdir ROOT=${destroot}
</span> post-destroot {
set unzip "[binaryInPath "unzip"] -o"
set gzip "[binaryInPath "gzip"] -f"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set datadir ${prefix}/share/squeak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set datadir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Have inisqueak look at the right place
reinplace "s|MAJOR=3|MAJOR=${squeak_short_vrsn}|" ${worksrcpath}/build/inisqueak
reinplace "s|imgdir=${prefix}/lib/squeak|imgdir=${datadir}|" ${worksrcpath}/build/inisqueak
# Install inisqueak
xinstall -m 755 ${worksrcpath}/build/inisqueak ${destroot}${prefix}/bin/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # fix bad doc install path (should use --docdir or --datarootdir during configure)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${datadir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/doc ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/doc/${name} ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Recompress and install the default image
system "cd ${worksrcpath} && ${unzip} ${distpath}/${squeak_img_src}"
system "cd ${worksrcpath} && ${gzip} ${squeak_img_name}/${squeak_img}"
</pre><pre style='margin:0'>
</pre>