pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/ocaml Changes 3.09.1:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/04204ff0d7c2
branches:  trunk
changeset: 506443:04204ff0d7c2
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Jan 16 09:41:48 2006 +0000

description:
Changes 3.09.1:

* Bug fixes
* New features:
- otherlibs/labltk: browser uses menu bars instead of menu buttons


Changes 3.09.0:

Language features:
- Introduction of private row types, for abstracting the row in object
  and variant types.

Type checking:
- Polymorphic variants with at most one constructor [< `A of t] are no
  longer systematically promoted to the exact type [`A of t]. This was
  more confusing than useful, and created problems with private row
  types.

Native-code compiler (ocamlopt):
* Revised implementation of the -pack option (packing of several compilation
  units into one).  The .cmx files that are to be packed with
  "ocamlopt -pack -o P.cmx" must be compiled with "ocamlopt -for-pack P".
  In exchange for this additional constraint, ocamlopt -pack is now
  available on all platforms (no need for binutils).
* Fixed wrong evaluation order for arguments to certain inlined functions.

* Other (see 'Changes')

diffstat:

 lang/ocaml/Makefile         |   3 +--
 lang/ocaml/Makefile.common  |   6 +++---
 lang/ocaml/PLIST            |   7 ++++++-
 lang/ocaml/PLIST.opt        |   4 ++--
 lang/ocaml/PLIST.prof       |   3 ++-
 lang/ocaml/distinfo         |  34 +++++++++++++++++-----------------
 lang/ocaml/patches/patch-aa |   6 +++---
 lang/ocaml/patches/patch-ad |   6 +++---
 lang/ocaml/patches/patch-aj |   6 +++---
 lang/ocaml/patches/patch-ak |   8 ++++----
 lang/ocaml/patches/patch-am |   8 ++++----
 lang/ocaml/patches/patch-at |  20 ++++++++++----------
 lang/ocaml/patches/patch-aw |   8 ++++----
 lang/ocaml/patches/patch-ax |   8 ++++----
 lang/ocaml/patches/patch-bi |  14 +++++++-------
 lang/ocaml/patches/patch-bm |   8 ++++----
 lang/ocaml/patches/patch-br |  10 +++++-----
 lang/ocaml/patches/patch-bs |  16 ++++++++--------
 lang/ocaml/patches/patch-bt |  10 +++++-----
 19 files changed, 95 insertions(+), 90 deletions(-)

diffs (truncated from 524 to 300 lines):

diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/Makefile       Mon Jan 16 09:41:48 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2005/12/22 14:37:17 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/01/16 09:41:48 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=           1
 CONFIGURE_ARGS+=       -no-tk
 CONFIGURE_ENV+=                disable_x11=yes
 
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/Makefile.common        Mon Jan 16 09:41:48 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.12 2005/12/05 20:50:26 rillig Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/01/16 09:41:48 adam Exp $
 
-DISTNAME=      ocaml-3.08.4
+DISTNAME=      ocaml-3.09.1
 CATEGORIES=    lang
-MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-3.08/
+MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-3.09/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam%NetBSD.org@localhost
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/PLIST  Mon Jan 16 09:41:48 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/06/20 07:41:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/01/16 09:41:48 adam Exp $
 bin/camlp4
 bin/camlp4o
 bin/camlp4r
@@ -16,6 +16,7 @@
 bin/ocamlrun
 bin/ocamlyacc
 bin/ocpp
+lib/ocaml/Makefile.config
 lib/ocaml/addlabels
 lib/ocaml/arg.cmi
 lib/ocaml/arg.ml
@@ -54,6 +55,9 @@
 lib/ocaml/caml/signals.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
+lib/ocaml/camlinternalMod.cmi
+lib/ocaml/camlinternalMod.ml
+lib/ocaml/camlinternalMod.mli
 lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
@@ -379,6 +383,7 @@
 man/man3/Bigarray.Genarray.3o
 man/man3/Buffer.3o
 man/man3/Callback.3o
+man/man3/CamlinternalMod.3o
 man/man3/CamlinternalOO.3o
 man/man3/Char.3o
 man/man3/Complex.3o
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/PLIST.opt
--- a/lang/ocaml/PLIST.opt      Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/PLIST.opt      Mon Jan 16 09:41:48 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.10 2005/06/20 07:41:49 jlam Exp $
+@comment $NetBSD: PLIST.opt,v 1.11 2006/01/16 09:41:48 adam Exp $
 bin/camlp4o.opt
 bin/camlp4r.opt
 bin/ocamlc.opt
@@ -18,6 +18,7 @@
 lib/ocaml/bigarray.cmxa
 lib/ocaml/buffer.cmx
 lib/ocaml/callback.cmx
+lib/ocaml/camlinternalMod.cmx
 lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlp4/argl.cmx
 lib/ocaml/camlp4/argl.o
@@ -147,7 +148,6 @@
 lib/ocaml/stream.cmx
 lib/ocaml/string.cmx
 lib/ocaml/stringLabels.cmx
-lib/ocaml/string_misc.cmx
 lib/ocaml/sys.cmx
 lib/ocaml/threads/condition.cmx
 lib/ocaml/threads/event.cmx
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/PLIST.prof
--- a/lang/ocaml/PLIST.prof     Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/PLIST.prof     Mon Jan 16 09:41:48 2006 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST.prof,v 1.3 2005/02/04 21:35:51 adrianp Exp $
+@comment $NetBSD: PLIST.prof,v 1.4 2006/01/16 09:41:48 adam 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/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/char.p.cmx
 lib/ocaml/complex.p.cmx
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/distinfo       Mon Jan 16 09:41:48 2006 +0000
@@ -1,29 +1,29 @@
-$NetBSD: distinfo,v 1.32 2005/12/22 14:37:17 joerg Exp $
+$NetBSD: distinfo,v 1.33 2006/01/16 09:41:48 adam Exp $
 
-SHA1 (ocaml-3.08.4.tar.bz2) = d9eb54611d24f9e1c33736f12c7ba87412057cbb
-RMD160 (ocaml-3.08.4.tar.bz2) = 448ed9af56cacb9c32208d064e1c9732a2086bd2
-Size (ocaml-3.08.4.tar.bz2) = 2054019 bytes
-SHA1 (patch-aa) = 3f8945cac58be358ef4e3e15b6fc2d1ddf43d8be
+SHA1 (ocaml-3.09.1.tar.bz2) = e74ceeb623494bee08effac4a4cef301e71dd496
+RMD160 (ocaml-3.09.1.tar.bz2) = 1c8f2056a0e4356d9a99561c297eb867bf96ef4f
+Size (ocaml-3.09.1.tar.bz2) = 2035552 bytes
+SHA1 (patch-aa) = d498460bda5de456f4ab15b9e5e29427d58d8424
 SHA1 (patch-ab) = 66e50b0a601aa7c71655672685a48d04d8623230
 SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
-SHA1 (patch-ad) = 43624e0952704a2a3f965fe421eadfe8d1042c84
+SHA1 (patch-ad) = f2c1dcc3c31db31e2484fdea1076692a63252a87
 SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
 SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
-SHA1 (patch-aj) = 4a121fd01719b1beec94e72d545e46d789cc22d9
-SHA1 (patch-ak) = 3d87b50076c00f1ffa14754824e783949c2a57a9
+SHA1 (patch-aj) = 61b977596cbaf8e16a66bfdbe8a7ca1701073fa7
+SHA1 (patch-ak) = b6515a2a554e5c2aedd2e7db815e1e9ad2ea5953
 SHA1 (patch-al) = 3e70780d3f32c0fdcded63efa5304a61592c688c
-SHA1 (patch-am) = ec1b31021a4c6904360d714adea7056b615f0932
+SHA1 (patch-am) = a384e1e3076465829ebd831c3d9c260f4e5a85e8
 SHA1 (patch-an) = 535dd56444e1bb4c1ca68898610b00208693d9f7
 SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998
 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
-SHA1 (patch-at) = 6b62b5ae9b4bb9e34e7dd1ea8314bcb493fd101a
+SHA1 (patch-at) = 753a907e52d69d72562a24a7841eb2abecc43906
 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
-SHA1 (patch-aw) = c44908be14be2869ec0722d0bfa3794945f40622
-SHA1 (patch-ax) = f9fb031e4ab7c5d5fc27bfe6ad69942d92fc6776
+SHA1 (patch-aw) = a2dee7fa2181008fb9cc632032a9a07aec422afa
+SHA1 (patch-ax) = 2419dffbf548837dc61e137032e06d33b1059976
 SHA1 (patch-ay) = ae0fcda810e61967f879f4f18cb17de291f7834b
 SHA1 (patch-az) = 7ef66ce5ac11a5012f30db3161b1aadcd8c55c7e
 SHA1 (patch-ba) = f9dfb3a88438145055f0caa25b7c6a9b5cb377c7
@@ -34,15 +34,15 @@
 SHA1 (patch-bf) = e38ad77f37c451b2887bb4b5849128644b673249
 SHA1 (patch-bg) = 760ab3521c7cc9cc573799f6d499e926502354c2
 SHA1 (patch-bh) = 2f14629fa692aec79a280ed0f350fcf20076eecf
-SHA1 (patch-bi) = 93b0700588ef5e34d28f2fe06bc5974290822708
+SHA1 (patch-bi) = fc2901a49279b35de3d0cd95f08f1942fa98ced8
 SHA1 (patch-bk) = ed30ca7afe04ff89c7a5ef8384d37c4f68e9efe7
-SHA1 (patch-bm) = fccbd39eb43088da8363687b6757db6fe3abb10d
+SHA1 (patch-bm) = e6d982368536708bd0d67da979d783fd92bf138d
 SHA1 (patch-bn) = e8970e19c8be0d8ec5fda67677a783b7ce82507b
 SHA1 (patch-bo) = 322c322336d44a0d9c0bd8f1582d56ff873bd7e4
 SHA1 (patch-bp) = 45038c5900aefdb8d21b8c3d3b8798b45014bae2
 SHA1 (patch-bq) = 88ce7c503d9f6f5ebcc2f944c420aa1c01c3baee
-SHA1 (patch-br) = d91f952083102dff8d161056f4c2895063d38b8d
-SHA1 (patch-bs) = 680bdf1278a5bea369f7fcec61c91e2905c86b0f
-SHA1 (patch-bt) = be4212ecdf6a8eb8c2d22bdd75b328e938c883b5
+SHA1 (patch-br) = c26f18532d3756188eb9c79bf9a301e50a0ce84b
+SHA1 (patch-bs) = 56c068a9ea56abebed410d1e6024d6142ff67d1c
+SHA1 (patch-bt) = 5356511f0ed6d53232f474373edb594804a2eb4c
 SHA1 (patch-bu) = df80c076248e1ad1ab6eae195bda724ea354a55e
 SHA1 (patch-bv) = 849e8d3b8d16d8f929c4d9357723d1a205dacab0
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/patches/patch-aa
--- a/lang/ocaml/patches/patch-aa       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/patches/patch-aa       Mon Jan 16 09:41:48 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-aa,v 1.6 2006/01/16 09:41:48 adam Exp $
 
---- asmcomp/i386/emit.mlp.orig 2004-05-03 12:46:50.000000000 +0000
+--- asmcomp/i386/emit.mlp.orig 2004-11-30 18:07:11.000000000 +0100
 +++ asmcomp/i386/emit.mlp
-@@ -775,7 +775,7 @@ let emit_profile () =
+@@ -780,7 +780,7 @@ let emit_profile () =
        `       movl    %esp, %ebp\n`;
        `       pushl   %ecx\n`;
        `       pushl   %edx\n`;
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/patches/patch-ad
--- a/lang/ocaml/patches/patch-ad       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/patches/patch-ad       Mon Jan 16 09:41:48 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2005/11/29 07:02:47 joerg Exp $
+$NetBSD: patch-ad,v 1.7 2006/01/16 09:41:48 adam Exp $
 
---- byterun/sys.c.orig 2005-11-29 06:21:52.000000000 +0000
+--- byterun/sys.c.orig 2005-11-09 16:58:03.000000000 +0100
 +++ byterun/sys.c
-@@ -47,10 +47,6 @@
+@@ -51,10 +51,6 @@
  #include "stacks.h"
  #include "sys.h"
  
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/patches/patch-aj
--- a/lang/ocaml/patches/patch-aj       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/patches/patch-aj       Mon Jan 16 09:41:48 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.5 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-aj,v 1.6 2006/01/16 09:41:48 adam Exp $
 
---- byterun/Makefile.orig      2004-08-20 15:11:36.000000000 +0000
+--- byterun/Makefile.orig      2005-11-29 12:57:49.000000000 +0100
 +++ byterun/Makefile
 @@ -16,7 +16,7 @@
  include ../config/Makefile
@@ -28,5 +28,5 @@
 -      cp ld.conf $(LIBDIR)/ld.conf
 +      ${BSD_INSTALL_DATA} ld.conf $(LIBDIR)/ld.conf
  
- ld.conf:
+ ld.conf: ../config/Makefile
        echo "$(STUBLIBDIR)" >ld.conf
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/patches/patch-ak
--- a/lang/ocaml/patches/patch-ak       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/patches/patch-ak       Mon Jan 16 09:41:48 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-ak,v 1.4 2006/01/16 09:41:48 adam Exp $
 
---- camlp4/etc/Makefile.orig   2004-10-14 16:00:16.000000000 +0100
-+++ camlp4/etc/Makefile        2004-10-14 16:05:43.000000000 +0100
-@@ -68,18 +68,19 @@
+--- camlp4/etc/Makefile.orig   2004-11-30 19:57:03.000000000 +0100
++++ camlp4/etc/Makefile
+@@ -74,18 +74,19 @@ depend:
  get_promote:
  
  install:
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/patches/patch-am
--- a/lang/ocaml/patches/patch-am       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/patches/patch-am       Mon Jan 16 09:41:48 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-am,v 1.4 2006/01/16 09:41:48 adam Exp $
 
---- camlp4/lib/Makefile.orig   2004-10-14 16:11:43.000000000 +0100
-+++ camlp4/lib/Makefile        2004-10-14 16:14:08.000000000 +0100
-@@ -42,19 +42,19 @@
+--- camlp4/lib/Makefile.orig   2004-11-30 19:57:03.000000000 +0100
++++ camlp4/lib/Makefile
+@@ -44,19 +44,19 @@ compare:
        done
  
  install:
diff -r 88b2a432297a -r 04204ff0d7c2 lang/ocaml/patches/patch-at
--- a/lang/ocaml/patches/patch-at       Mon Jan 16 01:37:39 2006 +0000
+++ b/lang/ocaml/patches/patch-at       Mon Jan 16 09:41:48 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.7 2005/11/29 07:02:47 joerg Exp $
+$NetBSD: patch-at,v 1.8 2006/01/16 09:41:48 adam Exp $
 
---- configure.orig     2005-01-24 09:22:46.000000000 -0600
+--- configure.orig     2006-01-04 10:26:42.000000000 +0100
 +++ configure
-@@ -481,7 +481,7 @@ mksharedlibrpath=''
+@@ -483,7 +483,7 @@ mksharedlibrpath=''
  
  if test $withsharedlibs = "yes"; then
    case "$host" in
@@ -11,7 +11,7 @@
        sharedcccompopts="-fPIC"
        mksharedlib="$bytecc -shared -o"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -569,10 +569,12 @@ case "$host" in
+@@ -571,10 +571,12 @@ case "$host" in
    sparc*-*-linux*)              arch=sparc; system=linux;;
    i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
    i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
@@ -24,7 +24,7 @@
    mips-*-irix6*)                arch=mips; system=irix;;
    hppa1.1-*-hpux*)              arch=hppa; system=hpux;;
    hppa2.0*-*-hpux*)             arch=hppa; system=hpux;;
-@@ -657,6 +659,7 @@ case "$arch,$model,$system" in
+@@ -659,6 +661,7 @@ case "$arch,$model,$system" in
      profiling='prof'
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
@@ -32,7 +32,7 @@
    *) profiling='noprof';;
  esac
  
-@@ -1077,6 +1080,7 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1047,6 +1050,7 @@ if test "$pthread_wanted" = "yes"; then
    case "$host" in
      *-*-solaris*)  pthread_link="-lpthread -lposix4";;
      *-*-freebsd*)  pthread_link="-pthread";;
@@ -40,7 +40,7 @@
      *-*-openbsd*)  pthread_link="-pthread";;
      *)             pthread_link="-lpthread";;
    esac
-@@ -1123,6 +1127,7 @@ fi
+@@ -1094,6 +1098,7 @@ fi
  x11_include="not found"
  x11_link="not found"



Home | Main Index | Thread Index | Old Index