<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8f5551ef11fbaa47f77e44759ddee626e0e606de">https://github.com/macports/macports-ports/commit/8f5551ef11fbaa47f77e44759ddee626e0e606de</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 8f5551ef11f haskell_cabal pg: fix extract failure
</span>8f5551ef11f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8f5551ef11fbaa47f77e44759ddee626e0e606de
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jan 13 14:45:37 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> haskell_cabal pg: fix extract failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The post-extract blocks were running ghc and cabal without declaring
</span><span style='display:block; white-space:pre;color:#404040;'> appropriate dependencies.
</span>---
_resources/port1.0/group/haskell_cabal-1.0.tcl | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/haskell_cabal-1.0.tcl b/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b7d5cdc671e..0f145ba9ae5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +25,15 @@
</span> proc haskell_cabal.add_dependencies {} {
global name haskell_cabal.use_prebuilt
if {[tbool haskell_cabal.use_prebuilt]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_patch-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cabal-prebuilt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ghc-prebuilt
</span> depends_build-append \
port:cabal-prebuilt \
port:ghc-prebuilt
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_patch-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cabal
</span> depends_build-append \
port:cabal \
port:ghc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +82,7 @@ proc haskell_cabal.get_env {} {
</span> options haskell_cabal.cabal_root
default haskell_cabal.cabal_root {${workpath}/.home/.cabal}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> xinstall -m 0755 -d [option haskell_cabal.cabal_root]
set cabal_config_fd [open ${haskell_cabal.cabal_root}/config w+]
set cabal_versions [regexp -all -inline {[0-9.]+} [exec ${haskell_cabal.bin} --version]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +170,7 @@ default haskell_cabal.use_prebuilt {no}
</span>
default haskell_cabal.datadir {share/${subport}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> if {[tbool haskell_cabal.use_prebuilt]} {
xinstall -d ${haskell_cabal.cabal_root}/bin
# bootstrap from *-prebuilt
</pre><pre style='margin:0'>
</pre>