<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9ce8a292ab4068df155330785d706edbe23bb135">https://github.com/macports/macports-ports/commit/9ce8a292ab4068df155330785d706edbe23bb135</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9ce8a292ab4068df155330785d706edbe23bb135
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Fri Sep 16 17:57:23 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ghc: Bugfix
</span>---
lang/ghc/Portfile | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/Portfile b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a2ef1f4f954..7b50f6e901f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,12 +191,20 @@ if {${name} eq ${subport}} {
</span> happy \
HsColour
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span> xinstall -d ${workpath}/bin
ln -s ${python3_bin} \
${workpath}/bin/python3
ln -s ${prefix}/bin/sphinx-build-${python3_branch} \
${workpath}/bin/sphinx-build
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haskell_cabal.env-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=${haskell_cabal.cabal_root}/bin:$env(PATH)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=${workpath}/bin:${haskell_cabal.cabal_root}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach phase {configure build destroot test} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${haskell_cabal.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,19 +228,9 @@ if {${name} eq ${subport}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- haskell_cabal.env-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${haskell_cabal.cabal_root}/bin:$env(PATH)" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${workpath}/bin:${haskell_cabal.cabal_root}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach phase {configure build destroot test} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}${haskell_cabal.env}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
system -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "./boot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "env ${haskell_cabal.env} ./boot"
</span> }
use_autoconf yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,7 +244,7 @@ if {${name} eq ${subport}} {
</span>
post-build {
system -W ${build.dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${build.cmd} docs [haskell_cabal.build_getjobsarg]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "env ${haskell_cabal.env} ${build.cmd} docs [haskell_cabal.build_getjobsarg]"
</span> }
pre-destroot {
</pre><pre style='margin:0'>
</pre>