From 806608122f9cc88ac1a0bb84f37a4196dad8d2c5 Mon Sep 17 00:00:00 2001
From: tonio <tonio@pkgsrc.org>
Date: Mon, 7 Sep 2009 21:48:13 +0000
Subject: Update lang/ocaml to 3.11.1 [PR pkg/41695]

(Changes that can break existing programs are marked with a "*"  )
Language features:
- Addition of lazy patterns: "lazy <pat>" matches suspensions whose values,
  after forcing, match the pattern <pat>.
- Introduction of private abbreviation types "type t = private <type-expr>",
  for abstracting the actual manifest type in type abbreviations.
- Subtyping is now allowed between a private abbreviation and its definition,
  and between a polymorphic method and its monomorphic instance.

Compilers:
- The file name for a compilation unit should correspond to a valid
  identifier (Otherwise dynamic linking and other things can fail, and
  a warning is emitted.)
* Revised -output-obj: the output name must now be provided; its
  extension must be one of .o/.obj, .so/.dll, or .c for the
  bytecode compiler. The compilers can now produce a shared library
  (with all the needed -ccopts/-ccobjs options) directly.
- -dtypes renamed to -annot, records (in .annot files) which function calls
  are tail calls.
- All compiler error messages now include a file name and location, for
  better interaction with Emacs' compilation mode.
- Optimized compilation of "lazy e" when the argument "e" is
  already evaluated.
- Optimized compilation of equality tests with a variant constant constructor.
- The -dllib options recorded in libraries are no longer ignored when
  -use_runtime or -use_prims is used (unless -no_auto_link is
  explicitly used).
- Check that at most one of -pack, -a, -shared, -c, -output-obj is
  given on the command line.
- Optimized compilation of private types as regular manifest types
  (e.g. abbreviation to float, float array or record types with only
   float fields).

Native-code compiler:
- New port: Mac OS X / Intel in 64-bit mode (configure with -cc "gcc -m64").
- A new option "-shared" to produce a plugin that can be dynamically
  loaded with the native version of Dynlink.
- A new option "-nodynlink" to enable optimizations valid only for code
  that is never dynlinked (no-op except for AMD64).
- More aggressive unboxing of floats and boxed integers.
- Can select which assembler and asm options to use at configuration time.

Run-time system:
- New implementation of the page table describing the heap (two-level
  array in 32 bits, sparse hashtable in 64 bits), fixes issues with address
  space randomization on 64-bit OS (PR#4448).
- New "generational" API for registering global memory roots with the GC,
  enables faster scanning of global roots.
  (The functions are caml_*_generational_global_root in <caml/memory.h>.)
- New function "caml_raise_with_args" to raise an exception with several
  arguments from C.
- Changes in implementation of dynamic linking of C code:
  under Win32, use Alain Frisch's flexdll implementation of the dlopen
  API; under MacOSX, use dlopen API instead of MacOSX bundle API.
- Programs may now choose a first-fit allocation policy instead of
  the default next-fit.  First-fit reduces fragmentation but is
  slightly slower in some cases.

Standard library:
- Parsing library: new function "set_trace" to programmatically turn
  on or off the printing of a trace during parsing.
- Printexc library: new functions "print_backtrace" and "get_backtrace"
  to obtain a stack backtrace of the most recently raised exception.
  New function "record_backtrace" to turn the exception backtrace mechanism
  on or off from within a program.
- Scanf library: fine-tuning of meta format implementation;
  fscanf behaviour revisited: only one input buffer is allocated for any
  given input channel;
  the %n conversion does not count a lookahead character as read.

Other libraries:
- Dynlink: on some platforms, the Dynlink library is now available in
  native code. The boolean Dynlink.is_native allows the program to
  know whether it has been compiled in bytecode or in native code.
- Bigarrays: added "unsafe_get" and "unsafe_set"
  (non-bound-checking versions of "get" and "set").
- Bigarrays: removed limitation "array dimension < 2^31".
- Labltk: added support for TK 8.5.
- Num: added conversions between big_int and int32, nativeint, int64.
  More efficient implementation of Num.quo_num and Num.mod_num.
- Threads: improved efficiency of mutex and condition variable operations;
  improved interaction with Unix.fork (PR#4577).
- Unix: added getsockopt_error returning type Unix.error.
  Added support for TCP_NODELAY and IPV6_ONLY socket options.
- Win32 Unix: "select" now supports all kinds of file descriptors.
  Improved emulation of "lockf" (PR#4609).

Tools:
- ocamldebug now supported under Windows (MSVC and Mingw ports),
  but without the replay feature.  (Contributed by Dmitry Bely
  and Sylvain Le Gall at OCamlCore with support from Lexifi.)
- ocamldoc: new option -no-module-constraint-filter to include functions
  hidden by signature constraint in documentation.
- ocamlmklib and ocamldep.opt now available under Windows ports.
- ocamlmklib no longer supports the -implib option.
- ocamlnat: an experimental native toplevel (not built by default).

Camlp4:
* programs linked with camlp4lib.cma now also need dynlink.cma.
---
 lang/ocaml/Makefile.common  |  9 +++----
 lang/ocaml/PLIST            |  9 +++----
 lang/ocaml/PLIST.opt        | 15 +++++++++---
 lang/ocaml/PLIST.prof       |  3 ++-
 lang/ocaml/distinfo         | 52 ++++++++++++++++++++---------------------
 lang/ocaml/patches/patch-aj | 42 +++++++++++++--------------------
 lang/ocaml/patches/patch-at | 51 +++++++++++++++++++++-------------------
 lang/ocaml/patches/patch-au |  6 ++---
 lang/ocaml/patches/patch-ax | 38 ++++++++----------------------
 lang/ocaml/patches/patch-ay | 50 +++++++++++++++++++--------------------
 lang/ocaml/patches/patch-az | 18 +++++++++-----
 lang/ocaml/patches/patch-ba | 57 +++++++++++++++++----------------------------
 lang/ocaml/patches/patch-bb | 10 ++++----
 lang/ocaml/patches/patch-bc | 19 +++++++--------
 lang/ocaml/patches/patch-bd |  8 +++----
 lang/ocaml/patches/patch-be | 16 ++++++-------
 lang/ocaml/patches/patch-bf | 16 ++++++-------
 lang/ocaml/patches/patch-bg | 17 +++++++-------
 lang/ocaml/patches/patch-bh | 21 ++++++++---------
 lang/ocaml/patches/patch-bi | 38 +++++++++++++++++++-----------
 lang/ocaml/patches/patch-bk | 26 ++++++++++-----------
 lang/ocaml/patches/patch-bq | 38 +++++++-----------------------
 lang/ocaml/patches/patch-br | 17 ++++----------
 lang/ocaml/patches/patch-bs | 32 ++++++++++++-------------
 lang/ocaml/patches/patch-bt | 28 +++++++++++-----------
 lang/ocaml/patches/patch-bu |  6 ++---
 26 files changed, 296 insertions(+), 346 deletions(-)

(limited to 'lang/ocaml')

diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 08acf460fe1..4ba0df8a5c0 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile.common,v 1.22 2008/12/22 20:04:07 joerg Exp $
+# $NetBSD: Makefile.common,v 1.23 2009/09/07 21:48:13 tonio Exp $
 
-DISTNAME=	ocaml-3.10.2
+DISTNAME=	ocaml-3.11.1
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-3.10/
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-3.11/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://caml.inria.fr/ocaml/
 COMMENT=	The latest implementation of the Caml dialect of ML
 
-DISTINFO_FILE=		${.CURDIR}/../../lang/ocaml/distinfo
-PATCHDIR=		${.CURDIR}/../../lang/ocaml/patches
-
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		BDB_LIBS=${BDB_LIBS:Q}
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index 207a99d6699..3c561f27478 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:34:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/09/07 21:48:13 tonio Exp $
 bin/camlp4
 bin/camlp4boot
 bin/camlp4o
@@ -64,6 +64,9 @@ lib/ocaml/caml/signals.h
 lib/ocaml/caml/unixsupport.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
+lib/ocaml/camlinternalLazy.cmi
+lib/ocaml/camlinternalLazy.ml
+lib/ocaml/camlinternalLazy.mli
 lib/ocaml/camlinternalMod.cmi
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
@@ -95,9 +98,6 @@ lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o
 lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi
 lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo
 lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o
-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmi
-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmo
-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.o
 lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi
 lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo
 lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o
@@ -448,6 +448,7 @@ man/man3/Bigarray.Array3.3o
 man/man3/Bigarray.Genarray.3o
 man/man3/Buffer.3o
 man/man3/Callback.3o
+man/man3/CamlinternalLazy.3o
 man/man3/CamlinternalMod.3o
 man/man3/CamlinternalOO.3o
 man/man3/Char.3o
diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
index 2c4ff526745..07b9a464114 100644
--- a/lang/ocaml/PLIST.opt
+++ b/lang/ocaml/PLIST.opt
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.14 2008/01/23 20:42:25 adam Exp $
+@comment $NetBSD: PLIST.opt,v 1.15 2009/09/07 21:48:13 tonio Exp $
 bin/camlp4o.opt
 bin/camlp4of.opt
 bin/camlp4oof.opt
@@ -20,8 +20,10 @@ lib/ocaml/big_int.cmx
 lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cmx
 lib/ocaml/bigarray.cmxa
+lib/ocaml/bigarray.cmxs
 lib/ocaml/buffer.cmx
 lib/ocaml/callback.cmx
+lib/ocaml/camlinternalLazy.cmx
 lib/ocaml/camlinternalMod.cmx
 lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlp4/Camlp4Bin.cmx
@@ -32,7 +34,6 @@ lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx
 lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx
 lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx
 lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx
-lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmx
 lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx
 lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx
 lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx
@@ -64,7 +65,11 @@ lib/ocaml/complex.cmx
 lib/ocaml/dbm.a
 lib/ocaml/dbm.cmx
 lib/ocaml/dbm.cmxa
+lib/ocaml/dbm.cmxs
 lib/ocaml/digest.cmx
+lib/ocaml/dynlink.a
+lib/ocaml/dynlink.cmx
+lib/ocaml/dynlink.cmxa
 lib/ocaml/filename.cmx
 lib/ocaml/format.cmx
 lib/ocaml/gc.cmx
@@ -77,6 +82,7 @@ lib/ocaml/lazy.cmx
 lib/ocaml/lexing.cmx
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
+lib/ocaml/libcamlrun_shared.so
 lib/ocaml/libthreadsnat.a
 lib/ocaml/list.cmx
 lib/ocaml/listLabels.cmx
@@ -88,6 +94,7 @@ lib/ocaml/nativeint.cmx
 lib/ocaml/num.cmx
 lib/ocaml/nums.a
 lib/ocaml/nums.cmxa
+lib/ocaml/nums.cmxs
 lib/ocaml/obj.cmx
 lib/ocaml/ocamlbuild/ocamlbuild.cmx
 lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
@@ -95,7 +102,7 @@ lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
 lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
 lib/ocaml/ocamldoc/odoc_info.a
 lib/ocaml/ocamldoc/odoc_info.cmxa
-lib/ocaml/ocamldoc/odoc_opt.cmi
+@comment lib/ocaml/ocamldoc/odoc_opt.cmi
 lib/ocaml/oo.cmx
 lib/ocaml/parsing.cmx
 lib/ocaml/pervasives.cmx
@@ -120,6 +127,7 @@ lib/ocaml/stdlib.p.cmxa
 lib/ocaml/str.a
 lib/ocaml/str.cmx
 lib/ocaml/str.cmxa
+lib/ocaml/str.cmxs
 lib/ocaml/stream.cmx
 lib/ocaml/string.cmx
 lib/ocaml/stringLabels.cmx
@@ -134,5 +142,6 @@ lib/ocaml/threads/threads.cmxa
 lib/ocaml/unix.a
 lib/ocaml/unix.cmx
 lib/ocaml/unix.cmxa
+lib/ocaml/unix.cmxs
 lib/ocaml/unixLabels.cmx
 lib/ocaml/weak.cmx
diff --git a/lang/ocaml/PLIST.prof b/lang/ocaml/PLIST.prof
index 8d2c930d836..0b7f1736e9e 100644
--- a/lang/ocaml/PLIST.prof
+++ b/lang/ocaml/PLIST.prof
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST.prof,v 1.5 2006/04/04 14:33:27 jlam Exp $
+@comment $NetBSD: PLIST.prof,v 1.6 2009/09/07 21:48:13 tonio Exp $
 lib/ocaml/arg.p.cmx
 lib/ocaml/array.p.cmx
 lib/ocaml/arrayLabels.p.cmx
 lib/ocaml/buffer.p.cmx
 lib/ocaml/callback.p.cmx
+lib/ocaml/camlinternalLazy.p.cmx
 lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/char.p.cmx
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 6a798087be3..a3d7924c645 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,40 +1,38 @@
-$NetBSD: distinfo,v 1.44 2009/01/22 01:00:33 he Exp $
+$NetBSD: distinfo,v 1.45 2009/09/07 21:48:13 tonio Exp $
 
-SHA1 (ocaml-3.10.2.tar.bz2) = f604580bf2943891d8faf265eeb900bbe90abce0
-RMD160 (ocaml-3.10.2.tar.bz2) = f631230b090dbd9bf9a9f71631cd0347c033cbb1
-Size (ocaml-3.10.2.tar.bz2) = 2284860 bytes
+SHA1 (ocaml-3.11.1.tar.bz2) = 570feab47b34b29f866ecadcc16153d5a4a4f6a1
+RMD160 (ocaml-3.11.1.tar.bz2) = 991147354a85b975a86ce2dffafce669c9338db5
+Size (ocaml-3.11.1.tar.bz2) = 2352236 bytes
 SHA1 (patch-aa) = 858f326fe4db7971a05b3b001c6aecc02ecb2903
 SHA1 (patch-ab) = c6140f43fdb76c4f2d499f9d3beb714de3926460
 SHA1 (patch-ac) = efe8290b394f40d6675fc9d57557c49ddafdb239
 SHA1 (patch-ad) = f2c1dcc3c31db31e2484fdea1076692a63252a87
 SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
-SHA1 (patch-aj) = 61b977596cbaf8e16a66bfdbe8a7ca1701073fa7
+SHA1 (patch-aj) = f25a82ce98080c1b5514d7a9f026aea0da54821f
 SHA1 (patch-an) = 7a56338a19015b407cbfa8a328655e2bd035f8bf
-SHA1 (patch-at) = 44621cbca344a77ab8c0ffe418bc465ab6970380
-SHA1 (patch-au) = 2696bc59b08a0ef06157b77665588bcf26feb306
+SHA1 (patch-at) = 8dd2e86e4ea3fb4e7269a7f47e39d313f4f7ecba
+SHA1 (patch-au) = 1e36bcdf39d40e781273ea51df213db05ff46c89
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
 SHA1 (patch-aw) = 5838ca13ba0f5d9328b9bb2135604f72e7d8b87b
-SHA1 (patch-ax) = 2419dffbf548837dc61e137032e06d33b1059976
-SHA1 (patch-ay) = ae0fcda810e61967f879f4f18cb17de291f7834b
-SHA1 (patch-az) = 4870ed5960559a90aaaa5e2e881b546e6a5898ad
-SHA1 (patch-ba) = cff1d4e1942908f83fc55823f5c7d2105e11eea7
-SHA1 (patch-bb) = d60cca088fa92cf15a4d46d53dd42ed84f851f9c
-SHA1 (patch-bc) = 4aa365ca555e01955c7787588a4effeacca7b8b0
-SHA1 (patch-bd) = 2ab20ead8779de1f2eb77d3504e89d182f39a63d
-SHA1 (patch-be) = 292080cdd459f56c1749b54bf8507f3aacdbd334
-SHA1 (patch-bf) = e38ad77f37c451b2887bb4b5849128644b673249
-SHA1 (patch-bg) = 760ab3521c7cc9cc573799f6d499e926502354c2
-SHA1 (patch-bh) = 2f14629fa692aec79a280ed0f350fcf20076eecf
-SHA1 (patch-bi) = fc2901a49279b35de3d0cd95f08f1942fa98ced8
-SHA1 (patch-bk) = ed30ca7afe04ff89c7a5ef8384d37c4f68e9efe7
-SHA1 (patch-bm) = e6d982368536708bd0d67da979d783fd92bf138d
-SHA1 (patch-bn) = 53611048a7153af0425d0e859294b29b007c3902
+SHA1 (patch-ax) = d46667e6874aa8aa656f6fb15ddcedc493d7bdf1
+SHA1 (patch-ay) = 702dd7d24ac94851bbb0f2c3f22e2141345ee8ea
+SHA1 (patch-az) = 1aa4bfe207eb4348987612576f30490bee2376ff
+SHA1 (patch-ba) = cec240f6d6bf7f22e78e5d945221a41ad10bfb4a
+SHA1 (patch-bb) = 50bd9aa5b46052d8f35c04f6e4c3cbb365d2f93c
+SHA1 (patch-bc) = 7be374dd1503e3f7aab94ab72a6f0d97ea04f113
+SHA1 (patch-bd) = 226fd916ee68db9165e15e462bbf38d3d6bac8a6
+SHA1 (patch-be) = 6c7232154b4935b9b4606940fd35799e20fafde2
+SHA1 (patch-bf) = 0b4efd564362b816154bfd7ffacecae27c75c0ee
+SHA1 (patch-bg) = 91cb75e2d7f347b9ef7f3f1814d0c7deccfedd3a
+SHA1 (patch-bh) = eac23a1bfb0f50b5aff781c227c3c4e7449b67d5
+SHA1 (patch-bi) = aaf8fcb6ecde980cb914258efe93bd37ec9f0bf4
+SHA1 (patch-bk) = 733ad5463a1775a6e64d106c56bb311e92ac842e
 SHA1 (patch-bo) = 322c322336d44a0d9c0bd8f1582d56ff873bd7e4
 SHA1 (patch-bp) = 45038c5900aefdb8d21b8c3d3b8798b45014bae2
-SHA1 (patch-bq) = f1e5e0c417a237ec972a33a3b5e0a2e37620036b
-SHA1 (patch-br) = c26f18532d3756188eb9c79bf9a301e50a0ce84b
-SHA1 (patch-bs) = 8554ef37cdeac1998978adc74a9c709a84cccb92
-SHA1 (patch-bt) = a1b9034f3034712bbedab51aed430285ca02ee5e
-SHA1 (patch-bu) = df80c076248e1ad1ab6eae195bda724ea354a55e
+SHA1 (patch-bq) = 2ac3b7c1cdf9bdf1e6dcd5905e54291169d069c6
+SHA1 (patch-br) = f9dacbd8742a9cdc9ae0232f297898f0df62a95b
+SHA1 (patch-bs) = c23258399923794a24ae365e6120256cbc439dd6
+SHA1 (patch-bt) = 58e733154df2194dc45558a90adc387c6cbca87b
+SHA1 (patch-bu) = 0b3bbe273142ebed3a24e7e92d4cfd9f30a032b6
 SHA1 (patch-bv) = 595641bb079174f393e420bdf5c48fe8ca1912cf
diff --git a/lang/ocaml/patches/patch-aj b/lang/ocaml/patches/patch-aj
index 8c627355885..ce21f873b40 100644
--- a/lang/ocaml/patches/patch-aj
+++ b/lang/ocaml/patches/patch-aj
@@ -1,32 +1,22 @@
-$NetBSD: patch-aj,v 1.6 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-aj,v 1.7 2009/09/07 21:48:13 tonio Exp $
 
---- byterun/Makefile.orig	2005-11-29 12:57:49.000000000 +0100
-+++ byterun/Makefile
-@@ -16,7 +16,7 @@
- include ../config/Makefile
+--- byterun/Makefile.orig	2009-05-25 14:25:25.000000000 +0200
++++ byterun/Makefile	2009-06-09 10:51:23.000000000 +0200
+@@ -15,7 +15,7 @@
  
- CC=$(BYTECC)
--CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS)
-+CFLAGS+=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS)
+ include Makefile.common
+ 
+-CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR)
++CFLAGS+=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS) $(IFLEXDIR)
  DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS)
  
- OBJS=interp.o misc.o stacks.o fix_code.o startup.o main.o \
-@@ -48,14 +48,14 @@ ocamlrund$(EXE): libcamlrund.a prims.o
- 	          prims.o libcamlrund.a $(BYTECCLIBS)
+ OBJS=$(COMMONOBJS) unix.o main.o
+@@ -48,7 +48,7 @@
  
- install:
--	cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
--	cp libcamlrun.a $(LIBDIR)/libcamlrun.a
-+	${BSD_INSTALL_PROGRAM} ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
-+	${BSD_INSTALL_DATA} libcamlrun.a $(LIBDIR)/libcamlrun.a
- 	cd $(LIBDIR); $(RANLIB) libcamlrun.a
--	if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
-+	if test -d $(LIBDIR)/caml; then : ; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/caml; fi
- 	for i in $(PUBLIC_INCLUDES); do \
-           sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \
-         done
--	cp ld.conf $(LIBDIR)/ld.conf
-+	${BSD_INSTALL_DATA} ld.conf $(LIBDIR)/ld.conf
+ install::
+ 	if test -f libcamlrun_shared.so; then \
+-	  cp libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi
++	${BSD_INSTALL_PROGRAM} libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi
  
- ld.conf: ../config/Makefile
- 	echo "$(STUBLIBDIR)" >ld.conf
+ clean::
+ 	rm -f libcamlrun_shared.so
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index 859526daf5f..c36246e2f59 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,17 +1,17 @@
-$NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
+$NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $
 
---- configure.orig	2008-01-04 14:26:38.000000000 +0100
-+++ configure	2008-01-29 02:03:30.000000000 +0100
-@@ -488,7 +488,7 @@ mksharedlibrpath=''
- 
- if test $withsharedlibs = "yes"; then
-   case "$host" in
--    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-gnu*)
-+    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly*)
+--- configure.orig	2009-05-19 15:23:47.000000000 +0200
++++ configure	2009-05-21 10:54:30.000000000 +0200
+@@ -516,7 +516,7 @@
+       mksharedlib="$flexlink"
+       mkmaindll="$flexlink -maindll"
+       shared_libraries_supported=true;;
+-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
++    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly)
+       cmxs="cmxs"
        sharedcccompopts="-fPIC"
-       mksharedlib="$bytecc -shared -o"
-       bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -572,16 +572,18 @@ case "$host" in
+       mksharedlib="$bytecc -shared"
+@@ -615,12 +615,13 @@
    alpha*-*-netbsd*)             arch=alpha; system=netbsd;;
    alpha*-*-openbsd*)            arch=alpha; system=openbsd;;
    sparc*-*-sunos4.*)            arch=sparc; system=sunos;;
@@ -24,22 +24,25 @@ $NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
    i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
 +  i[3456]86-*-dragonfly*)       arch=i386; system=bsd_`sh ./runtest elf.c`;;
    i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
-   i[3456]86-*-solaris*)         arch=i386; system=solaris;;
+   i[3456]86-*-solaris*)         if $arch64; then
+                                   arch=amd64; system=solaris
+@@ -629,6 +630,7 @@
+                                 fi;;
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
 +  i[3456]86-*-interix3*)        arch=i386; system=interix3;;
-   i[3456]86-*-darwin*)          arch=i386; system=macosx;;
-   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
-   mips-*-irix6*)                arch=mips; system=irix;;
-@@ -604,6 +606,7 @@ case "$host" in
+   i[3456]86-*-darwin*)          if $arch64; then
+                                   arch=amd64; system=macosx
+                                 else
+@@ -655,6 +657,7 @@
    x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
    x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
    x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
 +  x86_64-*-solaris*)            arch=amd64; system=solaris;;
+   x86_64-*-darwin9.5)           arch=amd64; system=macosx;;
  esac
  
- # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -691,6 +694,7 @@ case "$arch,$model,$system" in
+@@ -756,6 +759,7 @@
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
    amd64,*,gnu) profiling='prof';;
@@ -47,7 +50,7 @@ $NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
    *) profiling='noprof';;
  esac
  
-@@ -1081,6 +1085,8 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1144,6 +1148,8 @@
                     pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
      *-*-freebsd*)  pthread_link="-pthread"
                     pthread_caml_link="-cclib -pthread";;
@@ -56,7 +59,7 @@ $NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
      *-*-openbsd*)  pthread_link="-pthread"
                     pthread_caml_link="-cclib -pthread";;
      *)             pthread_link="-lpthread"
-@@ -1132,6 +1138,7 @@ fi
+@@ -1195,6 +1201,7 @@
  x11_include="not found"
  x11_link="not found"
  
@@ -64,7 +67,7 @@ $NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
  for dir in \
      $x11_include_dir          \
                                \
-@@ -1178,6 +1185,7 @@ do
+@@ -1241,6 +1248,7 @@
      break
    fi
  done
@@ -72,7 +75,7 @@ $NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
-@@ -1269,31 +1277,8 @@ dbm_include="not found"
+@@ -1335,31 +1343,8 @@
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -106,7 +109,7 @@ $NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
  if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
    echo "NDBM not found, the \"dbm\" library will not be supported."
  else
-@@ -1303,8 +1288,8 @@ else
+@@ -1369,8 +1354,8 @@
    else
      dbm_include="-I$dbm_include"
    fi
diff --git a/lang/ocaml/patches/patch-au b/lang/ocaml/patches/patch-au
index a1b657d5fe6..63c8ecbfb75 100644
--- a/lang/ocaml/patches/patch-au
+++ b/lang/ocaml/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.3 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-au,v 1.4 2009/09/07 21:48:13 tonio Exp $
 
---- debugger/Makefile.orig	2006-12-09 14:49:10.000000000 +0100
-+++ debugger/Makefile
+--- debugger/Makefile.shared.orig	2008-07-29 10:31:41.000000000 +0200
++++ debugger/Makefile.shared
 @@ -83,7 +83,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS)
  	$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS)
  
diff --git a/lang/ocaml/patches/patch-ax b/lang/ocaml/patches/patch-ax
index 464d6659902..7e899b95e10 100644
--- a/lang/ocaml/patches/patch-ax
+++ b/lang/ocaml/patches/patch-ax
@@ -1,31 +1,13 @@
-$NetBSD: patch-ax,v 1.3 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-ax,v 1.4 2009/09/07 21:48:13 tonio Exp $
 
---- otherlibs/bigarray/Makefile.orig	2005-10-19 13:56:24.000000000 +0200
-+++ otherlibs/bigarray/Makefile
-@@ -16,7 +16,7 @@
- include ../../config/Makefile
+--- otherlibs/Makefile.orig	2007-11-08 10:17:47.000000000 +0100
++++ otherlibs/Makefile
+@@ -17,7 +17,7 @@
  
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh -I ../unix
- CAMLOPT=../../ocamlcompopt.sh -I ../unix
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-@@ -41,13 +41,13 @@ bigarray.cmxa: $(CAML_OBJS:.cmo=.cmx)
-           $(CAML_OBJS:.cmo=.cmx)
+ CAMLC=$(ROOTDIR)/ocamlcomp.sh
+ CAMLOPT=$(ROOTDIR)/ocamlcompopt.sh
+-CFLAGS=-I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
++CFLAGS+=-I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
  
- install:
--	if test -f dllbigarray.so; then cp dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi
--	cp bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR)
-+	if test -f dllbigarray.so; then ${BSD_INSTALL_DATA} dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi
-+	${BSD_INSTALL_DATA} bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) libbigarray.a
--	cp bigarray.h $(LIBDIR)/caml/bigarray.h
-+	${BSD_INSTALL_DATA} bigarray.h $(LIBDIR)/caml/bigarray.h
- 
- installopt:
--	cp bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR)
-+	${BSD_INSTALL_DATA} bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) bigarray.a
- 
- partialclean:
+ include ../Makefile.shared
+ # Note .. is the current directory (this makefile is included from
diff --git a/lang/ocaml/patches/patch-ay b/lang/ocaml/patches/patch-ay
index 5026a190c87..0ddf3e2feee 100644
--- a/lang/ocaml/patches/patch-ay
+++ b/lang/ocaml/patches/patch-ay
@@ -1,31 +1,29 @@
-$NetBSD: patch-ay,v 1.2 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-ay,v 1.3 2009/09/07 21:48:13 tonio Exp $
 
---- otherlibs/dbm/Makefile.orig	2002-06-27 11:36:01.000000000 +0000
-+++ otherlibs/dbm/Makefile
-@@ -24,7 +24,7 @@ CAMLOPT=../../ocamlcompopt.sh
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
- COMPFLAGS=-warn-error A
+--- ./otherlibs/Makefile.shared.orig	2008-07-15 17:31:32.000000000 +0200
++++ ./otherlibs/Makefile.shared
+@@ -58,16 +58,18 @@ lib$(CLIBNAME).$(A): $(COBJS)
  
--CFLAGS=$(DBM_INCLUDES) -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+CFLAGS+=$(DBM_INCLUDES) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- COBJS=cldbm.o
- 
- all: libmldbm.a dbm.cmi dbm.cma
-@@ -47,13 +47,13 @@ clean: partialclean
- 	rm -f *.a *.o *.so
- 
- install:
--	if test -f dllmldbm.so; then cp dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi
--	cp libmldbm.a $(LIBDIR)/libmldbm.a
-+	if test -f dllmldbm.so; then ${BSD_INSTALL_DATA} dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi
-+	${BSD_INSTALL_DATA} libmldbm.a $(LIBDIR)/libmldbm.a
- 	cd $(LIBDIR); $(RANLIB) libmldbm.a
--	cp dbm.cma dbm.cmi dbm.mli $(LIBDIR)
-+	${BSD_INSTALL_DATA} dbm.cma dbm.cmi dbm.mli $(LIBDIR)
+ install::
+ 	if test -f dll$(CLIBNAME)$(EXT_DLL); then \
+-	  cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
+-	cp lib$(CLIBNAME).$(A) $(LIBDIR)/
++	  ${BSD_INSTALL_DATA} dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
++	${BSD_INSTALL_DATA} lib$(CLIBNAME).$(A) $(LIBDIR)/
+ 	cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
+-	cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/
+-	if test -n "$(HEADERS)"; then cp $(HEADERS) $(LIBDIR)/caml/; fi
++	${BSD_INSTALL_DATA} $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/
++	if test -n "$(HEADERS)"; then \
++          ${BSD_INSTALL_DATA} $(HEADERS) $(LIBDIR)/caml/; fi
  
  installopt:
--	cp dbm.cmx dbm.cmxa dbm.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} dbm.cmx dbm.cmxa dbm.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) dbm.a
+-	cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/
++	${BSD_INSTALL_DATA} $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/
+ 	cd $(LIBDIR); $(RANLIB) $(LIBNAME).a
+-	if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(LIBDIR)/; fi
++	if test -f $(LIBNAME).cmxs; then \
++          ${BSD_INSTALL_DATA} $(LIBNAME).cmxs $(LIBDIR)/; fi
  
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
+ partialclean:
+ 	rm -f *.cm*
diff --git a/lang/ocaml/patches/patch-az b/lang/ocaml/patches/patch-az
index ae0c667e05f..58ef2adc437 100644
--- a/lang/ocaml/patches/patch-az
+++ b/lang/ocaml/patches/patch-az
@@ -1,13 +1,19 @@
-$NetBSD: patch-az,v 1.2 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-az,v 1.3 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/dynlink/Makefile.orig	2006-09-19 14:41:33.000000000 +0200
-+++ otherlibs/dynlink/Makefile
-@@ -53,7 +53,7 @@ extract_crc: dynlink.cma extract_crc.cmo
+--- otherlibs/dynlink/Makefile.orig	2008-04-16 08:50:31.000000000 +0200
++++ otherlibs/dynlink/Makefile	2009-05-21 11:09:19.000000000 +0200
+@@ -66,11 +66,11 @@
  	$(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo
  
  install:
--	cp dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR)
-+	${BSD_INSTALL_DATA} dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR)
+-	cp dynlink.cmi dynlink.cma dynlink.mli $(LIBDIR)
+-	cp extract_crc $(LIBDIR)/extract_crc$(EXE)
++	${BSD_INSTALL_DATA} dynlink.cmi dynlink.cma dynlink.mli $(LIBDIR)
++	${BSD_INSTALL_SCRIPT} extract_crc $(LIBDIR)/extract_crc$(EXE)
  
  installopt:
+-	cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR)
++	${BSD_INSTALL_DATA} $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) dynlink.$(A)
  
+ partialclean:
diff --git a/lang/ocaml/patches/patch-ba b/lang/ocaml/patches/patch-ba
index c088eea37c3..5355e36376e 100644
--- a/lang/ocaml/patches/patch-ba
+++ b/lang/ocaml/patches/patch-ba
@@ -1,37 +1,22 @@
-$NetBSD: patch-ba,v 1.5 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-ba,v 1.6 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/graph/Makefile.orig	2007-01-29 13:11:16.000000000 +0100
-+++ otherlibs/graph/Makefile
-@@ -18,10 +18,10 @@
- include ../../config/Makefile
- 
- CC=$(BYTECC)
--CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
--CAMLC=../../ocamlcomp.sh
--CAMLOPT=../../ocamlcompopt.sh
--MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-+CFLAGS=-I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+CAMLC=${PREFIX}/bin/ocamlc
-+CAMLOPT=${PREFIX}/bin/ocamlopt
-+MKLIB=${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlmklib
- COMPFLAGS=-warn-error A -g
- 
- OBJS=open.o draw.o fill.o color.o text.o \
-@@ -50,13 +50,13 @@ clean: partialclean
- 	rm -f *.a *.so *.o
- 
- install:
--	if test -f dllgraphics.so; then cp dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi
--	cp libgraphics.a $(LIBDIR)/libgraphics.a
-+	if test -f dllgraphics.so; then ${BSD_INSTALL_DATA} dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi
-+	${BSD_INSTALL_DATA} libgraphics.a $(LIBDIR)/libgraphics.a
- 	cd $(LIBDIR); $(RANLIB) libgraphics.a
--	cp graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR)
-+	${BSD_INSTALL_DATA} graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR)
- 
- installopt:
--	cp graphics.cmx graphics.cmxa graphics.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} graphics.cmxa graphics.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) graphics.a
- 
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
+--- otherlibs/unix/socketaddr.c.orig	2005-03-24 18:20:53.000000000 +0100
++++ otherlibs/unix/socketaddr.c	2009-05-31 14:23:50.000000000 +0200
+@@ -80,7 +80,7 @@
+       adr->s_inet6.sin6_family = AF_INET6;
+       adr->s_inet6.sin6_addr = GET_INET6_ADDR(Field(mladr, 0));
+       adr->s_inet6.sin6_port = htons(Int_val(Field(mladr, 1)));
+-      *adr_len = sizeof(struct sockaddr_in6);
++      adr->s_gen.sa_len = *adr_len = sizeof(struct sockaddr_in6);
+       break;
+     }
+ #endif
+@@ -88,7 +88,7 @@
+     adr->s_inet.sin_family = AF_INET;
+     adr->s_inet.sin_addr = GET_INET_ADDR(Field(mladr, 0));
+     adr->s_inet.sin_port = htons(Int_val(Field(mladr, 1)));
+-    *adr_len = sizeof(struct sockaddr_in);
++    adr->s_gen.sa_len = *adr_len = sizeof(struct sockaddr_in);
+     break;
+   }
+ }
diff --git a/lang/ocaml/patches/patch-bb b/lang/ocaml/patches/patch-bb
index 28eff88efaa..48caff876dc 100644
--- a/lang/ocaml/patches/patch-bb
+++ b/lang/ocaml/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2004/04/22 09:18:41 tron Exp $
+$NetBSD: patch-bb,v 1.2 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/browser/Makefile.orig	Mon Aug 12 07:31:21 2002
-+++ otherlibs/labltk/browser/Makefile	Thu Apr 22 10:34:37 2004
-@@ -47,7 +47,7 @@
+--- otherlibs/labltk/browser/Makefile.shared.orig	2009-05-21 11:08:07.000000000 +0200
++++ otherlibs/labltk/browser/Makefile.shared	2009-05-21 11:07:29.000000000 +0200
+@@ -49,7 +49,7 @@
  
  install:
  	if test -f ocamlbrowser$(EXE); then : ; \
@@ -10,4 +10,4 @@ $NetBSD: patch-bb,v 1.1 2004/04/22 09:18:41 tron Exp $
 +	  ${BSD_INSTALL_SCRIPT} ocamlbrowser$(EXE) $(BINDIR); fi
  
  clean:
- 	rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig
+ 	rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig *.$(O)
diff --git a/lang/ocaml/patches/patch-bc b/lang/ocaml/patches/patch-bc
index 93a828a6285..73197566381 100644
--- a/lang/ocaml/patches/patch-bc
+++ b/lang/ocaml/patches/patch-bc
@@ -1,23 +1,22 @@
-$NetBSD: patch-bc,v 1.1 2004/04/22 09:18:41 tron Exp $
+$NetBSD: patch-bc,v 1.2 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/camltk/Makefile.orig	Fri Apr 26 15:57:38 2002
-+++ otherlibs/labltk/camltk/Makefile	Thu Apr 22 10:34:37 2004
-@@ -21,14 +21,12 @@
+--- otherlibs/labltk/camltk/Makefile.orig	2007-12-12 15:09:45.000000000 +0100
++++ otherlibs/labltk/camltk/Makefile	2009-05-21 11:13:08.000000000 +0200
+@@ -19,13 +19,13 @@
  	$(MAKE) -f Makefile.gen clean
  
- install: $(CAMLTKOBJS)
+ install:
 -	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
 -	cp $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmi
 +	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
++	${BSD_ISNTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
+ 	chmod 644 $(INSTALLDIR)/*.cmi
  
- installopt: $(CAMLTKOBJSX)
+ installopt:
 -	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
 -	cp $(CAMLTKOBJSX) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmx
 +	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
 +	${BSD_INSTALL_DATA} $(CAMLTKOBJSX) $(INSTALLDIR)
+ 	chmod 644 $(INSTALLDIR)/*.cmx
  
  .SUFFIXES :
- .SUFFIXES : .mli .ml .cmi .cmx .cmo .mlp
diff --git a/lang/ocaml/patches/patch-bd b/lang/ocaml/patches/patch-bd
index 4a1ec067a13..fcf42b67c45 100644
--- a/lang/ocaml/patches/patch-bd
+++ b/lang/ocaml/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.1 2004/04/22 09:18:42 tron Exp $
+$NetBSD: patch-bd,v 1.2 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/compiler/Makefile.orig	Fri Apr 26 14:15:45 2002
-+++ otherlibs/labltk/compiler/Makefile	Thu Apr 22 10:34:37 2004
-@@ -45,8 +45,8 @@
+--- ./otherlibs/labltk/compiler/Makefile.orig	2002-04-26 14:15:45.000000000 +0200
++++ ./otherlibs/labltk/compiler/Makefile
+@@ -45,8 +45,8 @@ scratch :
  	rm -f *.cm*  pplex.ml ppyac.ml ppyac.mli pp$(EXE)
  
  install: 
diff --git a/lang/ocaml/patches/patch-be b/lang/ocaml/patches/patch-be
index e14cb6142d5..ba282a4ffc1 100644
--- a/lang/ocaml/patches/patch-be
+++ b/lang/ocaml/patches/patch-be
@@ -1,17 +1,17 @@
-$NetBSD: patch-be,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-be,v 1.3 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/frx/Makefile.orig	2002-04-26 13:16:00.000000000 +0100
-+++ otherlibs/labltk/frx/Makefile	2004-10-12 22:25:37.000000000 +0100
+--- otherlibs/labltk/frx/Makefile.orig	2007-12-12 15:09:45.000000000 +0100
++++ otherlibs/labltk/frx/Makefile	2009-05-21 11:14:12.000000000 +0200
 @@ -20,10 +20,10 @@
  	$(CAMLOPTLIBR) -o frxlib.cmxa $(OBJSX)
  
- install: frxlib.cma
+ install:
 -	cp *.cmi *.mli frxlib.cma $(INSTALLDIR)
 +	${BSD_INSTALL_DATA} *.cmi *.mli frxlib.cma $(INSTALLDIR)
  
- installopt: frxlib.cmxa
--	cp frxlib.cmxa frxlib.a $(INSTALLDIR)
-+	${BSD_INSTALL_DATA} frxlib.cmxa frxlib.a $(INSTALLDIR)
+ installopt:
+-	cp frxlib.cmxa frxlib.$(A) $(INSTALLDIR)
++	${BSD_INSTALL_DATA} frxlib.cmxa frxlib.$(A) $(INSTALLDIR)
  
  clean:
- 	rm -f *.cm* *.o *.a
+ 	rm -f *.cm* *.$(O) *.$(A)
diff --git a/lang/ocaml/patches/patch-bf b/lang/ocaml/patches/patch-bf
index 943ee8abd38..18ce1fe0a1b 100644
--- a/lang/ocaml/patches/patch-bf
+++ b/lang/ocaml/patches/patch-bf
@@ -1,17 +1,17 @@
-$NetBSD: patch-bf,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-bf,v 1.3 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/jpf/Makefile.orig	2002-04-26 13:16:11.000000000 +0100
-+++ otherlibs/labltk/jpf/Makefile	2004-10-12 22:23:05.000000000 +0100
+--- otherlibs/labltk/jpf/Makefile.orig	2007-12-12 15:09:45.000000000 +0100
++++ otherlibs/labltk/jpf/Makefile	2009-05-21 11:14:53.000000000 +0200
 @@ -21,10 +21,10 @@
  	$(CAMLOPTLIBR) -o jpflib.cmxa $(OBJSX)
  
- install: jpflib.cma
+ install:
 -	cp $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR)
 +	${BSD_INSTALL_DATA} $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR)
  
- installopt: jpflib.cmxa
--	cp jpflib.cmxa jpflib.a $(OBJS:.cmo=.cmx) $(INSTALLDIR)
-+	${BSD_INSTALL_DATA} jpflib.cmxa jpflib.a $(OBJS:.cmo=.cmx) $(INSTALLDIR)
+ installopt:
+-	cp jpflib.cmxa jpflib.$(A) $(OBJS:.cmo=.cmx) $(INSTALLDIR)
++	${BSD_INSTALL_DATA} jpflib.cmxa jpflib.$(A) $(OBJS:.cmo=.cmx) $(INSTALLDIR)
  
  clean:
- 	rm -f *.cm* *.o *.a *~ *test
+ 	rm -f *.cm* *.$(O) *.$(A) *~ *test
diff --git a/lang/ocaml/patches/patch-bg b/lang/ocaml/patches/patch-bg
index a446c3c30ca..a04c62a96e4 100644
--- a/lang/ocaml/patches/patch-bg
+++ b/lang/ocaml/patches/patch-bg
@@ -1,23 +1,22 @@
-$NetBSD: patch-bg,v 1.1 2004/04/22 09:18:42 tron Exp $
+$NetBSD: patch-bg,v 1.2 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/labltk/Makefile.orig	Fri Apr 26 15:57:39 2002
-+++ otherlibs/labltk/labltk/Makefile	Thu Apr 22 10:34:37 2004
-@@ -16,14 +16,12 @@
+--- otherlibs/labltk/labltk/Makefile.orig	2007-12-12 15:09:45.000000000 +0100
++++ otherlibs/labltk/labltk/Makefile	2009-05-21 11:16:27.000000000 +0200
+@@ -16,13 +16,13 @@
  labltkobjsx: $(LABLTKOBJSX)
  
- install: $(LABLTKOBJS)
+ install:
 -	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
 -	cp $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmi
 +	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
 +	${BSD_INSTALL_DATA} $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
+ 	chmod 644 $(INSTALLDIR)/*.cmi
  
- installopt: $(LABLTKOBJSX)
+ installopt:
 -	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
 -	cp $(LABLTKOBJSX) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmx
 +	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
 +	${BSD_INSTALL_DATA} $(LABLTKOBJSX) $(INSTALLDIR)
+ 	chmod 644 $(INSTALLDIR)/*.cmx
  
  clean:
- 	$(MAKE) -f Makefile.gen clean
diff --git a/lang/ocaml/patches/patch-bh b/lang/ocaml/patches/patch-bh
index b32dbf812ae..469cd60cac0 100644
--- a/lang/ocaml/patches/patch-bh
+++ b/lang/ocaml/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.2 2005/12/22 14:37:17 joerg Exp $
+$NetBSD: patch-bh,v 1.3 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/lib/Makefile.orig	Fri Aug  9 02:46:30 2002
-+++ otherlibs/labltk/lib/Makefile	Thu Apr 22 10:34:37 2004
-@@ -58,17 +58,13 @@
+--- otherlibs/labltk/lib/Makefile.orig	2009-04-30 16:24:53.000000000 +0200
++++ otherlibs/labltk/lib/Makefile	2009-05-21 11:18:47.000000000 +0200
+@@ -58,17 +58,12 @@
  	@echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) $$*' >> $@
  
  install:
@@ -14,16 +14,15 @@ $NetBSD: patch-bh,v 1.2 2005/12/22 14:37:17 joerg Exp $
 -	cp $(LIBNAME) $(BINDIR)
 -	chmod 755 $(BINDIR)/$(LIBNAME)
 +	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(LIBNAME).cma $(INSTALLDIR)
-+	${BSD_INSTALL_SCRIPT} $(LIBNAME)top$(EXE) $(INSTALLDIR)
-+	@if test -d $(BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(BINDIR); fi
++	${BSD_INSTALL_DATA} $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR)
++	@if test -d $(BINDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(BINDIR); fi
 +	${BSD_INSTALL_SCRIPT} $(LIBNAME) $(BINDIR)
  
  installopt:
 -	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR)
+-	cp $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALLDIR)
 +	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR)
- 	cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).a
++	${BSD_INSTALL_DATA} $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALLDIR)
+ 	cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A)
 -	chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa
--	chmod 644 $(INSTALLDIR)/$(LIBNAME).a
+-	chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A)
diff --git a/lang/ocaml/patches/patch-bi b/lang/ocaml/patches/patch-bi
index 9c4dd08e3fa..8464baadb04 100644
--- a/lang/ocaml/patches/patch-bi
+++ b/lang/ocaml/patches/patch-bi
@@ -1,20 +1,30 @@
-$NetBSD: patch-bi,v 1.2 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-bi,v 1.3 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/support/Makefile.orig	2004-10-18 09:01:42.000000000 +0200
-+++ otherlibs/labltk/support/Makefile
-@@ -24,12 +24,11 @@ PUBMLI=fileevent.mli protocol.mli textva
+--- otherlibs/labltk/support/Makefile.orig	2008-04-22 09:38:07.000000000 +0200
++++ otherlibs/labltk/support/Makefile	2009-05-21 11:21:02.000000000 +0200
+@@ -25,19 +25,17 @@
  PUB= $(PUBMLI) $(PUBMLI:.mli=.cmi) tkthread.mli tkthread.cmi tkthread.cmo
  
- install: lib$(LIBNAME).a $(PUB)
+ install:
 -	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(PUB) lib$(LIBNAME).a $(INSTALLDIR)
+-	cp $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR)
 +	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(PUB) lib$(LIBNAME).a $(INSTALLDIR)
- 	cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).a
--	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).a
- 	if test -f dll$(LIBNAME).so; then \
--	   cp dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi
-+	   ${BSD_INSTALL_DATA} dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi
++	${BSD_INSTALL_DATA} $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR)
+ 	cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).$(A)
+-	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).$(A)
+ 	if test -f dll$(LIBNAME)$(EXT_DLL); then \
+-	   cp dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
++	   ${BSD_INSTALL_DATA} dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
  
- installopt: opt
- 	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+ installopt:
+-	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(PUBMLI:.mli=.cmx) $(INSTALLDIR)
++	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(PUBMLI:.mli=.cmx) $(INSTALLDIR)
+ 	if test -f tkthread.$(O); then \
+-	  cp tkthread.cmx tkthread.$(O) $(INSTALLDIR); \
+-	  chmod 644 $(INSTALLDIR)/tkthread.cmx $(INSTALLDIR)/tkthread.$(O); \
++	  ${BSD_INSTALL_DATA} tkthread.cmx tkthread.$(O) $(INSTALLDIR); \
+ 	fi
+ 
+ clean:
diff --git a/lang/ocaml/patches/patch-bk b/lang/ocaml/patches/patch-bk
index 15a157dee63..461c10b94e1 100644
--- a/lang/ocaml/patches/patch-bk
+++ b/lang/ocaml/patches/patch-bk
@@ -1,21 +1,21 @@
-$NetBSD: patch-bk,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-bk,v 1.3 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/labltk/tkanim/Makefile.orig	2003-04-28 08:49:10.000000000 +0100
-+++ otherlibs/labltk/tkanim/Makefile	2004-10-12 18:26:13.000000000 +0100
-@@ -56,13 +56,13 @@
+--- otherlibs/labltk/tkanim/Makefile.orig	2009-04-30 16:24:53.000000000 +0200
++++ otherlibs/labltk/tkanim/Makefile	2009-05-21 11:22:11.000000000 +0200
+@@ -57,13 +57,13 @@
  
  
- install: tkanim.cma 
--	cp tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR)
-+	${BSD_INSTALL_DATA} tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR)
- 	if [ -f dlltkanim.so ]; then \
--		cp dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \
-+		${BSD_INSTALL_DATA} dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \
+ install:
+-	cp tkanim.cma *.cmi *.mli libtkanim.$(A) $(INSTALLDIR)
++	${BSD_INSTALL_DATA} tkanim.cma *.cmi *.mli libtkanim.$(A) $(INSTALLDIR)
+ 	if [ -f dlltkanim$(EXT_DLL) ]; then \
+-		cp dlltkanim$(EXT_DLL) $(STUBLIBDIR)/; \
++		${BSD_INSTALL_DATA} dlltkanim$(EXT_DLL) $(STUBLIBDIR)/; \
  	fi
  
- installopt: tkanim.cmxa
--	cp tkanim.cmxa tkanim.a $(INSTALLDIR)
-+	${BSD_INSTALL_DATA} tkanim.cmxa tkanim.a $(INSTALLDIR)
+ installopt:
+-	cp tkanim.cmxa tkanim.$(A) $(INSTALLDIR)
++	${BSD_INSTALL_DATA} tkanim.cmxa tkanim.$(A) $(INSTALLDIR)
  
  depend: tkanim.ml
  	$(CAMLDEP) *.mli *.ml > .depend
diff --git a/lang/ocaml/patches/patch-bq b/lang/ocaml/patches/patch-bq
index 6460a157a57..c542d11c913 100644
--- a/lang/ocaml/patches/patch-bq
+++ b/lang/ocaml/patches/patch-bq
@@ -1,33 +1,13 @@
-$NetBSD: patch-bq,v 1.3 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-bq,v 1.4 2009/09/07 21:48:14 tonio Exp $
 
---- otherlibs/unix/Makefile.orig	2007-02-07 16:49:11.000000000 +0100
-+++ otherlibs/unix/Makefile
-@@ -19,7 +19,7 @@ include ../../config/Makefile
- 
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh
- CAMLOPT=../../ocamlcompopt.sh
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-@@ -66,14 +66,14 @@ clean: partialclean
- 	rm -f *.a *.o *.so
+--- stdlib/Makefile.shared.orig	2008-08-01 18:57:10.000000000 +0200
++++ stdlib/Makefile.shared
+@@ -41,7 +41,7 @@ OTHERS=array.cmo list.cmo char.cmo strin
+ all: stdlib.cma std_exit.cmo camlheader camlheader_ur
  
  install:
--	if test -f dllunix.so; then cp dllunix.so $(STUBLIBDIR)/dllunix.so; fi
--	cp libunix.a $(LIBDIR)/libunix.a
-+	if test -f dllunix.so; then ${BSD_INSTALL_DATA} dllunix.so $(STUBLIBDIR)/dllunix.so; fi
-+	${BSD_INSTALL_DATA} libunix.a $(LIBDIR)/libunix.a
- 	cd $(LIBDIR); $(RANLIB) libunix.a
--	cp unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
--	cp unixsupport.h $(LIBDIR)/caml
-+	${BSD_INSTALL_DATA} unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
-+	${BSD_INSTALL_DATA} unixsupport.h $(LIBDIR)/caml
- 
- installopt:
--	cp $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) unix.a
+-	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
++	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
  
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
+ stdlib.cma: $(OBJS)
+ 	$(CAMLC) -a -o stdlib.cma $(OBJS)
diff --git a/lang/ocaml/patches/patch-br b/lang/ocaml/patches/patch-br
index d82a6cde169..1ebf5180fa3 100644
--- a/lang/ocaml/patches/patch-br
+++ b/lang/ocaml/patches/patch-br
@@ -1,15 +1,8 @@
-$NetBSD: patch-br,v 1.3 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-br,v 1.4 2009/09/07 21:48:14 tonio Exp $
 
---- stdlib/Makefile.orig	2004-11-29 15:53:30.000000000 +0100
+--- stdlib/Makefile.orig	2008-07-24 07:18:31.000000000 +0200
 +++ stdlib/Makefile
-@@ -48,13 +48,13 @@ allopt-prof: stdlib.p.cmxa std_exit.p.cm
- 	rm -f std_exit.p.cmi
- 
- install:
--	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
-+	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
-            $(LIBDIR)
- 
+@@ -25,7 +25,7 @@ allopt-prof: stdlib.p.cmxa std_exit.p.cm
  installopt: installopt-default installopt-$(PROFILING)
  
  installopt-default:
@@ -18,7 +11,7 @@ $NetBSD: patch-br,v 1.3 2006/01/16 09:41:48 adam Exp $
  	cd $(LIBDIR); $(RANLIB) stdlib.a
  
  installopt-noprof:
-@@ -65,7 +65,7 @@ installopt-noprof:
+@@ -36,7 +36,7 @@ installopt-noprof:
  	rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
  
  installopt-prof:
@@ -26,4 +19,4 @@ $NetBSD: patch-br,v 1.3 2006/01/16 09:41:48 adam Exp $
 +	${BSD_INSTALL_DATA} stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR)
  	cd $(LIBDIR); $(RANLIB) stdlib.p.a
  
- stdlib.cma: $(OBJS)
+ stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
diff --git a/lang/ocaml/patches/patch-bs b/lang/ocaml/patches/patch-bs
index 9df022fa35c..038fb11dcf1 100644
--- a/lang/ocaml/patches/patch-bs
+++ b/lang/ocaml/patches/patch-bs
@@ -1,8 +1,8 @@
-$NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-bs,v 1.6 2009/09/07 21:48:14 tonio Exp $
 
---- tools/Makefile.orig	2007-02-07 11:31:36.000000000 +0100
-+++ tools/Makefile
-@@ -49,9 +49,9 @@ clean::
+--- tools/Makefile.shared.orig	2007-11-22 23:14:43.000000000 +0100
++++ tools/Makefile.shared
+@@ -51,9 +51,9 @@ clean::
  	rm -f ocamldep.opt
  
  install::
@@ -14,7 +14,7 @@ $NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
  
  # The profiler
  
-@@ -67,9 +67,9 @@ ocamlcp: ocamlcp.cmo
+@@ -69,15 +69,15 @@ ocamlcp: ocamlcp.cmo
  	$(CAMLC) $(LINKFLAGS) -o ocamlcp main_args.cmo ocamlcp.cmo
  
  install::
@@ -27,12 +27,10 @@ $NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
  
  clean::
  	rm -f ocamlprof ocamlcp
-@@ -81,7 +81,7 @@ ocamlmktop: ocamlmktop.tpl ../config/Mak
- 	chmod +x ocamlmktop
  
  install::
--	cp ocamlmktop $(BINDIR)/ocamlmktop
-+	${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop
+-	cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
++	${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
  
  clean::
  	rm -f ocamlmktop
@@ -40,21 +38,21 @@ $NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
  	cp ../myocamlbuild_config.ml .
  
  install::
--	cp ocamlmklib $(BINDIR)/ocamlmklib
-+	${BSD_INSTALL_SCRIPT} ocamlmklib $(BINDIR)/ocamlmklib
+-	cp ocamlmklib $(BINDIR)/ocamlmklib$(EXE)
++	${BSD_INSTALL_SCRIPT} ocamlmklib $(BINDIR)/ocamlmklib$(EXE)
  
  clean::
  	rm -f ocamlmklib
-@@ -146,7 +146,7 @@ lexer301.ml: lexer301.mll
- 	$(CAMLLEX) lexer301.mll
+@@ -121,7 +121,7 @@ clean::
+ # To make custom toplevels (see Makefile/Makefile.nt)
  
  install::
--	cp scrapelabels $(LIBDIR)
-+	${BSD_INSTALL_DATA} scrapelabels $(LIBDIR)
+-	cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
++	${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
  
  clean::
- 	rm -f scrapelabels lexer301.ml
-@@ -162,7 +162,7 @@ addlabels: addlabels.ml
+ 	rm -f ocamlmktop
+@@ -171,7 +171,7 @@ addlabels: addlabels.ml
  		$(ADDLABELS_IMPORTS) addlabels.ml
  
  install::
diff --git a/lang/ocaml/patches/patch-bt b/lang/ocaml/patches/patch-bt
index dbd1f964080..790b22b6df2 100644
--- a/lang/ocaml/patches/patch-bt
+++ b/lang/ocaml/patches/patch-bt
@@ -1,19 +1,20 @@
-$NetBSD: patch-bt,v 1.3 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-bt,v 1.4 2009/09/07 21:48:14 tonio Exp $
 
---- Makefile.orig	2007-04-16 18:01:59.000000000 +0200
-+++ Makefile
-@@ -234,24 +234,24 @@ opt.opt: checkstack runtime core ocaml o
+--- ./Makefile.orig	2008-10-23 17:29:11.000000000 +0200
++++ ./Makefile
+@@ -268,25 +268,25 @@ opt.opt: checkstack runtime core ocaml o
  
  # Installation
- install: FORCE
+ install:
 -	if test -d $(BINDIR); then : ; else $(MKDIR) $(BINDIR); fi
 -	if test -d $(LIBDIR); then : ; else $(MKDIR) $(LIBDIR); fi
 -	if test -d $(STUBLIBDIR); then : ; else $(MKDIR) $(STUBLIBDIR); fi
--	if test -d $(MANDIR)/man$(MANEXT); then : ; else $(MKDIR) $(MANDIR)/man$(MANEXT); fi
 +	if test -d $(BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(BINDIR); fi
 +	if test -d $(LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR); fi
 +	if test -d $(STUBLIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(STUBLIBDIR); fi
-+	if test -d $(MANDIR)/man$(MANEXT); then : ; else ${BSD_INSTALL_MAN_DIR} $(MANDIR)/man$(MANEXT); fi
+ 	if test -d $(MANDIR)/man$(MANEXT); then : ; \
+-	  else $(MKDIR) $(MANDIR)/man$(MANEXT); fi
++	  else ${BSD_INSTALL_MAN_DIR} $(MANDIR)/man$(MANEXT); fi
  	cd $(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \
            dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \
            dlltkanim.so
@@ -29,18 +30,18 @@ $NetBSD: patch-bt,v 1.3 2007/09/14 15:34:12 adam Exp $
 -	cp expunge $(LIBDIR)/expunge$(EXE)
 -	cp typing/outcometree.cmi typing/outcometree.mli $(LIBDIR)
 -	cp toplevel/topstart.cmo $(LIBDIR)
--	cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi $(LIBDIR)
+-	cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \
 +	${BSD_INSTALL_SCRIPT} lex/ocamllex $(BINDIR)/ocamllex$(EXE)
 +	${BSD_INSTALL_PROGRAM} yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE)
 +	${BSD_INSTALL_DATA} toplevel/toplevellib.cma $(LIBDIR)/toplevellib.cma
 +	${BSD_INSTALL_DATA} expunge $(LIBDIR)/expunge$(EXE)
 +	${BSD_INSTALL_DATA} typing/outcometree.cmi typing/outcometree.mli $(LIBDIR)
 +	${BSD_INSTALL_DATA} toplevel/topstart.cmo $(LIBDIR)
-+	${BSD_INSTALL_DATA} toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi $(LIBDIR)
++	${BSD_INSTALL_DATA} toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \
+ 	   $(LIBDIR)
  	cd tools; $(MAKE) install
- 	-cd man; $(MAKE) install
- 	for i in $(OTHERLIBRARIES); do \
-@@ -267,16 +267,16 @@ install: FORCE
+ 	-$(MAKE) -C man install
+@@ -304,17 +304,17 @@ install:
  # Installation of the native-code compiler
  installopt:
  	cd asmrun; $(MAKE) install
@@ -48,7 +49,8 @@ $NetBSD: patch-bt,v 1.3 2007/09/14 15:34:12 adam Exp $
 +	${BSD_INSTALL_SCRIPT} ocamlopt $(BINDIR)/ocamlopt$(EXE)
  	cd stdlib; $(MAKE) installopt
  	cd ocamldoc; $(MAKE) installopt
- 	for i in $(OTHERLIBRARIES); do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done
+ 	for i in $(OTHERLIBRARIES); \
+ 	  do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done
  	if test -f ocamlc.opt; \
 -	  then cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi
 +	  then ${BSD_INSTALL_PROGRAM} ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi
diff --git a/lang/ocaml/patches/patch-bu b/lang/ocaml/patches/patch-bu
index d1fd3926419..629f072da81 100644
--- a/lang/ocaml/patches/patch-bu
+++ b/lang/ocaml/patches/patch-bu
@@ -1,11 +1,11 @@
-$NetBSD: patch-bu,v 1.2 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-bu,v 1.3 2009/09/07 21:48:14 tonio Exp $
 
---- asmrun/Makefile.orig	2004-05-09 15:19:16.000000000 +0000
+--- asmrun/Makefile.orig	2007-11-15 14:21:15.000000000 +0100
 +++ asmrun/Makefile
 @@ -18,7 +18,7 @@ include ../config/Makefile
  CC=$(NATIVECC)
  FLAGS=-I../byterun -DCAML_NAME_SPACE -DNATIVE_CODE \
-       -DTARGET_$(ARCH) -DSYS_$(SYSTEM) 
+       -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(IFLEXDIR)
 -CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS)
 +CFLAGS+=$(FLAGS) $(NATIVECCCOMPOPTS)
  DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS)
-- 
cgit v1.2.3