summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ocaml-opam/Makefile5
-rw-r--r--devel/ocaml-opam/distinfo4
-rw-r--r--devel/ocaml-opam/files/patch-configure12
3 files changed, 12 insertions, 9 deletions
diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index c19797d63667..3c4589f91d46 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= opam
-PORTVERSION= 1.2.1
+PORTVERSION= 1.2.2
CATEGORIES= devel
MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ \
http://github.com/ocaml/opam/releases/download/${DISTVERSION}/
@@ -14,6 +14,9 @@ COMMENT= Source-based package manager for OCaml
LICENSE= GPLv3
+# Temporary hack since the directory is named opam-full-1.2.2-rc2
+WRKSRC= ${WRKDIR}/${DISTNAME}-rc2
+
USES= gmake
USE_OCAML= yes
GNU_CONFIGURE= yes
diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo
index 33629307bf62..13f8993c28c1 100644
--- a/devel/ocaml-opam/distinfo
+++ b/devel/ocaml-opam/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opam-full-1.2.1.tar.gz) = f210ece7a2def34b486c9ccfb75de8febd64487b2ea4a14a7fa0358f37eacc3b
-SIZE (opam-full-1.2.1.tar.gz) = 1519602
+SHA256 (opam-full-1.2.2.tar.gz) = e43ecb9b02badf77776900be30b03c04cd582cafc73160c15f1fe6dec4457d18
+SIZE (opam-full-1.2.2.tar.gz) = 1529197
diff --git a/devel/ocaml-opam/files/patch-configure b/devel/ocaml-opam/files/patch-configure
index 8e494dbda504..2015a7b3d9be 100644
--- a/devel/ocaml-opam/files/patch-configure
+++ b/devel/ocaml-opam/files/patch-configure
@@ -1,6 +1,6 @@
---- configure 2015-04-29 20:23:39.092132000 +0200
-+++ configure 2015-04-29 20:24:39.312802000 +0200
-@@ -599,8 +599,6 @@
+--- 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
@@ -9,7 +9,7 @@
OCAMLFIND
OCAMLYACC
OCAMLLEXDOTOPT
-@@ -671,7 +669,6 @@
+@@ -671,7 +669,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_version_check
@@ -17,7 +17,7 @@
'
ac_precious_vars='build_alias
host_alias
-@@ -1292,10 +1289,6 @@
+@@ -1292,10 +1289,6 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-version-check Do not check OCaml version
@@ -28,7 +28,7 @@
Some influential environment variables:
CC C compiler command
-@@ -4156,73 +4149,6 @@
+@@ -4156,73 +4149,6 @@ fi