1 files changed, 15 insertions, 14 deletions
diff --git a/Library/Formula/opam.rb b/Library/Formula/opam.rb
index ac00615dd..25024d739 100644
--- a/Library/Formula/opam.rb
+++ b/Library/Formula/opam.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Opam < Formula
   homepage 'https://opam.ocaml.org'
-  url 'https://github.com/ocaml/opam/archive/1.1.2.tar.gz'
-  sha1 '15ade90a1965fa712967e807a717f79db8d9032f'
+  url 'https://github.com/ocaml/opam/archive/1.2.0.tar.gz'
+  sha1 'b7923516a853afe86e8439afd23c0dae5fa8ad57'
 
   head 'https://github.com/ocaml/opam.git'
 
@@ -15,8 +15,8 @@ class Opam < Formula
   end
 
   resource "cudf" do
-    url "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz"
-    sha1 "e2699dd33b8c49d8122c4402a20561a4dfdd1bae"
+    url "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz"
+    sha1 "33d6942caf5f008d6696c1200a2589e28ff7e7fa"
   end
 
   resource "extlib" do
@@ -30,18 +30,23 @@ class Opam < Formula
   end
 
   resource "ocamlgraph" do
-    url "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz"
-    sha1 "1eac55604956f566f525c3e043188d626d1924ce"
+    url "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz"
+    sha1 "e53a92d50685ab38f2b856eb64d93aa36dc7bcdf"
   end
 
   resource "dose3" do
-    url "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz"
-    sha1 "c1033921e907a1cfa7a8873683b0debe24319f87"
+    url "https://gforge.inria.fr/frs/download.php/file/33677/dose3-3.2.2.tar.gz"
+    sha1 "9e679404f46dd0c9af4c6b77d6088b17986741b3"
   end
 
   resource "cmdliner" do
-    url "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz"
-    sha1 "af7e32e5f2eb829aab9ba6c1d85574b2a3ba174e"
+    url "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.4.tbz"
+    sha1 "afa604e527fc3e0753c643a96c354d4a6421321c"
+  end
+
+  resource "jsonm" do
+    url "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz"
+    sha1 "733fe089fb91ac79ac885e9c80d5554aca3e7805"
   end
 
   def install
@@ -62,10 +67,6 @@ class Opam < Formula
     system "make", "man"
     system "make", "install"
 
-    # mandir is not honored: https://github.com/ocaml/opam/issues/1753
-    # Fixed in head: https://github.com/OCamlPro/opam/commit/24916e8cb
-    share.install "#{prefix}/man" unless build.head?
-
     bash_completion.install "shell/opam_completion.sh"
     zsh_completion.install "shell/opam_completion_zsh.sh" => "_opam"
   end