Fri Nov 1 10:32:53 2013 UTC ()
Package update to version 2.1, including a patch to compile with
ocaml 4.01 (upcoming). Changelog is only available through git,
unfortunately.


(jaapb)
diff -r1.1 -r1.2 pkgsrc/devel/ocaml-batteries/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/ocaml-batteries/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/ocaml-batteries/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/devel/ocaml-batteries/patches/patch-src_batUnix.mliv
cvs diff -r1.1 -r1.2 pkgsrc/devel/ocaml-batteries/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-batteries/Makefile 2013/07/03 10:40:33 1.1
+++ pkgsrc/devel/ocaml-batteries/Makefile 2013/11/01 10:32:53 1.2
@@ -1,23 +1,26 @@ @@ -1,23 +1,26 @@
1# $NetBSD: Makefile,v 1.1 2013/07/03 10:40:33 jaapb Exp $ 1# $NetBSD: Makefile,v 1.2 2013/11/01 10:32:53 jaapb Exp $
2 2
3PKGNAME= ocaml-${DISTNAME} 3PKGNAME= ocaml-${DISTNAME}
4DISTNAME= batteries-2.0 4DISTNAME= batteries-2.1
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1096/ 6MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1218/
7 7
8MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://batteries.forge.ocamlcore.org/ 9HOMEPAGE= http://batteries.forge.ocamlcore.org/
10COMMENT= Alternative standard library for OCaml 10COMMENT= Alternative standard library for OCaml
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13USE_TOOLS+= gmake 13USE_TOOLS+= gmake
 14INSTALLATION_DIRS= lib/ocaml/site-lib
 15
 16MAKE_ENV= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
14 17
15PLIST_VARS= opt 18PLIST_VARS= opt
16.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 19.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
17 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 20 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
18PLIST.opt= yes 21PLIST.opt= yes
19.endif 22.endif
20 23
21.include "../../devel/ocaml-findlib/buildlink3.mk" 24.include "../../devel/ocaml-findlib/buildlink3.mk"
22.include "../../lang/ocaml/buildlink3.mk" 25.include "../../lang/ocaml/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/ocaml-batteries/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-batteries/distinfo 2013/07/03 10:40:33 1.1
+++ pkgsrc/devel/ocaml-batteries/distinfo 2013/11/01 10:32:53 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2013/07/03 10:40:33 jaapb Exp $ 1$NetBSD: distinfo,v 1.2 2013/11/01 10:32:53 jaapb Exp $
2 2
3SHA1 (batteries-2.0.tar.gz) = d173e1944490f357530a24cc1c218ceb4d87eff1 3SHA1 (batteries-2.1.tar.gz) = 5da23f83fe28afdeda1b2f9e95131c98023986aa
4RMD160 (batteries-2.0.tar.gz) = 71cf7e1f549931cf3d93401417ab7d5caff778ce 4RMD160 (batteries-2.1.tar.gz) = ab9c403ecaa2e70ff122044526ec10b4f0195d2f
5Size (batteries-2.0.tar.gz) = 675780 bytes 5Size (batteries-2.1.tar.gz) = 695812 bytes
6SHA1 (patch-Makefile) = 79ce183be6925ff8ffde91c78d2e4314dd1343df 6SHA1 (patch-Makefile) = 916f5bb2eeffca3830865e0a63dfdb9a48e1e40f
 7SHA1 (patch-src_batUnix.mliv) = 2b51dee8b91503a136f592a8f78e4c1fbf688c3c
cvs diff -r1.1 -r1.2 pkgsrc/devel/ocaml-batteries/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-batteries/patches/patch-Makefile 2013/07/03 10:40:33 1.1
+++ pkgsrc/devel/ocaml-batteries/patches/patch-Makefile 2013/11/01 10:32:53 1.2
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-Makefile,v 1.1 2013/07/03 10:40:33 jaapb Exp $ 1$NetBSD: patch-Makefile,v 1.2 2013/11/01 10:32:53 jaapb Exp $
2 2
3Install into DESTDIR 3Install into DESTDIR
4--- Makefile.orig 2013-01-03 19:39:03.000000000 +0000 4--- Makefile.orig 2013-07-18 05:02:22.000000000 +0000
5+++ Makefile 5+++ Makefile
6@@ -88,7 +88,8 @@ man: all batteries.odocl 6@@ -88,8 +88,9 @@ man: all batteries.odocl
 7 -mkdir man
7 ocamlfind ocamldoc -package threads.posix -sort -man -hide-warnings -d man -I _build/libs -I _build/src libs/uniclib.mli src/*.mli 8 ocamlfind ocamldoc -package threads.posix -sort -man -hide-warnings -d man -I _build/libs -I _build/src libs/uniclib.mli src/*.mli
8  9
9 install: all uninstall_packages 10-install: all uninstall_packages
10- ocamlfind install $(NAME) $(INSTALL_FILES) \ 11- ocamlfind install $(NAME) $(INSTALL_FILES) \
 12+install: all
11+ ocamlfind install $(NAME) -destdir "${DESTDIR}${PREFIX}/lib/ocaml/site-lib" \ 13+ ocamlfind install $(NAME) -destdir "${DESTDIR}${PREFIX}/lib/ocaml/site-lib" \
12+ $(INSTALL_FILES) \ 14+ $(INSTALL_FILES) \
13 -optional $(OPT_INSTALL_FILES) 15 -optional $(OPT_INSTALL_FILES)
14  16
15 uninstall_packages: 17 uninstall_packages:
File Added: pkgsrc/devel/ocaml-batteries/patches/Attic/patch-src_batUnix.mliv
$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}. *)