<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/09f8f08372c82f749fa40d74085ef84963ba0794">https://github.com/macports/macports-ports/commit/09f8f08372c82f749fa40d74085ef84963ba0794</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 09f8f08372c82f749fa40d74085ef84963ba0794
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Fri Sep 27 16:10:23 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> ocaml-1.1 pg: Match opam's default build style, update ports accordingly.
</span>---
_resources/port1.0/group/ocaml-1.1.tcl | 9 +++++++--
ocaml/ocaml-cppo/Portfile | 3 ---
ocaml/ocaml-migrate-parsetree/Portfile | 1 +
3 files changed, 8 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/ocaml-1.1.tcl b/_resources/port1.0/group/ocaml-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b218ab5..5230a8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/ocaml-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/ocaml-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@
</span> # dune.packages <string...>
# If set to a non-empty value, restricts the set of packages
# visible to dune (using --only-package)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Default: (empty)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Default: The port ${name}, stripped of its initial "ocaml-" prefix (if any)
</span> #
# dune.profile <string>
# Build profile.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -395,7 +395,7 @@ options dune.root \
</span> dune.profile
default dune.root {${worksrcpath}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default dune.packages {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default dune.packages {[regsub {^(?:ocaml-)?(.*)} ${subport} {\1}]}
</span> default dune.profile {release}
commands dune.build \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -413,6 +413,8 @@ default dune.build.pre_args {
</span> -j ${build.jobs}
--root=${dune.root}
--profile=${dune.profile}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-promoted-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-config
</span> [ocaml::dune_get_only_packages_param]
--default-target=${dune.build.target}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,6 +428,9 @@ default dune.destroot.pre_args {
</span> install
-j ${build.jobs}
--root=${dune.root}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --profile=${dune.profile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-promoted-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-config
</span> --destdir=${destroot}
${dune.packages}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-cppo/Portfile b/ocaml/ocaml-cppo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6cee5f..f24d920 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-cppo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-cppo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,8 @@ checksums rmd160 24cfae47216be8e7cb791c558ba68d554a9912bf \
</span> size 28687
ocaml.build_type dune
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dune.packages ${github.project}
</span>
subport ${name}_ocamlbuild {
depends_lib port:${name} \
port:ocaml-ocamlbuild
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dune.packages cppo_ocamlbuild
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-migrate-parsetree/Portfile b/ocaml/ocaml-migrate-parsetree/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61a6f7d..aa36412 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-migrate-parsetree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-migrate-parsetree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,3 +27,4 @@ extract.suffix .tbz
</span> depends_lib port:ocaml-ppx_derivers
ocaml.build_type dune
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dune.packages ${name}
</span></pre><pre style='margin:0'>
</pre>