Index: head/devel/ocaml-opam/files/patch-configure
===================================================================
--- head/devel/ocaml-opam/files/patch-configure	(revision 480325)
+++ head/devel/ocaml-opam/files/patch-configure	(nonexistent)
@@ -1,104 +0,0 @@
---- configure.orig	2015-04-27 08:51:24 UTC
-+++ configure
-@@ -599,8 +599,6 @@ OCAML_PKG_re_emacs
- OCAML_PKG_re
- OCAML_PKG_extlib
- OCAML_PKG_unix
--fetch
--FETCH
- OCAMLFIND
- OCAMLYACC
- OCAMLLEXDOTOPT
-@@ -671,7 +669,6 @@ ac_subst_files=''
- ac_user_opts='
- enable_option_checking
- enable_version_check
--enable_certificate_check
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1292,10 +1289,6 @@ Optional Features:
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --disable-version-check Do not check OCaml version
- 
--  --disable-certificate-check
--                          Do not check the certificate of OPAM's dependency
--                          archives
--
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -4156,73 +4149,6 @@ fi
- 
- 
- 
--# Check whether --enable-certificate_check was given.
--if test "${enable_certificate_check+set}" = set; then :
--  enableval=$enable_certificate_check;
--fi
--
--
--if test "x${enable_certificate_check}" = "xno"; then :
--
--  curl_certificate_check=--insecure
--  wget_certificate_check=--no-check-certificate
--
--fi
--
--for ac_prog in curl wget
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_FETCH+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$FETCH"; then
--  ac_cv_prog_FETCH="$FETCH" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_FETCH="$ac_prog"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--FETCH=$ac_cv_prog_FETCH
--if test -n "$FETCH"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FETCH" >&5
--$as_echo "$FETCH" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  test -n "$FETCH" && break
--done
--test -n "$FETCH" || FETCH="no"
--
--
--if test x"$FETCH" = x"curl" ; then
--  fetch="curl $curl_certificate_check -OL"
--
--elif test x"$FETCH" = x"wget" ; then
--  fetch="wget $wget_certificate_check"
--
--else
--  as_fn_error $? "You must have either curl or wget installed." "$LINENO" 5
--fi
--
- echo
- 
- 

Property changes on: head/devel/ocaml-opam/files/patch-configure
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/ocaml-opam/Makefile
===================================================================
--- head/devel/ocaml-opam/Makefile	(revision 480325)
+++ head/devel/ocaml-opam/Makefile	(revision 480326)
@@ -1,45 +1,42 @@
 # Created by: J. Giovannangeli
 # $FreeBSD$
 
 PORTNAME=	opam
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	opam-full-${DISTVERSION}
-DIST_SUBDIR=	opam-01
 
-MAINTAINER=	joris@giovannangeli.fr
+MAINTAINER=	hannes@mehnert.org
 COMMENT=	Source-based package manager for OCaml
 
-LICENSE=	GPLv3
+LICENSE=	LGPL21
 
-RUN_DEPENDS=		camlp4:devel/ocaml-camlp4
+RUN_DEPENDS=	curl:ftp/curl \
+		gpatch:devel/patch
 
 USES=		gmake
 USE_OCAML=	yes
-GNU_CONFIGURE=	yes
-MAKE_ENV+=	TERM=xterm
+
 ALL_TARGET=	lib-ext all man
 
-OPTIONS_DEFINE=		RSYNC GIT WGET HG DARCS ASPCUD
-OPTIONS_DEFAULT=	RSYNC GIT WGET ASPCUD
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-checks
 
+OPTIONS_DEFINE=		RSYNC GIT HG DARCS
+OPTIONS_DEFAULT=	RSYNC GIT
+
 RSYNC_DESC=		Remote repository synchronized with Rsync
-WGET_DESC=		Remote repository synchronized with git
-GIT_DESC=		Remote repository synchronized with HTTP
+GIT_DESC=		Remote repository synchronized with git
 HG_DESC=		Remote repository synchronized with mercurial
 DARCS_DESC=		Remote repository synchronized with darcs
-ASPCUD_DESC=		Use aspcud as an external dependencies solver
 
-WGET_RUN_DEPENDS=	wget:ftp/wget
 RSYNC_RUN_DEPENDS=	rsync:net/rsync
 GIT_RUN_DEPENDS=	git:devel/git
 HG_RUN_DEPENDS=		hg:devel/mercurial
 DARCS_RUN_DEPENDS=	darcs:devel/hs-darcs
-ASPCUD_RUN_DEPENDS=	aspcud:math/aspcud
 
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
Index: head/devel/ocaml-opam/distinfo
===================================================================
--- head/devel/ocaml-opam/distinfo	(revision 480325)
+++ head/devel/ocaml-opam/distinfo	(revision 480326)
@@ -1,2 +1,3 @@
-SHA256 (opam-01/opam-full-1.2.2.tar.gz) = 15e617179251041f4bf3910257bbb8398db987d863dd3cfc288bdd958de58f00
-SIZE (opam-01/opam-full-1.2.2.tar.gz) = 1535335
+TIMESTAMP = 1537359209
+SHA256 (opam-full-2.0.0.tar.gz) = 9dad4fcb4f53878c9daa6285d8456ccc671e21bfa71544d1f926fb8a63bfed25
+SIZE (opam-full-2.0.0.tar.gz) = 7827701
Index: head/devel/ocaml-opam/pkg-plist
===================================================================
--- head/devel/ocaml-opam/pkg-plist	(revision 480325)
+++ head/devel/ocaml-opam/pkg-plist	(revision 480326)
@@ -1,23 +1,40 @@
 bin/opam
-bin/opam-admin
 bin/opam-installer
-man/man1/opam-admin-check.1.gz
-man/man1/opam-admin-depexts.1.gz
-man/man1/opam-admin-make.1.gz
-man/man1/opam-admin-stats.1.gz
+doc/opam-installer/CHANGES
+doc/opam-installer/LICENSE
+doc/opam-installer/README.md
+lib/opam-installer/META
+lib/opam-installer/opam
+man/man1/opam-admin-cache.1.gz
+man/man1/opam-admin-filter.1.gz
+man/man1/opam-admin-index.1.gz
+man/man1/opam-admin-lint.1.gz
+man/man1/opam-admin-list.1.gz
+man/man1/opam-admin-upgrade.1.gz
 man/man1/opam-admin.1.gz
+man/man1/opam-clean.1.gz
 man/man1/opam-config.1.gz
+man/man1/opam-env.1.gz
+man/man1/opam-exec.1.gz
+man/man1/opam-help.1.gz
+man/man1/opam-info.1.gz
 man/man1/opam-init.1.gz
 man/man1/opam-install.1.gz
 man/man1/opam-installer.1.gz
 man/man1/opam-list.1.gz
+man/man1/opam-lint.1.gz
 man/man1/opam-pin.1.gz
 man/man1/opam-reinstall.1.gz
 man/man1/opam-remove.1.gz
+man/man1/opam-remote.1.gz
 man/man1/opam-repository.1.gz
 man/man1/opam-search.1.gz
+man/man1/opam-source.1.gz
 man/man1/opam-show.1.gz
 man/man1/opam-switch.1.gz
 man/man1/opam-update.1.gz
 man/man1/opam-upgrade.1.gz
+man/man1/opam-uninstall.1.gz
+man/man1/opam-unpin.1.gz
+man/man1/opam-var.1.gz
 man/man1/opam.1.gz