From 50b44b65e00e45148f8a916a4814021567e247fc Mon Sep 17 00:00:00 2001 From: krw Date: Thu, 23 Jun 2016 19:23:53 +0000 Subject: [PATCH] Stop building Ocaml's internal ocamlbuild and use the ocaml-ocamlbuild port where needed. The next step towards Ocaml 4.3.0. Bulk build by sthen@ identified several laggards which are included here. ok anil@ sthen@ so final 4.3.0 polishing can be done in-tree. --- databases/ocaml-postgresql/Makefile | 6 +++--- databases/ocaml-sqlite3/Makefile | 6 +++--- devel/cudf/Makefile | 3 ++- devel/ocaml-batteries/Makefile | 5 +++-- devel/ocaml-cmdliner/Makefile | 5 +++-- devel/ocaml-dose/Makefile | 7 ++++--- devel/ocaml-jsonm/Makefile | 6 +++--- devel/ocaml-lambda-term/Makefile | 7 ++++--- devel/ocaml-lwt/Makefile | 7 ++++--- devel/ocaml-menhir/Makefile | 5 +++-- devel/ocaml-parmap/Makefile | 6 +++--- devel/ocaml-pcre/Makefile | 4 ++-- devel/ocaml-re/Makefile | 4 ++-- devel/ocaml-react/Makefile | 6 +++--- devel/ocaml-uutf/Makefile | 4 ++-- devel/ocaml-zed/Makefile | 6 ++++-- devel/ounit/Makefile | 8 +++++--- devel/utop/Makefile | 7 ++++--- lang/obc/Makefile | 5 +++-- lang/ocaml-camlp4/Makefile | 5 ++++- lang/ocaml/Makefile | 9 +++------ lang/ocaml/pkg/PFRAG.native-main | 14 +------------- lang/ocaml/pkg/PLIST-main | 13 +------------ security/ocaml-cryptokit/Makefile | 6 ++++-- sysutils/findlib/Makefile | 3 ++- sysutils/findlib/pkg/PLIST | 5 +++-- sysutils/opam/Makefile | 4 +++- textproc/hevea/Makefile | 5 ++++- textproc/ocaml-csv/Makefile | 6 ++++-- textproc/ocaml-text/Makefile | 7 ++++--- textproc/ocaml-xmlm/Makefile | 7 +++---- 31 files changed, 96 insertions(+), 95 deletions(-) diff --git a/databases/ocaml-postgresql/Makefile b/databases/ocaml-postgresql/Makefile index 2fc60d52818..fd82dda06ad 100644 --- a/databases/ocaml-postgresql/Makefile +++ b/databases/ocaml-postgresql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2016/03/29 11:27:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.26 2016/06/23 19:23:53 krw Exp $ COMMENT= Objective Caml bindings for PostgreSQL CATEGORIES= databases @@ -7,7 +7,7 @@ V= 3.2.1 NAME = ocaml-postgresql DISTNAME= postgresql-ocaml-${V} PKGNAME= ${NAME}-${V} -REVISION= 0 +REVISION= 1 MASTER_SITES= https://github.com/mmottl/postgresql-ocaml/releases/download/v${V}/ MAINTAINER= Anil Madhavapeddy @@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes MODULES= lang/ocaml WANTLIB = pq -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild LIB_DEPENDS= databases/postgresql CONFIGURE_STYLE = oasis diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile index 134d0d34223..e7990423c65 100644 --- a/databases/ocaml-sqlite3/Makefile +++ b/databases/ocaml-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2016/03/29 11:27:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.29 2016/06/23 19:23:53 krw Exp $ COMMENT= Objective Caml bindings for SQLite3 CATEGORIES= databases @@ -7,7 +7,7 @@ V= 2.0.9 NAME = ocaml-sqlite3 DISTNAME= sqlite3-ocaml-${V} PKGNAME= ${NAME}-${V} -REVISION= 0 +REVISION= 1 MASTER_SITES= https://github.com/mmottl/sqlite3-ocaml/releases/download/v${V}/ MAINTAINER= Anil Madhavapeddy @@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes MODULES= lang/ocaml WANTLIB = sqlite3 -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild CONFIGURE_STYLE = oasis CONFIGURE_ARGS += --enable-tests diff --git a/devel/cudf/Makefile b/devel/cudf/Makefile index 9f8466c1384..de09e214e2a 100644 --- a/devel/cudf/Makefile +++ b/devel/cudf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/04/27 12:36:32 jca Exp $ +# $OpenBSD: Makefile,v 1.6 2016/06/23 19:23:53 krw Exp $ MULTI_PACKAGES = -ocaml -main @@ -25,6 +25,7 @@ MODULES = lang/ocaml BUILD_DEPENDS = devel/ocaml-extlib \ lang/ocaml-camlp4 \ sysutils/findlib \ + devel/ocaml-ocamlbuild \ devel/glib2 RUN_DEPENDS = devel/ocaml-extlib TEST_DEPENDS = devel/ounit diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile index 92930cf9321..e7e21427413 100644 --- a/devel/ocaml-batteries/Makefile +++ b/devel/ocaml-batteries/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2015/08/30 15:52:33 avsm Exp $ +# $OpenBSD: Makefile,v 1.15 2016/06/23 19:23:53 krw Exp $ COMMENT = OCaml Batteries Included - OCaml foundation library CATEGORIES = devel @@ -9,6 +9,7 @@ GH_PROJECT = batteries-included GH_TAGNAME = v$V DISTNAME = ${GH_PROJECT}-$V PKGNAME = ocaml-batteries-$V +REVISION = 0 HOMEPAGE = http://batteries.forge.ocamlcore.org/ @@ -20,7 +21,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml RUN_DEPENDS = devel/ocaml-camomile -BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib +BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib devel/ocaml-ocamlbuild # ocaml-test not available yet #TEST_DEPENDS = devel/ounit devel/ocaml-qtest TEST_DEPENDS = devel/ounit diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile index 94d05deb3c1..099dada0727 100644 --- a/devel/ocaml-cmdliner/Makefile +++ b/devel/ocaml-cmdliner/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2015/08/30 15:57:25 avsm Exp $ +# $OpenBSD: Makefile,v 1.3 2016/06/23 19:23:53 krw Exp $ COMMENT = declarative definition of command line interfaces CATEGORIES = devel @@ -9,6 +9,7 @@ DISTNAME = ${NAME}-${V} EXTRACT_SUFX = .tbz PKGNAME = ocaml-${DISTNAME} MASTER_SITES = http://erratique.ch/software/${NAME}/releases/ +REVISION = 0 HOMEPAGE = http://erratique.ch/software/${NAME} @@ -18,7 +19,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild RUN_DEPENDS = lang/ocaml ALL_TARGET = ${NAME}.{cma,cmi,mli} diff --git a/devel/ocaml-dose/Makefile b/devel/ocaml-dose/Makefile index 4bec7b940d0..ea5e907c919 100644 --- a/devel/ocaml-dose/Makefile +++ b/devel/ocaml-dose/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2015/08/30 15:56:12 avsm Exp $ +# $OpenBSD: Makefile,v 1.4 2016/06/23 19:23:53 krw Exp $ COMMENT = software repository analysis in OCaml CATEGORIES = devel @@ -6,7 +6,7 @@ CATEGORIES = devel VERSION = 3.3 DISTNAME = dose3-${VERSION} PKGNAME = ocaml-dose-${VERSION} -REVISION = 0 +REVISION = 1 HOMEPAGE = http://dose.gforge.inria.fr/public_html/ @@ -28,7 +28,8 @@ BUILD_DEPENDS = sysutils/findlib \ devel/ocaml-graph \ devel/ocaml-pcre \ devel/cudf,-main \ - devel/ocaml-re + devel/ocaml-re \ + devel/ocaml-ocamlbuild FAKE_FLAGS = BINDIR=${WRKINST}/${PREFIX}/bin diff --git a/devel/ocaml-jsonm/Makefile b/devel/ocaml-jsonm/Makefile index e6c5f915bd8..bf09c12e3f4 100644 --- a/devel/ocaml-jsonm/Makefile +++ b/devel/ocaml-jsonm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2015/08/30 16:23:06 avsm Exp $ +# $OpenBSD: Makefile,v 1.3 2016/06/23 19:23:53 krw Exp $ COMMENT = non-blocking streaming JSON codec CATEGORIES = devel @@ -9,7 +9,7 @@ DISTNAME = ${NAME}-${V} EXTRACT_SUFX = .tbz PKGNAME = ocaml-${DISTNAME} MASTER_SITES = http://erratique.ch/software/${NAME}/releases/ -REVISION = 1 +REVISION = 2 HOMEPAGE = http://erratique.ch/software/${NAME} @@ -22,7 +22,7 @@ MODULES = lang/ocaml WANTLIB += c m RUN_DEPENDS = devel/ocaml-uutf -BUILD_DEPENDS = devel/ocaml-uutf +BUILD_DEPENDS = devel/ocaml-uutf devel/ocaml-ocamlbuild CONFIGURE_STYLE = oasis diff --git a/devel/ocaml-lambda-term/Makefile b/devel/ocaml-lambda-term/Makefile index 4a3af4d1e4c..e7662bd603e 100644 --- a/devel/ocaml-lambda-term/Makefile +++ b/devel/ocaml-lambda-term/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2016/03/29 11:27:01 naddy Exp $ +# $OpenBSD: Makefile,v 1.17 2016/06/23 19:23:53 krw Exp $ COMMENT = library for manipulating the terminal CATEGORIES = devel @@ -10,7 +10,7 @@ GH_PROJECT = lambda-term GH_TAGNAME = $V DISTNAME = ${GH_PROJECT}-${V} PKGNAME = ocaml-${DISTNAME} -REVISION = 0 +REVISION = 1 # BSD3 PERMIT_PACKAGE_CDROM = Yes @@ -19,7 +19,8 @@ WANTLIB = c ev m pthread charset MODULES = lang/ocaml converters/libiconv -BUILD_DEPENDS = devel/ocaml-lwt devel/ocaml-zed lang/ocaml-camlp4 +BUILD_DEPENDS = devel/ocaml-lwt devel/ocaml-zed lang/ocaml-camlp4 \ + devel/ocaml-ocamlbuild RUN_DEPENDS = devel/ocaml-lwt devel/ocaml-zed LIB_DEPENDS = devel/libev diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index b2085d48a8c..1f34384a121 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/03/29 11:27:01 naddy Exp $ +# $OpenBSD: Makefile,v 1.21 2016/06/23 19:23:53 krw Exp $ COMMENT = cooperative lightweight thread library CATEGORIES = devel @@ -6,7 +6,7 @@ CATEGORIES = devel GH_ACCOUNT = ocsigen GH_PROJECT = lwt GH_TAGNAME = 2.4.8 -REVISION = 1 +REVISION = 2 # This is not the latest upstream version, but the last one that is most # compatible due to an API change. Be careful about upgrading to lwt-2.5.0 # without checking that no in-tree ports break due to new buffer APIs. @@ -26,7 +26,8 @@ MYDEPENDS = devel/ocaml-react \ textproc/ocaml-text \ security/ocaml-ssl \ devel/ocaml-ppx-tools -BUILD_DEPENDS = ${MYDEPENDS} sysutils/findlib lang/ocaml-camlp4 +BUILD_DEPENDS = ${MYDEPENDS} sysutils/findlib lang/ocaml-camlp4 \ + devel/ocaml-ocamlbuild RUN_DEPENDS = ${MYDEPENDS} LIB_DEPENDS = devel/glib2 devel/libev diff --git a/devel/ocaml-menhir/Makefile b/devel/ocaml-menhir/Makefile index 874ce95c105..3417c5bdc29 100644 --- a/devel/ocaml-menhir/Makefile +++ b/devel/ocaml-menhir/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2016/04/25 08:17:08 daniel Exp $ +# $OpenBSD: Makefile,v 1.5 2016/06/23 19:23:53 krw Exp $ COMMENT = OCaml parser generator for LR(1) grammars DISTNAME = menhir-20160303 PKGNAME = ocaml-${DISTNAME} +REVISION = 0 MASTER_SITES = http://cristal.inria.fr/~fpottier/menhir/ @@ -16,7 +17,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml WANTLIB = c m -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild USE_GMAKE = Yes MAKE_FLAGS = docdir='${WRKINST}${PREFIX}/share/doc/ocaml-menhir' \ diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile index 9e604f6c9cf..b7185a637bf 100644 --- a/devel/ocaml-parmap/Makefile +++ b/devel/ocaml-parmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/03/29 11:27:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2016/06/23 19:23:53 krw Exp $ COMMENT = OCaml parallel map primitive for multicores CATEGORIES = devel @@ -9,7 +9,7 @@ DISTNAME = ocaml-parmap-$V DISTFILES = ${DISTNAME}{$V}.tar.gz WRKDIST = ${WRKDIR}/parmap-$V PKGNAME = ocaml-parmap-${V:S/-//} -REVISION = 0 +REVISION = 1 MASTER_SITES = https://github.com/rdicosmo/parmap/archive/ HOMEPAGE = https://github.com/rdicosmo/parmap @@ -18,7 +18,7 @@ HOMEPAGE = https://github.com/rdicosmo/parmap PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild USE_GMAKE = Yes CONFIGURE_STYLE = gnu diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile index 5d4c116c9f4..6b766bc803b 100644 --- a/devel/ocaml-pcre/Makefile +++ b/devel/ocaml-pcre/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2016/03/29 11:27:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.11 2016/06/23 19:23:53 krw Exp $ COMMENT = OCaml Perl-compatible regexp library CATEGORIES = devel textproc @@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild LIB_DEPENDS = devel/pcre WANTLIB = pcre diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile index 62d306e59f1..13b0aebc867 100644 --- a/devel/ocaml-re/Makefile +++ b/devel/ocaml-re/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/02/29 15:27:18 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2016/06/23 19:23:53 krw Exp $ COMMENT = regular expression library for OCaml CATEGORIES = devel @@ -18,7 +18,7 @@ MODULES = lang/ocaml USE_GMAKE = Yes CONFIGURE_STYLE = oasis CONFIGURE_ARGS = --enable-tests -BUILD_DEPENDS = devel/ounit +BUILD_DEPENDS = devel/ounit devel/ocaml-ocamlbuild post-install: diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile index f0882192445..565d2d2fa3e 100644 --- a/devel/ocaml-react/Makefile +++ b/devel/ocaml-react/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2015/08/30 16:23:41 avsm Exp $ +# $OpenBSD: Makefile,v 1.8 2016/06/23 19:23:53 krw Exp $ COMMENT = functional reactive programming (FRP) for OCaml CATEGORIES = devel V = 1.2.0 -REVISION = 1 +REVISION = 2 NAME = react DISTNAME = ${NAME}-${V} EXTRACT_SUFX = .tbz @@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild RUN_DEPENDS = lang/ocaml ALL_TARGET = ${NAME}.{cma,cmi,mli} diff --git a/devel/ocaml-uutf/Makefile b/devel/ocaml-uutf/Makefile index e2455166465..d368e2f3948 100644 --- a/devel/ocaml-uutf/Makefile +++ b/devel/ocaml-uutf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2015/08/30 16:04:24 avsm Exp $ +# $OpenBSD: Makefile,v 1.3 2016/06/23 19:23:53 krw Exp $ COMMENT = non-blocking streaming unicode codec CATEGORIES = devel @@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild ALL_TARGET = ${NAME}.{cma,cmi,mli} .include diff --git a/devel/ocaml-zed/Makefile b/devel/ocaml-zed/Makefile index 94fc6ca8fb0..005945c620d 100644 --- a/devel/ocaml-zed/Makefile +++ b/devel/ocaml-zed/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2015/12/29 19:49:40 jasper Exp $ +# $OpenBSD: Makefile,v 1.10 2016/06/23 19:23:53 krw Exp $ COMMENT = abstract engine for text edition CATEGORIES = devel @@ -7,6 +7,7 @@ GH_ACCOUNT = diml GH_PROJECT = zed GH_TAGNAME = 1.4 PKGNAME = ocaml-${DISTNAME} +REVISION = 0 HOMEPAGE = https://github.com/diml/zed/ @@ -15,7 +16,8 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib devel/ocaml-react devel/ocaml-camomile +BUILD_DEPENDS = sysutils/findlib devel/ocaml-react devel/ocaml-camomile \ + devel/ocaml-ocamlbuild RUN_DEPENDS = lang/ocaml devel/ocaml-camomile CONFIGURE_STYLE = oasis diff --git a/devel/ounit/Makefile b/devel/ounit/Makefile index b53a0d0dcd8..38bf3c44057 100644 --- a/devel/ounit/Makefile +++ b/devel/ounit/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2015/08/30 16:24:35 avsm Exp $ +# $OpenBSD: Makefile,v 1.11 2016/06/23 19:23:53 krw Exp $ COMMENT = unit test framework for OCaml CATEGORIES = devel DISTNAME = ounit-2.0.0 -REVISION = 1 +REVISION = 2 # The last url component (the number) changes every release, too. MASTER_SITES = http://forge.ocamlcore.org/frs/download.php/1258/ @@ -17,7 +17,9 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS += sysutils/findlib lang/ocaml-camlp4 +BUILD_DEPENDS += sysutils/findlib \ + devel/ocaml-ocamlbuild \ + lang/ocaml-camlp4 CONFIGURE_STYLE = oasis diff --git a/devel/utop/Makefile b/devel/utop/Makefile index 4ce6cbab152..98dfff65e5a 100644 --- a/devel/utop/Makefile +++ b/devel/utop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2015/08/31 11:39:47 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2016/06/23 19:23:53 krw Exp $ COMMENT = enhanced OCaml toplevel CATEGORIES = devel @@ -8,7 +8,7 @@ GH_ACCOUNT = diml GH_PROJECT = utop GH_TAGNAME = ${V} DISTNAME = ${GH_PROJECT}-$V -REVISION = 1 +REVISION = 2 MAINTAINER = Edd Barrett @@ -20,7 +20,8 @@ CONFIGURE_ARGS += --enable-tests MODULES = lang/ocaml RUN_DEPENDS = devel/ocaml-lambda-term -BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib lang/ocaml-camlp4 +BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib lang/ocaml-camlp4 \ + devel/ocaml-ocamlbuild # silence a warning post-extract: diff --git a/lang/obc/Makefile b/lang/obc/Makefile index d097c1444cb..1dc11e4a7e8 100644 --- a/lang/obc/Makefile +++ b/lang/obc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2016/03/18 23:12:18 naddy Exp $ +# $OpenBSD: Makefile,v 1.8 2016/06/23 19:23:53 krw Exp $ # Fatal error: assertion sizeof(page_index) == GC_PAGESIZE failed on line 1110 of file gc.c ONLY_FOR_ARCHS= i386 @@ -32,7 +32,8 @@ WANTLIB += xcb-render xcb-shm xml2 z LIB_DEPENDS = x11/gtksourceview BUILD_DEPENDS = ${RUN_DEPENDS} \ - ${MODTCL_BUILD_DEPENDS} + ${MODTCL_BUILD_DEPENDS} \ + devel/ocaml-ocamlbuild RUN_DEPENDS = STEM->=2.14.2p1:x11/lablgtk2 USE_GMAKE = Yes diff --git a/lang/ocaml-camlp4/Makefile b/lang/ocaml-camlp4/Makefile index e19940b8fb0..aea37a69441 100644 --- a/lang/ocaml-camlp4/Makefile +++ b/lang/ocaml-camlp4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2015/12/29 19:49:40 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2016/06/23 19:23:54 krw Exp $ COMMENT = OCaml Preprocessor and Pretty-Printer CATEGORIES = lang @@ -9,6 +9,7 @@ GH_PROJECT = camlp4 GH_TAGNAME = ${V} WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/+/-/} PKGNAME = ocaml-${DISTNAME} +REVISION = 0 # No dynlink compatibility between releases PKGSPEC = ocaml-camlp4-=${V} @@ -27,6 +28,8 @@ USE_GMAKE = Yes CONFIGURE_STYLE = simple +BUILD_DEPENDS = devel/ocaml-ocamlbuild + MAKE_ENV = DESTDIR=${WRKINST} ALL_TARGET = byte diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 36890ac7f96..10c42a91d13 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.72 2016/04/11 11:21:31 jca Exp $ +# $OpenBSD: Makefile,v 1.73 2016/06/23 19:23:54 krw Exp $ MULTI_PACKAGES = -graphics -main @@ -9,7 +9,7 @@ COMMENT-graphics = OCaml Graphics library providing basic drawing primitives # Do check that the ports that depend on it still work, or repair them. # Don't forget to bump version in ocaml.port.mk, too! VERSION=4.02.3 -REVISION= 1 +REVISION= 2 PKGNAME-main = ocaml-${VERSION} PKGNAME-graphics = ocaml-graphics-${VERSION} @@ -32,7 +32,7 @@ MAINTAINER= Anil Madhavapeddy PERMIT_PACKAGE_CDROM= Yes CONFIGURE_STYLE= simple dest -CONFIGURE_ARGS+=-prefix ${PREFIX} +CONFIGURE_ARGS+=-prefix ${PREFIX} -no-ocamlbuild CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}' CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib CONFIGURE_ENV+=OPENBSD_LOCALBASE="${LOCALBASE}" @@ -70,9 +70,6 @@ post-install: ${PREFIX}/share/doc/ocaml/html @${INSTALL_DATA} ${WRKDIR}/htmlman/libref/* \ ${PREFIX}/share/doc/ocaml/html/libref - ${INSTALL_DATA} \ - ${WRKSRC}/ocamlbuild/man/ocamlbuild.1 \ - ${PREFIX}/man/man1/ @${INSTALL_DATA} \ ${WRKSRC}/{LICENSE,Changes} \ ${PREFIX}/share/doc/ocaml diff --git a/lang/ocaml/pkg/PFRAG.native-main b/lang/ocaml/pkg/PFRAG.native-main index 09360f1b4bc..eb0bc36546b 100644 --- a/lang/ocaml/pkg/PFRAG.native-main +++ b/lang/ocaml/pkg/PFRAG.native-main @@ -1,6 +1,5 @@ -@comment $OpenBSD: PFRAG.native-main,v 1.4 2015/08/30 15:38:32 avsm Exp $ +@comment $OpenBSD: PFRAG.native-main,v 1.5 2016/06/23 19:23:54 krw Exp $ %%dynlink%% -@bin bin/ocamlbuild.native @bin bin/ocamlc.opt @bin bin/ocamldep.opt @bin bin/ocamldoc.opt @@ -138,17 +137,6 @@ lib/ocaml/nums.a lib/ocaml/nums.cmxa lib/ocaml/obj.cmx lib/ocaml/obj.p.cmx -lib/ocaml/ocamlbuild/ocamlbuild.cmx -lib/ocaml/ocamlbuild/ocamlbuild.o -lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx -lib/ocaml/ocamlbuild/ocamlbuild_executor.o -lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx -lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx -lib/ocaml/ocamlbuild/ocamlbuild_plugin.o -lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx -lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o -lib/ocaml/ocamlbuild/ocamlbuildlib.a -lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa lib/ocaml/ocamldoc/odoc_info.a lib/ocaml/ocamldoc/odoc_info.cmxa lib/ocaml/oo.cmx diff --git a/lang/ocaml/pkg/PLIST-main b/lang/ocaml/pkg/PLIST-main index 85f4c079795..f54d7777e9c 100644 --- a/lang/ocaml/pkg/PLIST-main +++ b/lang/ocaml/pkg/PLIST-main @@ -1,8 +1,6 @@ -@comment $OpenBSD: PLIST-main,v 1.7 2016/03/29 11:27:00 naddy Exp $ +@comment $OpenBSD: PLIST-main,v 1.8 2016/06/23 19:23:54 krw Exp $ %%native%% @bin bin/ocaml -@bin bin/ocamlbuild -@bin bin/ocamlbuild.byte @bin bin/ocamlc @bin bin/ocamlcp @bin bin/ocamldebug @@ -486,13 +484,6 @@ lib/ocaml/obj.cmti lib/ocaml/obj.ml lib/ocaml/obj.mli @bin lib/ocaml/objinfo_helper -lib/ocaml/ocamlbuild/ -lib/ocaml/ocamlbuild/ocamlbuild.cmo -lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi -lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi -lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi -lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi -lib/ocaml/ocamlbuild/ocamlbuildlib.cma lib/ocaml/ocamldoc/ lib/ocaml/ocamldoc/custom/ lib/ocaml/ocamldoc/ocamldoc.hva @@ -681,7 +672,6 @@ lib/ocaml/weak.cmti lib/ocaml/weak.ml lib/ocaml/weak.mli @man man/man1/ocaml.1 -@man man/man1/ocamlbuild.1 @man man/man1/ocamlc.1 @man man/man1/ocamlc.opt.1 @man man/man1/ocamlcp.1 @@ -1098,7 +1088,6 @@ share/doc/ocaml/html/names.html share/doc/ocaml/html/native.html share/doc/ocaml/html/next_motif.gif share/doc/ocaml/html/objectexamples.html -share/doc/ocaml/html/ocamlbuild.html share/doc/ocaml/html/ocamldoc.html share/doc/ocaml/html/patterns.html share/doc/ocaml/html/previous_motif.gif diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile index 50437eeb63e..20b9946aff0 100644 --- a/security/ocaml-cryptokit/Makefile +++ b/security/ocaml-cryptokit/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/29 11:27:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2016/06/23 19:23:54 krw Exp $ COMMENT= cryptographic framework for the Objective-ML language CATEGORIES= security DISTNAME= cryptokit-1.10 PKGNAME= ocaml-${DISTNAME} -REVISION= 0 +REVISION= 1 MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1493/ MAINTAINER= Anil Madhavapeddy @@ -20,6 +20,8 @@ MODULES= lang/ocaml CONFIGURE_STYLE = oasis +BUILD_DEPENDS = devel/ocaml-ocamlbuild + post-build: cp -R ${WRKDIST}/api-cryptokit.docdir ${WRKDIST}/cryptokit.mli diff --git a/sysutils/findlib/Makefile b/sysutils/findlib/Makefile index 2b03a7979ca..6a3f108e349 100644 --- a/sysutils/findlib/Makefile +++ b/sysutils/findlib/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.31 2015/08/30 15:43:47 avsm Exp $ +# $OpenBSD: Makefile,v 1.32 2016/06/23 19:23:54 krw Exp $ COMMENT= OCaml package manager CATEGORIES= sysutils DISTNAME= findlib-1.5.5 +REVISION= 1 MASTER_SITES= http://download.camlcity.org/download/ diff --git a/sysutils/findlib/pkg/PLIST b/sysutils/findlib/pkg/PLIST index 4ee86b10065..63d3b991f80 100644 --- a/sysutils/findlib/pkg/PLIST +++ b/sysutils/findlib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2015/08/30 15:43:47 avsm Exp $ +@comment $OpenBSD: PLIST,v 1.15 2016/06/23 19:23:54 krw Exp $ %%native%% @bin bin/ocamlfind @bin bin/safe_camlp4 @@ -35,7 +35,8 @@ lib/ocaml/num-top/num_top.cma lib/ocaml/num-top/num_top.cmi lib/ocaml/num-top/num_top_printers.cmi lib/ocaml/num/META -lib/ocaml/ocamlbuild/META +@comment will be installed by devel/ocaml-ocamlbuild +@comment lib/ocaml/ocamlbuild/META lib/ocaml/stdlib/ lib/ocaml/stdlib/META lib/ocaml/str/ diff --git a/sysutils/opam/Makefile b/sysutils/opam/Makefile index 4bd95f33f2a..cb14db71312 100644 --- a/sysutils/opam/Makefile +++ b/sysutils/opam/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2015/08/31 12:14:12 avsm Exp $ +# $OpenBSD: Makefile,v 1.7 2016/06/23 19:23:54 krw Exp $ MULTI_PACKAGES = -main -lib @@ -12,6 +12,7 @@ GH_ACCOUNT = ocaml GH_PROJECT = opam GH_TAGNAME = ${V} DISTNAME = ${GH_PROJECT}-${V} +REVISION = 0 PKGNAME-main = opam-${V} PKGNAME-lib = opam-lib-${V} @@ -28,6 +29,7 @@ WANTLIB-main = c m MODULES = lang/ocaml BUILD_DEPENDS = devel/git \ sysutils/findlib \ + devel/ocaml-ocamlbuild \ devel/cudf,-ocaml \ devel/ocaml-cmdliner \ devel/ocaml-dose \ diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile index 7f9e99eddff..5b50950516c 100644 --- a/textproc/hevea/Makefile +++ b/textproc/hevea/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2015/04/25 08:14:35 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2016/06/23 19:23:54 krw Exp $ COMMENT= LaTeX to html translator @@ -9,6 +9,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB= c m DISTNAME = hevea-2.23 +REVISION = 0 MASTER_SITES = http://para.inria.fr/~maranget/hevea/distri/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-manual${EXTRACT_SUFX} @@ -20,6 +21,8 @@ NO_TEST = Yes MODULES += lang/ocaml +BUILD_DEPENDS = devel/ocaml-ocamlbuild + .include .if ${PROPERTIES:Mocaml_native} MAKE_FLAGS += TARGET=opt diff --git a/textproc/ocaml-csv/Makefile b/textproc/ocaml-csv/Makefile index 37f1986034e..5fa981cc7d5 100644 --- a/textproc/ocaml-csv/Makefile +++ b/textproc/ocaml-csv/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2016/01/17 17:29:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2016/06/23 19:23:54 krw Exp $ COMMENT= pure OCaml library to read/write CSV files DISTNAME= csv-1.4.1 -REVISION= 0 +REVISION= 1 PKGNAME= ocaml-${DISTNAME} CATEGORIES= textproc @@ -21,4 +21,6 @@ MODULES= lang/ocaml CONFIGURE_STYLE= oasis +BUILD_DEPENDS= devel/ocaml-ocamlbuild + .include diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile index ed57b397bb4..814a36ac470 100644 --- a/textproc/ocaml-text/Makefile +++ b/textproc/ocaml-text/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/29 11:27:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2016/06/23 19:23:54 krw Exp $ COMMENT = library for dealing with unicode text CATEGORIES = devel textproc NAME = ocaml-text DISTNAME = ${NAME}-0.6 -REVISION = 3 +REVISION = 4 MASTER_SITES = https://forge.ocamlcore.org/frs/download.php/937/ HOMEPAGE = http://ocaml-text.forge.ocamlcore.org/ @@ -18,7 +18,8 @@ MODULES = converters/libiconv \ lang/ocaml RUN_DEPENDS = lang/ocaml devel/ocaml-pcre -BUILD_DEPENDS = sysutils/findlib devel/ocaml-pcre lang/ocaml-camlp4 +BUILD_DEPENDS = sysutils/findlib devel/ocaml-pcre lang/ocaml-camlp4 \ + devel/ocaml-ocamlbuild # patch-setup_ml BUILD_DEPENDS +=devel/gmake diff --git a/textproc/ocaml-xmlm/Makefile b/textproc/ocaml-xmlm/Makefile index a88cc42d82c..1caee3bf74c 100644 --- a/textproc/ocaml-xmlm/Makefile +++ b/textproc/ocaml-xmlm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2015/08/30 16:33:02 avsm Exp $ +# $OpenBSD: Makefile,v 1.7 2016/06/23 19:23:54 krw Exp $ COMMENT = streaming XML input/output for OCaml CATEGORIES = textproc @@ -6,6 +6,7 @@ CATEGORIES = textproc V = 1.2.0 NAME = xmlm DISTNAME = ${NAME}-${V} +REVISION = 0 PKGNAME = ocaml-${DISTNAME} EXTRACT_SUFX = .tbz MASTER_SITES = http://erratique.ch/software/xmlm/releases/ @@ -19,9 +20,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml WANTLIB = c m -BUILD_DEPENDS = sysutils/findlib - -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib devel/ocaml-ocamlbuild ALL_TARGET = ${NAME}.{cma,cmi,mli} INSTALL_TARGET = ${ALL_TARGET} ${NAME}.cmt