pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update lang/ocaml to 3.11.1 [PR pkg/41695]



details:   https://anonhg.NetBSD.org/pkgsrc/rev/96df091e46e1
branches:  trunk
changeset: 398757:96df091e46e1
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Mon Sep 07 21:48:13 2009 +0000

description:
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.

diffstat:

 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 ++--
 x11/ocaml-graphics/Makefile |  17 +++++++++++-
 x11/ocaml-graphics/PLIST    |   5 +++-
 28 files changed, 315 insertions(+), 349 deletions(-)

diffs (truncated from 1180 to 300 lines):

diff -r 15fb0a8095b4 -r 96df091e46e1 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Mon Sep 07 20:32:16 2009 +0000
+++ b/lang/ocaml/Makefile.common        Mon Sep 07 21:48:13 2009 +0000
@@ -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@localhost
 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 -r 15fb0a8095b4 -r 96df091e46e1 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Mon Sep 07 20:32:16 2009 +0000
+++ b/lang/ocaml/PLIST  Mon Sep 07 21:48:13 2009 +0000
@@ -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/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/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.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 -r 15fb0a8095b4 -r 96df091e46e1 lang/ocaml/PLIST.opt
--- a/lang/ocaml/PLIST.opt      Mon Sep 07 20:32:16 2009 +0000
+++ b/lang/ocaml/PLIST.opt      Mon Sep 07 21:48:13 2009 +0000
@@ -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/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/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/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/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/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/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/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/unix.a
 lib/ocaml/unix.cmx
 lib/ocaml/unix.cmxa
+lib/ocaml/unix.cmxs
 lib/ocaml/unixLabels.cmx
 lib/ocaml/weak.cmx
diff -r 15fb0a8095b4 -r 96df091e46e1 lang/ocaml/PLIST.prof
--- a/lang/ocaml/PLIST.prof     Mon Sep 07 20:32:16 2009 +0000
+++ b/lang/ocaml/PLIST.prof     Mon Sep 07 21:48:13 2009 +0000
@@ -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 -r 15fb0a8095b4 -r 96df091e46e1 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo       Mon Sep 07 20:32:16 2009 +0000
+++ b/lang/ocaml/distinfo       Mon Sep 07 21:48:13 2009 +0000
@@ -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 -r 15fb0a8095b4 -r 96df091e46e1 lang/ocaml/patches/patch-aj
--- a/lang/ocaml/patches/patch-aj       Mon Sep 07 20:32:16 2009 +0000
+++ b/lang/ocaml/patches/patch-aj       Mon Sep 07 21:48:13 2009 +0000
@@ -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 -r 15fb0a8095b4 -r 96df091e46e1 lang/ocaml/patches/patch-at
--- a/lang/ocaml/patches/patch-at       Mon Sep 07 20:32:16 2009 +0000
+++ b/lang/ocaml/patches/patch-at       Mon Sep 07 21:48:13 2009 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index