Upgrade ocaml-react. Since it has a major api charge, all of its dependers

need an upgrade, too.

* react uses opam without findlib as build system. Therefore call
  ocamlbuild directly. And roll a custom do-install.
* lwt will need camlp4.
* zed has moved to github.
* utop, too.
* lambda-term, too. Also will it need camlp4.


OK jca@
This commit is contained in:
chrisz 2014-08-27 08:05:17 +00:00
parent a9eaec5af1
commit b798901ddc
19 changed files with 96 additions and 190 deletions

View File

@ -1,15 +1,18 @@
# $OpenBSD: Makefile,v 1.10 2014/08/22 22:49:07 kili Exp $
# $OpenBSD: Makefile,v 1.11 2014/08/27 08:05:17 chrisz Exp $
COMMENT = library for manipulating the terminal
CATEGORIES = devel
# also adapt MASTER_SITES when changing the version!
DISTNAME = lambda-term-1.3
REVISION = 2
V = 1.6
DISTNAME = lambda-term-1.6
GH_ACCOUNT = diml
GH_PROJECT = lambda-term
GH_TAGNAME = $V
GH_COMMIT = 3f31956c450f450fc265f98107242373824cded1
DISTNAME = ${GH_PROJECT}-${V}
PKGNAME = ocaml-${DISTNAME}
MASTER_SITES = http://forge.ocamlcore.org/frs/download.php/1034/
HOMEPAGE = http://forge.ocamlcore.org/projects/lambda-term
HOMEPAGE = https://github.com/diml/lambda-term
# BSD3
@ -19,7 +22,7 @@ WANTLIB = c ev m pthread charset
MODULES = lang/ocaml converters/libiconv
BUILD_DEPENDS = devel/ocaml-lwt devel/ocaml-zed
BUILD_DEPENDS = devel/ocaml-lwt devel/ocaml-zed lang/ocaml,-camlp4
RUN_DEPENDS = devel/ocaml-lwt devel/ocaml-zed
LIB_DEPENDS = devel/libev
@ -31,7 +34,7 @@ pre-configure:
post-install:
${INSTALL_DATA} \
${WRKDIST}/{LICENSE,CHANGES} \
${WRKDIST}/{LICENSE,CHANGES.md,README.md} \
${PREFIX}/share/doc/ocaml-lambda-term/
gunzip ${PREFIX}/man/*/*.gz

View File

@ -1,2 +1,2 @@
SHA256 (lambda-term-1.3.tar.gz) = imxUWMlYdcNZ0hs6+aIg82VgSesyYogXpoyQszM/Yxw=
SIZE (lambda-term-1.3.tar.gz) = 146966
SHA256 (lambda-term-1.6.tar.gz) = CSjulKC3QrYu7rDXYt398pLFw8g8KW2c/Z36+1qPDuY=
SIZE (lambda-term-1.6.tar.gz) = 147655

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-_oasis,v 1.1 2013/01/10 18:55:30 chrisz Exp $
Link to libcharset
--- _oasis.orig Mon Oct 8 11:21:18 2012
+++ _oasis Fri Jan 4 00:00:04 2013
@@ -62,6 +62,11 @@ Library "lambda-term"
lTerm_term_stubs.c,
lTerm_unix_stubs.c,
lTerm_windows_stubs.c
+ CCOpt:
+ -I${LOCALBASE}/include
+ CCLib:
+ -L${LOCALBASE}/lib
+ -lcharset
# +-------------------------------------------------------------------+
# | Examples |

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-_tags,v 1.1 2013/01/10 18:55:30 chrisz Exp $
autogenerated by oasis
--- _tags.orig Mon Oct 8 11:21:18 2012
+++ _tags Fri Jan 4 00:00:12 2013
@@ -19,6 +19,15 @@
"_darcs": not_hygienic
# Library lambda-term
"src/lambda-term.cmxs": use_lambda-term
+<src/*.ml{,i}>: oasis_library_lambda_term_ccopt
+"src/lTerm_term_stubs.c": oasis_library_lambda_term_ccopt
+"src/lTerm_unix_stubs.c": oasis_library_lambda_term_ccopt
+"src/lTerm_windows_stubs.c": oasis_library_lambda_term_ccopt
+<src/lambda-term.{cma,cmxa}>: oasis_library_lambda_term_cclib
+"src/liblambda-term_stubs.lib": oasis_library_lambda_term_cclib
+"src/dlllambda-term_stubs.dll": oasis_library_lambda_term_cclib
+"src/liblambda-term_stubs.a": oasis_library_lambda_term_cclib
+"src/dlllambda-term_stubs.so": oasis_library_lambda_term_cclib
<src/lambda-term.{cma,cmxa}>: use_liblambda-term_stubs
<src/*.ml{,i}>: pkg_lwt
<src/*.ml{,i}>: pkg_lwt.unix

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-myocamlbuild_ml,v 1.1 2013/01/10 18:55:30 chrisz Exp $
autogenerated by oasis
--- myocamlbuild.ml.orig Mon Oct 8 11:21:18 2012
+++ myocamlbuild.ml Fri Jan 4 00:00:12 2013
@@ -488,7 +488,25 @@ let package_default =
{
MyOCamlbuildBase.lib_ocaml = [("lambda-term", ["src"])];
lib_c = [("lambda-term", "src", [])];
- flags = [];
+ flags =
+ [
+ (["oasis_library_lambda_term_ccopt"; "compile"],
+ [(OASISExpr.EBool true, S [A "-ccopt"; A "-I${LOCALBASE}/include"])
+ ]);
+ (["oasis_library_lambda_term_cclib"; "link"],
+ [
+ (OASISExpr.EBool true,
+ S
+ [
+ A "-cclib";
+ A "-L${LOCALBASE}/lib";
+ A "-cclib";
+ A "-lcharset"
+ ])
+ ]);
+ (["oasis_library_lambda_term_cclib"; "ocamlmklib"; "c"],
+ [(OASISExpr.EBool true, S [A "-L${LOCALBASE}/lib"; A "-lcharset"])])
+ ];
includes =
[("tools", ["src"]); ("tests", ["src"]); ("examples", ["src"])];
}

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-setup_ml,v 1.1 2013/01/10 18:55:30 chrisz Exp $
autogenerated by oasis
--- setup.ml.orig Mon Oct 8 11:21:18 2012
+++ setup.ml Fri Jan 4 00:00:12 2013
@@ -5964,8 +5964,13 @@ let setup_t =
"lTerm_windows_stubs.c"
];
bs_data_files = [];
- bs_ccopt = [(OASISExpr.EBool true, [])];
- bs_cclib = [(OASISExpr.EBool true, [])];
+ bs_ccopt =
+ [(OASISExpr.EBool true, ["-I${LOCALBASE}/include"])];
+ bs_cclib =
+ [
+ (OASISExpr.EBool true,
+ ["-L${LOCALBASE}/lib"; "-lcharset"])
+ ];
bs_dlllib = [(OASISExpr.EBool true, [])];
bs_dllpath = [(OASISExpr.EBool true, [])];
bs_byteopt = [(OASISExpr.EBool true, [])];

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_lTerm_unix_stubs_c,v 1.1 2013/01/10 18:55:30 chrisz Exp $
work around nl_langinfo(CODESET) bug for LC_CTYPE=C
see
http://hackage.haskell.org/trac/ghc/ticket/4080
http://www.haible.de/bruno/packages-libcharset.html
--- src/lTerm_unix_stubs.c.orig Thu Dec 13 13:06:26 2012
+++ src/lTerm_unix_stubs.c Thu Dec 13 13:23:28 2012
@@ -29,7 +29,7 @@ CAMLprim value lt_unix_get_system_encoding()
#include <signal.h>
#include <locale.h>
-#include <langinfo.h>
+#include <localcharset.h>
CAMLprim value lt_unix_get_sigwinch()
{
@@ -45,9 +45,9 @@ CAMLprim value lt_unix_get_sigwinch()
CAMLprim value lt_unix_get_system_encoding()
{
/* Set the locale according to environment variables: */
- char *locale = setlocale(LC_CTYPE, "");
+ const char *locale = setlocale(LC_CTYPE, "");
/* Get the codeset used by current locale: */
- char *codeset = nl_langinfo(CODESET);
+ const char *codeset = locale_charset();
/* Reset the locale: */
setlocale(LC_CTYPE, locale);
/* If the encoding cannot be determined, just use ascii: */

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2014/03/09 19:50:44 jasper Exp $
@comment $OpenBSD: PLIST,v 1.4 2014/08/27 08:05:17 chrisz Exp $
%%SHARED%%
%%native%%
@bin bin/lambda-term-actions
@ -44,8 +44,9 @@ lib/ocaml/lambda-term/liblambda-term_stubs.a
@man man/man1/lambda-term-actions.1
@man man/man5/lambda-term-inputrc.5
share/doc/ocaml-lambda-term/
share/doc/ocaml-lambda-term/CHANGES
share/doc/ocaml-lambda-term/CHANGES.md
share/doc/ocaml-lambda-term/LICENSE
share/doc/ocaml-lambda-term/README.md
share/doc/ocaml-lambda-term/api/
share/doc/ocaml-lambda-term/api/LTerm.html
share/doc/ocaml-lambda-term/api/LTerm_draw.html

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.12 2014/08/22 22:49:07 kili Exp $
# $OpenBSD: Makefile,v 1.13 2014/08/27 08:05:17 chrisz Exp $
COMMENT = cooperative lightweight thread library
CATEGORIES = devel
GH_ACCOUNT = ocsigen
GH_PROJECT = lwt
GH_TAGNAME = 2.4.4
GH_COMMIT = c6280535eb754b70f75a26fbfd406b7d492f8608
GH_TAGNAME = 2.4.5
GH_COMMIT = 75b1dc1aefae75dc4ac6455f5a2688b3a52adabd
DISTNAME = ${GH_PROJECT}-${GH_TAGNAME}
PKGNAME = ocaml-${DISTNAME}
REVISION = 0
HOMEPAGE = http://ocsigen.org/lwt/
@ -23,7 +22,7 @@ MODULES = lang/ocaml \
MYDEPENDS = devel/ocaml-react \
textproc/ocaml-text \
security/ocaml-ssl
BUILD_DEPENDS = ${MYDEPENDS} sysutils/findlib
BUILD_DEPENDS = ${MYDEPENDS} sysutils/findlib lang/ocaml,-camlp4
RUN_DEPENDS = ${MYDEPENDS}
LIB_DEPENDS = devel/glib2 devel/libev
WANTLIB = glib-2.0 ev pthread

View File

@ -1,2 +1,2 @@
SHA256 (lwt-2.4.4.tar.gz) = 4GuIcIYOzdb7LpkUidSsAEl7y/gYa0QemPywYC3h6Rk=
SIZE (lwt-2.4.4.tar.gz) = 294161
SHA256 (lwt-2.4.5.tar.gz) = kOHlbGbnfG5s7KYyl5vb7/24g3Uv8ot8N/PVoiBXfmE=
SIZE (lwt-2.4.5.tar.gz) = 298612

View File

@ -1,7 +1,10 @@
$OpenBSD: patch-setup_ml,v 1.3 2013/11/25 14:35:26 dcoppa Exp $
--- setup.ml.orig Thu Dec 27 13:30:01 2012
+++ setup.ml Thu Nov 14 16:05:18 2013
@@ -5748,7 +5748,7 @@ let setup_t =
$OpenBSD: patch-setup_ml,v 1.4 2014/08/27 08:05:17 chrisz Exp $
use gmake
--- setup.ml.orig Wed Aug 20 17:18:31 2014
+++ setup.ml Wed Aug 20 17:18:43 2014
@@ -6725,7 +6725,7 @@ let setup_t =
CustomPlugin.cmd_main =
[
(OASISExpr.EBool true,
@ -9,8 +12,8 @@ $OpenBSD: patch-setup_ml,v 1.3 2013/11/25 14:35:26 dcoppa Exp $
+ ("gmake", ["-C"; "manual"; "manual.pdf"]))
];
cmd_clean = [(OASISExpr.EBool true, None)];
cmd_distclean = [(OASISExpr.EBool true, None)];
@@ -5801,7 +5801,7 @@ let setup_t =
cmd_distclean = [(OASISExpr.EBool true, None)]
@@ -6780,7 +6780,7 @@ let setup_t =
CustomPlugin.cmd_main =
[
(OASISExpr.EBool true,
@ -18,8 +21,8 @@ $OpenBSD: patch-setup_ml,v 1.3 2013/11/25 14:35:26 dcoppa Exp $
+ ("gmake", ["-C"; "manual"; "manual.pdf"]))
];
cmd_clean = [(OASISExpr.EBool true, None)];
cmd_distclean = [(OASISExpr.EBool true, None)];
@@ -5852,7 +5852,7 @@ let setup_t =
cmd_distclean = [(OASISExpr.EBool true, None)]
@@ -6833,7 +6833,7 @@ let setup_t =
CustomPlugin.cmd_main =
[
(OASISExpr.EBool true,
@ -27,4 +30,4 @@ $OpenBSD: patch-setup_ml,v 1.3 2013/11/25 14:35:26 dcoppa Exp $
+ ("gmake", ["-C"; "manual"; "manual.pdf"]))
];
cmd_clean = [(OASISExpr.EBool true, None)];
cmd_distclean = [(OASISExpr.EBool true, None)];
cmd_distclean = [(OASISExpr.EBool true, None)]

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2014/08/22 22:49:07 kili Exp $
# $OpenBSD: Makefile,v 1.5 2014/08/27 08:05:17 chrisz Exp $
COMMENT = functional reactive programming (FRP) for OCaml
CATEGORIES = devel
V = 0.9.4
REVISION = 1
V = 1.1.0
DISTNAME = react-${V}
EXTRACT_SUFX = .tbz
NAME = ocaml-react
@ -19,18 +18,30 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/ocaml
BUILD_DEPENDS = sysutils/findlib
RUN_DEPENDS = lang/ocaml
CONFIGURE_STYLE = oasis
CONFIGURE_ARGS = --enable-tests
ALL_TARGET = react.{cma,cmi,mli}
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mocaml_native}
ALL_TARGET += react.{a,cmx,cmxa}
.if ${PROPERTIES:Mocaml_native_dynlink}
ALL_TARGET += react.cmxs
.endif
.endif
ALL_TARGET = -build
post-install:
do-build:
cd ${WRKSRC} && ocamlbuild ${ALL_TARGET}
do-install:
${INSTALL_SCRIPT_DIR} ${PREFIX}/lib/ocaml/react
${INSTALL_SCRIPT} \
${WRKSRC}/pkg/META \
${ALL_TARGET:S|^|${WRKSRC}/_build/src/|} \
${PREFIX}/lib/ocaml/react/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${NAME}/api
${INSTALL_DATA} ${WRKDIST}/{README,CHANGES}.md ${PREFIX}/share/doc/${NAME}/
${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/${NAME}/api/
${INSTALL_DATA} ${WRKDIST}/{README,CHANGES} ${PREFIX}/share/doc/${NAME}/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (react-0.9.4.tbz) = RmrU4uf/V8k8TlFRH1PyvfMt9GNURY9KFYzRO/P71Ks=
SIZE (react-0.9.4.tbz) = 82964
SHA256 (react-1.1.0.tbz) = pzYUWYqugY//Vv2g/AU9fuNpLZNh1epxokC94yGy1b8=
SIZE (react-1.1.0.tbz) = 62472

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/18 23:13:53 avsm Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/08/27 08:05:17 chrisz Exp $
%%native%%
lib/ocaml/react/
lib/ocaml/react/META
@ -6,9 +6,10 @@ lib/ocaml/react/react.cma
lib/ocaml/react/react.cmi
lib/ocaml/react/react.mli
share/doc/ocaml-react/
share/doc/ocaml-react/CHANGES
share/doc/ocaml-react/README
share/doc/ocaml-react/CHANGES.md
share/doc/ocaml-react/README.md
share/doc/ocaml-react/api/
share/doc/ocaml-react/api/React.E.Option.html
share/doc/ocaml-react/api/React.E.html
share/doc/ocaml-react/api/React.S.Bool.html
share/doc/ocaml-react/api/React.S.Compare.html
@ -16,6 +17,7 @@ share/doc/ocaml-react/api/React.S.EqType.html
share/doc/ocaml-react/api/React.S.Float.html
share/doc/ocaml-react/api/React.S.Int.html
share/doc/ocaml-react/api/React.S.Make.html
share/doc/ocaml-react/api/React.S.Option.html
share/doc/ocaml-react/api/React.S.Pair.html
share/doc/ocaml-react/api/React.S.S.html
share/doc/ocaml-react/api/React.S.Special.Sb.html
@ -23,6 +25,7 @@ share/doc/ocaml-react/api/React.S.Special.Sf.html
share/doc/ocaml-react/api/React.S.Special.Si.html
share/doc/ocaml-react/api/React.S.Special.html
share/doc/ocaml-react/api/React.S.html
share/doc/ocaml-react/api/React.Step.html
share/doc/ocaml-react/api/React.html
share/doc/ocaml-react/api/api.odocl
share/doc/ocaml-react/api/index.html
@ -36,6 +39,7 @@ share/doc/ocaml-react/api/index_modules.html
share/doc/ocaml-react/api/index_types.html
share/doc/ocaml-react/api/index_values.html
share/doc/ocaml-react/api/style.css
share/doc/ocaml-react/api/type_React.E.Option.html
share/doc/ocaml-react/api/type_React.E.html
share/doc/ocaml-react/api/type_React.S.Bool.html
share/doc/ocaml-react/api/type_React.S.Compare.html
@ -43,6 +47,7 @@ share/doc/ocaml-react/api/type_React.S.EqType.html
share/doc/ocaml-react/api/type_React.S.Float.html
share/doc/ocaml-react/api/type_React.S.Int.html
share/doc/ocaml-react/api/type_React.S.Make.html
share/doc/ocaml-react/api/type_React.S.Option.html
share/doc/ocaml-react/api/type_React.S.Pair.html
share/doc/ocaml-react/api/type_React.S.S.html
share/doc/ocaml-react/api/type_React.S.Special.Sb.html
@ -50,4 +55,5 @@ share/doc/ocaml-react/api/type_React.S.Special.Sf.html
share/doc/ocaml-react/api/type_React.S.Special.Si.html
share/doc/ocaml-react/api/type_React.S.Special.html
share/doc/ocaml-react/api/type_React.S.html
share/doc/ocaml-react/api/type_React.Step.html
share/doc/ocaml-react/api/type_React.html

View File

@ -1,14 +1,16 @@
# $OpenBSD: Makefile,v 1.5 2014/08/22 22:49:07 kili Exp $
# $OpenBSD: Makefile,v 1.6 2014/08/27 08:05:17 chrisz Exp $
COMMENT = abstract engine for text edition
CATEGORIES = devel
DISTNAME = zed-1.2
GH_ACCOUNT = diml
GH_PROJECT = zed
GH_TAGNAME = 1.3
GH_COMMIT = b8da01e8a4493d2182c0379b16aa8511c6264f01
DISTNAME = ${GH_PROJECT}-${GH_TAGNAME}
PKGNAME = ocaml-${DISTNAME}
REVISION = 2
MASTER_SITES = http://forge.ocamlcore.org/frs/download.php/944/
HOMEPAGE = http://forge.ocamlcore.org/projects/zed/
HOMEPAGE = https://github.com/diml/zed/
# BSD3
PERMIT_PACKAGE_CDROM = Yes
@ -21,7 +23,9 @@ RUN_DEPENDS = lang/ocaml devel/ocaml-camomile
CONFIGURE_STYLE = oasis
post-install:
${INSTALL_DATA} ${WRKDIST}/{LICENSE,CHANGES} ${PREFIX}/share/doc/ocaml-zed/
${INSTALL_DATA} \
${WRKDIST}/{LICENSE,CHANGES.md,README.md} \
${PREFIX}/share/doc/ocaml-zed/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (zed-1.2.tar.gz) = b8dw2doSM0d+P1jd+n0EjoBe8VCApuYwNB34R1KbKds=
SIZE (zed-1.2.tar.gz) = 68672
SHA256 (zed-1.3.tar.gz) = krucN8415LGvqwGrtI2GC9tQgMQqHdG5oLbpWtzvKbs=
SIZE (zed-1.3.tar.gz) = 71713

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/19 00:10:48 avsm Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/08/27 08:05:17 chrisz Exp $
%%native%%
lib/ocaml/zed/
lib/ocaml/zed/META
@ -20,8 +20,9 @@ lib/ocaml/zed/zed_rope.mli
lib/ocaml/zed/zed_utf8.cmi
lib/ocaml/zed/zed_utf8.mli
share/doc/ocaml-zed/
share/doc/ocaml-zed/CHANGES
share/doc/ocaml-zed/CHANGES.md
share/doc/ocaml-zed/LICENSE
share/doc/ocaml-zed/README.md
share/doc/ocaml-zed/api/
share/doc/ocaml-zed/api/Zed_cursor.html
share/doc/ocaml-zed/api/Zed_edit.html

View File

@ -1,27 +1,30 @@
# $OpenBSD: Makefile,v 1.3 2014/08/22 22:49:07 kili Exp $
# $OpenBSD: Makefile,v 1.4 2014/08/27 08:05:17 chrisz Exp $
COMMENT = enhanced OCaml toplevel
DISTNAME = utop-1.5
REVISION = 1
CATEGORIES = devel
COMMENT = enhanced OCaml toplevel
CATEGORIES = devel
HOMEPAGE = https://forge.ocamlcore.org/projects/utop/
MAINTAINER = Edd Barrett <edd@openbsd.org>
V = 1.14
GH_ACCOUNT = diml
GH_PROJECT = utop
GH_TAGNAME = ${V}
GH_COMMIT = af110d2742bc01ff7a898019676fa44e515043aa
DISTNAME = ${GH_PROJECT}-$V
HOMEPAGE = https://github.com/diml/utop
MAINTAINER = Edd Barrett <edd@openbsd.org>
# 3-clause BSD
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = https://forge.ocamlcore.org/frs/download.php/1169/
CONFIGURE_STYLE = oasis
CONFIGURE_ARGS += --enable-tests
MODULES = lang/ocaml
RUN_DEPENDS = devel/ocaml-lambda-term
BUILD_DEPENDS = ${RUN_DEPENDS}
BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib lang/ocaml,-camlp4
# silence a warning
pre-build:
post-extract:
# already shipped by the OCaml package
rm ${WRKBUILD}/src/lib/errors.mli

View File

@ -1,2 +1,2 @@
SHA256 (utop-1.5.tar.gz) = WhkMXDKN9fVwURMGPQk/c9Af0gW+og/Pj9qNuXK8i9U=
SIZE (utop-1.5.tar.gz) = 96814
SHA256 (utop-1.14.tar.gz) = 86OENG3LXOoOg3KtopA0PedDdH+G6qOlE2rd3LaNuJ0=
SIZE (utop-1.14.tar.gz) = 106017