diff options
author | jaapb <jaapb> | 2013-11-01 10:32:53 +0000 |
---|---|---|
committer | jaapb <jaapb> | 2013-11-01 10:32:53 +0000 |
commit | 2817e4fce3c042803faa395b26e19997499ab4b2 (patch) | |
tree | 2130256346e9b6a1778e08c876102636cca08eec /devel/ocaml-batteries | |
parent | a2b89633b6824593cc9e28708d956764d8865437 (diff) | |
download | pkgsrc-2817e4fce3c042803faa395b26e19997499ab4b2.tar.gz |
Package update to version 2.1, including a patch to compile with
ocaml 4.01 (upcoming). Changelog is only available through git,
unfortunately.
Diffstat (limited to 'devel/ocaml-batteries')
-rw-r--r-- | devel/ocaml-batteries/Makefile | 9 | ||||
-rw-r--r-- | devel/ocaml-batteries/distinfo | 11 | ||||
-rw-r--r-- | devel/ocaml-batteries/patches/patch-Makefile | 10 | ||||
-rw-r--r-- | devel/ocaml-batteries/patches/patch-src_batUnix.mliv | 16 |
4 files changed, 34 insertions, 12 deletions
diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile index 11181b5acaa..52eb88ef7d9 100644 --- a/devel/ocaml-batteries/Makefile +++ b/devel/ocaml-batteries/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2013/07/03 10:40:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2013/11/01 10:32:53 jaapb Exp $ PKGNAME= ocaml-${DISTNAME} -DISTNAME= batteries-2.0 +DISTNAME= batteries-2.1 CATEGORIES= devel -MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1096/ +MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1218/ MAINTAINER= jaapb@NetBSD.org HOMEPAGE= http://batteries.forge.ocamlcore.org/ @@ -11,6 +11,9 @@ COMMENT= Alternative standard library for OCaml LICENSE= gnu-lgpl-v2.1 USE_TOOLS+= gmake +INSTALLATION_DIRS= lib/ocaml/site-lib + +MAKE_ENV= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" PLIST_VARS= opt .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ diff --git a/devel/ocaml-batteries/distinfo b/devel/ocaml-batteries/distinfo index 541182b5829..8971042d640 100644 --- a/devel/ocaml-batteries/distinfo +++ b/devel/ocaml-batteries/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2013/07/03 10:40:33 jaapb Exp $ +$NetBSD: distinfo,v 1.2 2013/11/01 10:32:53 jaapb Exp $ -SHA1 (batteries-2.0.tar.gz) = d173e1944490f357530a24cc1c218ceb4d87eff1 -RMD160 (batteries-2.0.tar.gz) = 71cf7e1f549931cf3d93401417ab7d5caff778ce -Size (batteries-2.0.tar.gz) = 675780 bytes -SHA1 (patch-Makefile) = 79ce183be6925ff8ffde91c78d2e4314dd1343df +SHA1 (batteries-2.1.tar.gz) = 5da23f83fe28afdeda1b2f9e95131c98023986aa +RMD160 (batteries-2.1.tar.gz) = ab9c403ecaa2e70ff122044526ec10b4f0195d2f +Size (batteries-2.1.tar.gz) = 695812 bytes +SHA1 (patch-Makefile) = 916f5bb2eeffca3830865e0a63dfdb9a48e1e40f +SHA1 (patch-src_batUnix.mliv) = 2b51dee8b91503a136f592a8f78e4c1fbf688c3c diff --git a/devel/ocaml-batteries/patches/patch-Makefile b/devel/ocaml-batteries/patches/patch-Makefile index b3c03e40b71..7f5c12bcb4a 100644 --- a/devel/ocaml-batteries/patches/patch-Makefile +++ b/devel/ocaml-batteries/patches/patch-Makefile @@ -1,13 +1,15 @@ -$NetBSD: patch-Makefile,v 1.1 2013/07/03 10:40:33 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.2 2013/11/01 10:32:53 jaapb Exp $ Install into DESTDIR ---- Makefile.orig 2013-01-03 19:39:03.000000000 +0000 +--- Makefile.orig 2013-07-18 05:02:22.000000000 +0000 +++ Makefile -@@ -88,7 +88,8 @@ man: all batteries.odocl +@@ -88,8 +88,9 @@ man: all batteries.odocl + -mkdir man ocamlfind ocamldoc -package threads.posix -sort -man -hide-warnings -d man -I _build/libs -I _build/src libs/uniclib.mli src/*.mli - install: all uninstall_packages +-install: all uninstall_packages - ocamlfind install $(NAME) $(INSTALL_FILES) \ ++install: all + ocamlfind install $(NAME) -destdir "${DESTDIR}${PREFIX}/lib/ocaml/site-lib" \ + $(INSTALL_FILES) \ -optional $(OPT_INSTALL_FILES) diff --git a/devel/ocaml-batteries/patches/patch-src_batUnix.mliv b/devel/ocaml-batteries/patches/patch-src_batUnix.mliv new file mode 100644 index 00000000000..cf24c484d78 --- /dev/null +++ b/devel/ocaml-batteries/patches/patch-src_batUnix.mliv @@ -0,0 +1,16 @@ +$NetBSD: patch-src_batUnix.mliv,v 1.1 2013/11/01 10:32:53 jaapb Exp $ + +Patch (from upstream git) to compile with ocaml 4.01 +--- src/batUnix.mliv.orig 2013-07-18 05:02:22.000000000 +0000 ++++ src/batUnix.mliv +@@ -261,6 +261,10 @@ type open_flag = Unix.open_flag = + O_SYNC/O_DSYNC) *) + ##V4## | O_SHARE_DELETE (** OCaml 4 and Windows only: allow the file to be deleted + ##V4## while still open *) ++##V4.1## | O_CLOEXEC (** Set the close-on-exec flag on the ++##V4.1## descriptor returned by {!openfile} ++##V4.1## ++##V4.1## Since OCaml 4.1 *) + (** The flags to {!Unix.openfile}. *) + + |