<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8f6e98c1b25ddec68ed132ee3021c493e697050">https://github.com/macports/macports-ports/commit/b8f6e98c1b25ddec68ed132ee3021c493e697050</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b8f6e98c1b25ddec68ed132ee3021c493e697050
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Wed Sep 4 22:48:43 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> haskell_stack PortGroup: add haskell_stack.{env,yaml} options
</span>---
_resources/port1.0/group/haskell_stack-1.0.tcl | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/haskell_stack-1.0.tcl b/_resources/port1.0/group/haskell_stack-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d047ff..75b21a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/haskell_stack-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/haskell_stack-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,19 +60,26 @@ compiler.cpath
</span> options haskell_stack.bin haskell_stack.default_args
default haskell_stack.bin ${prefix}/bin/stack
default haskell_stack.default_args \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {--stack-root [option haskell_stack.stack_root] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gcc ${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {--with-gcc ${configure.cc} \
</span> --allow-different-user \
[haskell_stack.system_ghc_flags]}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options haskell_stack.yaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default haskell_stack.yaml {${worksrcpath}/stack.yaml}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options haskell_stack.env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default haskell_stack.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {STACK_ROOT=[option haskell_stack.stack_root] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STACK_YAML=[option haskell_stack.yaml]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> options haskell_stack.use_init
default haskell_stack.use_init yes
pre-configure {
if {[option haskell_stack.use_init]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[glob -nocomplain ${worksrcpath}/stack*.yaml] == ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${haskell_stack.yaml}]} {
</span> system -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${haskell_stack.bin} init ${haskell_stack.default_args}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "env ${haskell_stack.env} ${haskell_stack.bin} init ${haskell_stack.default_args}"
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,19 +87,23 @@ pre-configure {
</span> default configure.cmd {${haskell_stack.bin}}
default configure.pre_args {}
default configure.args {setup ${haskell_stack.default_args}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.env {${haskell_stack.env}}
</span>
default build.cmd {${haskell_stack.bin}}
default build.target {build}
default build.args {${haskell_stack.default_args}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.env {${haskell_stack.env}}
</span>
default destroot.cmd {${haskell_stack.bin}}
default destroot.target {install}
default destroot.args {${haskell_stack.default_args} \
--local-bin-path ${destroot}${prefix}/bin}
default destroot.destdir {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default destroot.env {${haskell_stack.env}}
</span>
default test.cmd {${haskell_stack.bin}}
default test.target {test}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default test.env {${haskell_stack.env}}
</span>
default livecheck.type {regex}
default livecheck.url {https://hackage.haskell.org/package/${name}}
</pre><pre style='margin:0'>
</pre>