<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/d1ccc98b50d8dafd294316e5f59ce57b0b550ead">https://github.com/macports/macports-ports/commit/d1ccc98b50d8dafd294316e5f59ce57b0b550ead</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d1ccc98b50d8dafd294316e5f59ce57b0b550ead
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Sep 17 23:24:39 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ghc: Bugfix
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes:
</span><span style='display:block; white-space:pre;color:#404040;'> * https://github.com/macports/macports-ports/pull/16115#issuecomment-1250137066
</span><span style='display:block; white-space:pre;color:#404040;'> * https://github.com/macports/macports-ports/pull/16141#discussion_r973616866
</span>---
lang/ghc/Portfile | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 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 7b50f6e901f..8f3ca39313b 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;'>@@ -167,6 +167,7 @@ if {${name} eq ${subport}} {
</span> port:bash \
port:bzip2 \
port:cctools \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsed \
</span> port:gzip \
port:hadrian \
port:happy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,14 +198,10 @@ if {${name} eq ${subport}} {
</span> ${workpath}/bin/python3
ln -s ${prefix}/bin/sphinx-build-${python3_branch} \
${workpath}/bin/sphinx-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#e0ffe0;'>+ # avoid this cabal/sed error in macOS 10 and earlier:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # checking for version of sphinx-build... sed: illegal option -- r
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/gsed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/bin/sed
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,6 +225,11 @@ if {${name} eq ${subport}} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ haskell_cabal.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CABAL_CONFIG=${haskell_cabal.cabal_root}/config" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GHC=${haskell_cabal.cabal_root}/bin/ghc" \
</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;'>+
</span> pre-configure {
system -W ${worksrcpath} \
"env ${haskell_cabal.env} ./boot"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -368,7 +370,7 @@ subport ghc-prebuilt {
</span> subport hadrian {
# find ${worksrcpath} -type f -exec egrep -E -o '"pkg-name":"shake","pkg-version":"[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+"' {} ';'
version 0.19.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
distname ${name}-${ghc_version}
distfiles [lindex ${ghc_source_checksums} 0]
</pre><pre style='margin:0'>
</pre>