<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/049dfbbb62e1a62289f0d13e7aa6c24be27657d1">https://github.com/macports/macports-ports/commit/049dfbbb62e1a62289f0d13e7aa6c24be27657d1</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 049dfbb  opam: update to 2.0.2
</span>049dfbb is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 049dfbbb62e1a62289f0d13e7aa6c24be27657d1
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Mon Jan 7 15:13:27 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    opam: update to 2.0.2
</span>---
 ocaml/opam/Portfile                          | 32 ++++++++++++++--------------
 ocaml/opam/files/patch-fix-opamarg.diff      | 13 +++++++++++
 ocaml/opam/files/patch-makefile.diff         | 10 +++++++++
 ocaml/opam/files/patch-stop-fetch-check.diff |  6 +++---
 4 files changed, 42 insertions(+), 19 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/Portfile b/ocaml/opam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 12720cb..00b040d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/opam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem          1.0
 PortGroup           github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        ocaml opam 2.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        ocaml opam 2.0.2
</span> 
 name                opam
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ long_description    OPAM is a package manager for OCaml that can install \
</span> github.tarball_from releases
 distname            opam-full-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  62315b15e48a92cc788cecc421529c300281f81f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  81f7f1b661a0c1e04642fe02d0bea5524b32aa2cbed0ecf9b18d7145324ed97c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    7585808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  dac24c1b89772b39752420b686e3f44d5c6dc44e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  eeb99fdda4b10ad3467a700fa4d1dfedb30714837d18d2faf1ef9c87d94cf0bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    7869705
</span> 
 depends_build       port:ocaml
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,18 +29,18 @@ depends_build       port:ocaml
</span> # We don't need or want one.
 configure.env-append  FETCH=no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This patch dikes out a test that will prevent us from disabling fetch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Otherwise FETCH=no will fail and we'll need to depend on curl or wget.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-stop-fetch-check.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is a kludge to put the documentation files into share/opam-installer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Without this, they'd end up in doc/opam-installer, and there is no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# /opt/local/doc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# It really should go in share/doc/opam but there's no obvious way to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# force the infra to do that yet.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|doc:|share:|g" ${worksrcpath}/opam-installer.install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# * patch-stop-fetch-check.diff dikes out a test that will prevent us
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#   from disabling fetch. Otherwise FETCH=no will fail and we'll need to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#   depend on curl or wget.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# * patch-makefile.diff is a kludge to put documentation files into
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#   share/doc/opam-installer -- without this, they'd end up in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#   doc/opam-installer, and there is no /opt/local/doc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# * patch-fix-opamarg.diff fixes a temporary problem with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#    2.0.2 distribution and should be removed once a later version is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#    available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-stop-fetch-check.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-fix-opamarg.diff
</span> 
 use_parallel_build  no
 build.target        lib-ext all
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/files/patch-fix-opamarg.diff b/ocaml/opam/files/patch-fix-opamarg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dc063d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/files/patch-fix-opamarg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/client/opamArg.ml b/src/client/opamArg.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f221211bb..0c8518491 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/client/opamArg.ml.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/client/opamArg.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -979,7 +979,7 @@ let global_options =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       "Don't fail if all requested packages can't be installed: try to install \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        as many as possible. Note that not all external solvers may support \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        this option (recent versions of $(i,aspcud) or $(i,mccs) should). This \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       is equivalent to setting $($b,\\$OPAMBESTEFFORT) environment variable."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       is equivalent to setting $(b,\\$OPAMBESTEFFORT) environment variable."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   let safe_mode =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     mk_flag ~section ["readonly"; "safe"]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/files/patch-makefile.diff b/ocaml/opam/files/patch-makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..56d5684
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,6 +81,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPAMINSTALLER_FLAGS = --prefix "$(DESTDIR)$(prefix)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPAMINSTALLER_FLAGS += --mandir "$(DESTDIR)$(mandir)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPAMINSTALLER_FLAGS += --docdir "$(DESTDIR)$(prefix)/share/doc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # With ocamlfind, prefer to install to the standard directory rather
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # than $(prefix) if there are no overrides
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/files/patch-stop-fetch-check.diff b/ocaml/opam/files/patch-stop-fetch-check.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a06830..323ab82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/opam/files/patch-stop-fetch-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/files/patch-stop-fetch-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.~    2018-10-25 11:29:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure      2018-10-25 11:30:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4752,7 +4752,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4751,7 +4751,7 @@
</span>  elif test x"$FETCH" = x"wget" ; then
    fetch="wget $wget_certificate_check -O \$(2) \$(1)"
  
</pre><pre style='margin:0'>

</pre>