On Tue, 21 Oct 2014 19:23:05 +0100 Anil Madhavapeddy a...@recoil.org
wrote:
On 21 Oct 2014, at 19:21, Christopher Zimmermann chr...@openbsd.org
wrote:
On Tue, 21 Oct 2014 19:04:05 +0100 Anil Madhavapeddy
a...@recoil.org wrote:
I think this needs a corresponding lambda-term 1.7 update (that now
makes camlp4 optional -- not sure if necessary or not).
Well, it works for me with camlp4 enabled. What do you think about
just removing lambda-term, zed and utop and importing opam-1.2rc3 ?
We should wait until the final OPAM version is released (a matter of
days).
But it's quite convenient having utop as a binary package, and it will
also work on bytecode-only architectures (which OPAM packages will not
currently be cleanly installed on). I'd be in favour of leaving both
in the tree.
-anil
ok. Here's the update for lambda-term. OK?
While preparing this I stumbled over a dynlink version incompatibility
due to an upgrade of camlp4 after building lwt, but before building
lambda-term.
For now, this will work, but I'm afraid we'll need a PKGSPEC hack for
camlp4, too - to enforce RUN_DEPENDS on the exact version:
PKGSPEC = ocaml-camlp4-=${V}
Christopher
Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-lambda-term/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile2 Sep 2014 09:24:44 - 1.12
+++ Makefile21 Oct 2014 18:35:37 -
@@ -3,12 +3,10 @@
COMMENT = library for manipulating the terminal
CATEGORIES = devel
-V =1.6
-DISTNAME = lambda-term-1.6
+V =1.7
GH_ACCOUNT = diml
GH_PROJECT = lambda-term
-GH_TAGNAME = $V
-GH_COMMIT =3f31956c450f450fc265f98107242373824cded1
+GH_TAGNAME = ${V}
DISTNAME = ${GH_PROJECT}-${V}
PKGNAME = ocaml-${DISTNAME}
@@ -27,6 +25,8 @@ RUN_DEPENDS = devel/ocaml-lwt devel/ocam
LIB_DEPENDS = devel/libev
CONFIGURE_STYLE = oasis
+
+CONFIGURE_ARGS = --enable-camlp4 --enable-tests
pre-configure:
Index: distinfo
===
RCS file: /cvs/ports/devel/ocaml-lambda-term/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo27 Aug 2014 08:05:17 - 1.3
+++ distinfo21 Oct 2014 18:35:37 -
@@ -1,2 +1,2 @@
-SHA256 (lambda-term-1.6.tar.gz) = CSjulKC3QrYu7rDXYt398pLFw8g8KW2c/Z36+1qPDuY=
-SIZE (lambda-term-1.6.tar.gz) = 147655
+SHA256 (lambda-term-1.7.tar.gz) = 2plOLt7F3URYO5yjnj60Qr10BJB3CwJN4Q58uXLxBAo=
+SIZE (lambda-term-1.7.tar.gz) = 156217
Index: pkg/PFRAG.native
===
RCS file: /cvs/ports/devel/ocaml-lambda-term/pkg/PFRAG.native,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.native
--- pkg/PFRAG.native18 Aug 2012 22:56:33 - 1.1.1.1
+++ pkg/PFRAG.native21 Oct 2014 18:35:37 -
@@ -1,7 +1,9 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2012/08/18 22:56:33 avsm Exp $
%%dynlink%%
lib/ocaml/lambda-term/lTerm.cmx
+lib/ocaml/lambda-term/lTerm_buttons_impl.cmx
lib/ocaml/lambda-term/lTerm_color_mappings.cmx
+lib/ocaml/lambda-term/lTerm_containers_impl.cmx
lib/ocaml/lambda-term/lTerm_draw.cmx
lib/ocaml/lambda-term/lTerm_edit.cmx
lib/ocaml/lambda-term/lTerm_event.cmx
@@ -13,11 +15,15 @@ lib/ocaml/lambda-term/lTerm_mouse.cmx
lib/ocaml/lambda-term/lTerm_read_line.cmx
lib/ocaml/lambda-term/lTerm_resource_lexer.cmx
lib/ocaml/lambda-term/lTerm_resources.cmx
+lib/ocaml/lambda-term/lTerm_running_impl.cmx
lib/ocaml/lambda-term/lTerm_style.cmx
lib/ocaml/lambda-term/lTerm_text.cmx
+lib/ocaml/lambda-term/lTerm_toplevel_impl.cmx
lib/ocaml/lambda-term/lTerm_ui.cmx
lib/ocaml/lambda-term/lTerm_unix.cmx
lib/ocaml/lambda-term/lTerm_widget.cmx
+lib/ocaml/lambda-term/lTerm_widget_base_impl.cmx
+lib/ocaml/lambda-term/lTerm_widget_callbacks.cmx
lib/ocaml/lambda-term/lTerm_windows.cmx
lib/ocaml/lambda-term/lambda-term.a
lib/ocaml/lambda-term/lambda-term.cmxa
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ocaml-lambda-term/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 27 Aug 2014 08:05:17 - 1.4
+++ pkg/PLIST 21 Oct 2014 18:35:37 -
@@ -36,6 +36,8 @@ lib/ocaml/lambda-term/lTerm_unix.cmi
lib/ocaml/lambda-term/lTerm_unix.mli
lib/ocaml/lambda-term/lTerm_widget.cmi
lib/ocaml/lambda-term/lTerm_widget.mli
+lib/ocaml/lambda-term/lTerm_widget_callbacks.cmi
+lib/ocaml/lambda-term/lTerm_widget_callbacks.mli
lib/ocaml/lambda-term/lTerm_windows.cmi
lib/ocaml/lambda-term/lTerm_windows.mli
lib/ocaml/lambda-term/lambda-term.cma
@@ -72,20 +74,27 @@ share/doc/ocaml-lambda-term/api/LTerm_ui
share/doc/ocaml-lambda-term/api/LTerm_unix.html
share/doc/ocaml-lambda-term/api/LTerm_widget.box-c.html
share/doc/ocaml-lambda-term/api/LTerm_widget.button-c.html
