Changes 3.09.3:

Bug fixes:
- ocamldoc: -using modtype constraint to filter module elements displayed in doc
- ocamldoc: error in merging of top dependencies of modules
- ocamldoc: -dot-colors has no effect
- ocamdloc: missing crossref in text from intro files
- compilers: segfault with recursive modules
- compilers: infinite loop when compiling objects
- compilers: bad error message when signature mismatch
- compilers: infinite loop with -rectypes
- compilers: contravariance bug in private rows
- compilers: unsafe cast with polymorphic exception
- native compiler: bad assembly code generated for AMD64
- native compiler: stack alignment problems on MacOSX/i386
- stdlib: crash in marshalling
- stdlib: crash when closing a channel twice
- stdlib: memory leak in Sys.readdir
- C interface: better definition of CAMLreturn
- otherlibs/unix: crash in gethostbyname
- tools: subtle problem with unset in makefile
- camlp4: install pa_o_fast.o
- camlp4: install more modules

New features:
- ocamldoc: name resolution in cross-referencing {!name}: if name is not
    found, then it is searched in the parent module/class, and in the parent
    of the parent, and so on until it is found.
- ocamldoc: new option -short-functors to use a short form to display
    functors in html generator
- ocamlprof: added "-version" option

10 files changed, 96 insertions, 64 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 01fb88134f1..e9c01b8a8d5 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2006/10/02 21:19:22 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.52 2006/10/03 21:06:25 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	2
-
 CONFIGURE_ARGS+=	-no-tk
 CONFIGURE_ENV+=		disable_x11=yes
 
@@ -20,11 +18,12 @@ PLIST_SRC+=	${PKGDIR}/PLIST.stub
 
 # Optional components built only on certain platforms.
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc")
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 BUILD_TARGET+=	opt opt.opt
 PLIST_SRC+=	${PKGDIR}/PLIST.opt
 .  if empty(MACHINE_PLATFORM:MDarwin-*-*) && \
       empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
+      empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
 PLIST_SRC+=	${PKGDIR}/PLIST.prof
 .  endif
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 22a54eb5086..525dcb5a949 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.16 2006/05/20 09:10:51 rillig Exp $
+# $NetBSD: Makefile.common,v 1.17 2006/10/03 21:06:25 adam Exp $
 
-DISTNAME=	ocaml-3.09.2
+DISTNAME=	ocaml-3.09.3
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-3.09/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +19,7 @@ CONFIGURE_ENV+=		BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
 CONFIGURE_ARGS+=	-prefix ${PREFIX:Q}
 CONFIGURE_ARGS+=	-libs ${LDFLAGS:Q}
 CONFIGURE_ARGS+=	-with-pthread
+CONFIGURE_ARGS+=	-host ${MACHINE_GNU_PLATFORM:Q}
 CPPFLAGS+=		-DDB_DBM_HSEARCH
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index b826a719d23..1dd0c28c098 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/04/04 14:33:27 jlam Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/10/03 21:06:25 adam Exp $
 bin/camlp4
 bin/camlp4o
 bin/camlp4r
@@ -64,22 +64,35 @@ lib/ocaml/camlinternalOO.mli
 lib/ocaml/camlp4/argl.cmi
 lib/ocaml/camlp4/argl.cmo
 lib/ocaml/camlp4/ast2pt.cmi
+lib/ocaml/camlp4/ast2pt.cmo
+lib/ocaml/camlp4/ast2pt.cmx
 lib/ocaml/camlp4/ast2pt.mli
+lib/ocaml/camlp4/ast2pt.o
 lib/ocaml/camlp4/camlp4.cma
 lib/ocaml/camlp4/camlp4_top.cma
 lib/ocaml/camlp4/camlp4o.cma
 lib/ocaml/camlp4/camlp4r.cma
 lib/ocaml/camlp4/extfold.cmi
+lib/ocaml/camlp4/extfold.cmo
 lib/ocaml/camlp4/extfold.mli
+lib/ocaml/camlp4/extfold.o
 lib/ocaml/camlp4/extfun.cmi
+lib/ocaml/camlp4/extfun.cmo
 lib/ocaml/camlp4/extfun.mli
+lib/ocaml/camlp4/extfun.o
 lib/ocaml/camlp4/fstream.cmi
+lib/ocaml/camlp4/fstream.cmo
 lib/ocaml/camlp4/fstream.mli
+lib/ocaml/camlp4/fstream.o
 lib/ocaml/camlp4/gramext.cmi
+lib/ocaml/camlp4/gramext.cmo
 lib/ocaml/camlp4/gramext.mli
+lib/ocaml/camlp4/gramext.o
 lib/ocaml/camlp4/gramlib.cma
 lib/ocaml/camlp4/grammar.cmi
+lib/ocaml/camlp4/grammar.cmo
 lib/ocaml/camlp4/grammar.mli
+lib/ocaml/camlp4/grammar.o
 lib/ocaml/camlp4/mLast.cmi
 lib/ocaml/camlp4/mLast.mli
 lib/ocaml/camlp4/ocpp.cmo
@@ -97,15 +110,21 @@ lib/ocaml/camlp4/pa_macro.cmi
 lib/ocaml/camlp4/pa_macro.cmo
 lib/ocaml/camlp4/pa_o.cmi
 lib/ocaml/camlp4/pa_o.cmo
+lib/ocaml/camlp4/pa_o_fast.o
 lib/ocaml/camlp4/pa_oop.cmo
 lib/ocaml/camlp4/pa_op.cmo
 lib/ocaml/camlp4/pa_r.cmo
 lib/ocaml/camlp4/pa_rp.cmo
 lib/ocaml/camlp4/pa_ru.cmo
 lib/ocaml/camlp4/pcaml.cmi
+lib/ocaml/camlp4/pcaml.cmo
+lib/ocaml/camlp4/pcaml.cmx
 lib/ocaml/camlp4/pcaml.mli
+lib/ocaml/camlp4/pcaml.o
 lib/ocaml/camlp4/plexer.cmi
+lib/ocaml/camlp4/plexer.cmo
 lib/ocaml/camlp4/plexer.mli
+lib/ocaml/camlp4/plexer.o
 lib/ocaml/camlp4/pr_depend.cmo
 lib/ocaml/camlp4/pr_dump.cmo
 lib/ocaml/camlp4/pr_extend.cmo
@@ -118,13 +137,28 @@ lib/ocaml/camlp4/pr_rp.cmo
 lib/ocaml/camlp4/q_MLast.cmo
 lib/ocaml/camlp4/q_phony.cmo
 lib/ocaml/camlp4/quotation.cmi
+lib/ocaml/camlp4/quotation.cmo
+lib/ocaml/camlp4/quotation.cmx
 lib/ocaml/camlp4/quotation.mli
+lib/ocaml/camlp4/quotation.o
+lib/ocaml/camlp4/reloc.cmi
+lib/ocaml/camlp4/reloc.cmo
+lib/ocaml/camlp4/reloc.cmx
+lib/ocaml/camlp4/reloc.mli
+lib/ocaml/camlp4/reloc.o
 lib/ocaml/camlp4/spretty.cmi
+lib/ocaml/camlp4/spretty.cmo
+lib/ocaml/camlp4/spretty.cmx
 lib/ocaml/camlp4/spretty.mli
+lib/ocaml/camlp4/spretty.o
 lib/ocaml/camlp4/stdpp.cmi
+lib/ocaml/camlp4/stdpp.cmo
 lib/ocaml/camlp4/stdpp.mli
+lib/ocaml/camlp4/stdpp.o
 lib/ocaml/camlp4/token.cmi
+lib/ocaml/camlp4/token.cmo
 lib/ocaml/camlp4/token.mli
+lib/ocaml/camlp4/token.o
 lib/ocaml/char.cmi
 lib/ocaml/char.ml
 lib/ocaml/char.mli
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 762b9863af7..3582fb67eae 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2006/04/30 17:03:20 joerg Exp $
+$NetBSD: distinfo,v 1.37 2006/10/03 21:06:25 adam Exp $
 
-SHA1 (ocaml-3.09.2.tar.bz2) = 578c66707532882782735352a3628b78193da5e7
-RMD160 (ocaml-3.09.2.tar.bz2) = 45edae84e5787775a5beed29a1ad2881f4df8505
-Size (ocaml-3.09.2.tar.bz2) = 2036341 bytes
-SHA1 (patch-aa) = d498460bda5de456f4ab15b9e5e29427d58d8424
+SHA1 (ocaml-3.09.3.tar.bz2) = 5d63c6e0d13463f85c0d5147d641d2bceef87d6b
+RMD160 (ocaml-3.09.3.tar.bz2) = fdc124218c556c62c897ee6720970279e2d5426b
+Size (ocaml-3.09.3.tar.bz2) = 2038617 bytes
+SHA1 (patch-aa) = def64fabecdb9517f37cf9f5b1a9e63270210029
 SHA1 (patch-ab) = 66e50b0a601aa7c71655672685a48d04d8623230
 SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
 SHA1 (patch-ad) = f2c1dcc3c31db31e2484fdea1076692a63252a87
@@ -12,17 +12,17 @@ SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
 SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
 SHA1 (patch-aj) = 61b977596cbaf8e16a66bfdbe8a7ca1701073fa7
 SHA1 (patch-ak) = b6515a2a554e5c2aedd2e7db815e1e9ad2ea5953
-SHA1 (patch-al) = 3e70780d3f32c0fdcded63efa5304a61592c688c
-SHA1 (patch-am) = a384e1e3076465829ebd831c3d9c260f4e5a85e8
+SHA1 (patch-al) = cc3b9dff5a618ae377a1b104db3d5374230351f8
+SHA1 (patch-am) = 653e461ae0c7e409f55c870c20f184b6e21440b2
 SHA1 (patch-an) = 535dd56444e1bb4c1ca68898610b00208693d9f7
 SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998
 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
-SHA1 (patch-at) = 1aa07c552191d0f756b4d89bc8133e294b659cf6
+SHA1 (patch-at) = 1dfb968384e681650c5ab75bb8288a1f215e313f
 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
-SHA1 (patch-aw) = a2dee7fa2181008fb9cc632032a9a07aec422afa
+SHA1 (patch-aw) = 56a694053c43e27b9c4c3f21a9f51c2c0e5a8374
 SHA1 (patch-ax) = 2419dffbf548837dc61e137032e06d33b1059976
 SHA1 (patch-ay) = ae0fcda810e61967f879f4f18cb17de291f7834b
 SHA1 (patch-az) = 7ef66ce5ac11a5012f30db3161b1aadcd8c55c7e
@@ -45,4 +45,4 @@ SHA1 (patch-br) = c26f18532d3756188eb9c79bf9a301e50a0ce84b
 SHA1 (patch-bs) = 56c068a9ea56abebed410d1e6024d6142ff67d1c
 SHA1 (patch-bt) = 5356511f0ed6d53232f474373edb594804a2eb4c
 SHA1 (patch-bu) = df80c076248e1ad1ab6eae195bda724ea354a55e
-SHA1 (patch-bv) = 849e8d3b8d16d8f929c4d9357723d1a205dacab0
+SHA1 (patch-bv) = 09cb2036915784dfb2a4d2b971bf82eff81996b5
diff --git a/lang/ocaml/patches/patch-aa b/lang/ocaml/patches/patch-aa
index 9b035483943..5328669f175 100644
--- a/lang/ocaml/patches/patch-aa
+++ b/lang/ocaml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-aa,v 1.7 2006/10/03 21:06:25 adam Exp $
 
---- asmcomp/i386/emit.mlp.orig	2004-11-30 18:07:11.000000000 +0100
+--- asmcomp/i386/emit.mlp.orig	2006-03-29 16:49:19.000000000 +0200
 +++ asmcomp/i386/emit.mlp
-@@ -780,7 +780,7 @@ let emit_profile () =
+@@ -835,7 +835,7 @@ let emit_profile () =
        `	movl	%esp, %ebp\n`;
        `	pushl	%ecx\n`;
        `	pushl	%edx\n`;
diff --git a/lang/ocaml/patches/patch-al b/lang/ocaml/patches/patch-al
index d452f437756..8ee37d75e7f 100644
--- a/lang/ocaml/patches/patch-al
+++ b/lang/ocaml/patches/patch-al
@@ -1,35 +1,25 @@
-$NetBSD: patch-al,v 1.5 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-al,v 1.6 2006/10/03 21:06:25 adam Exp $
 
---- camlp4/camlp4/Makefile.orig	2005-01-31 10:38:53.000000000 +0000
+--- camlp4/camlp4/Makefile.orig	2006-09-12 10:58:10.000000000 +0200
 +++ camlp4/camlp4/Makefile
-@@ -71,24 +71,33 @@ compare:
+@@ -73,24 +73,24 @@ EXPORTED = mLast quotation ast2pt pcaml 
  install:
  	-$(MKDIR) "$(BINDIR)"
  	-$(MKDIR) "$(LIBDIR)/camlp4"
 -	cp $(CAMLP4) "$(BINDIR)/."
--	cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli "$(LIBDIR)/camlp4/."
--	cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi "$(LIBDIR)/camlp4/."
--	cp  argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
-+	${BSD_INSTALL_SCRIPT} $(CAMLP4) $(BINDIR)/.
-+	${BSD_INSTALL_DATA} mLast.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} mLast.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} quotation.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} quotation.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} ast2pt.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} ast2pt.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} pcaml.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} pcaml.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} spretty.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} spretty.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} argl.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} argl.cmo $(LIBDIR)/camlp4/
++	${BSD_INSTALL_SCRIPT} $(CAMLP4) "$(BINDIR)/."
+ 	for ext in mli cmi cmo cmx o; do for mod in $(EXPORTED); do \
+-	  cp $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
++	  ${BSD_INSTALL_DATA} $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
+ 	cp  argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
  	for f in argl.o argl.cmx; do \
  	  if test -r $$f ; then \
 -		cp $$f "$(LIBDIR)/camlp4/." ; \
 +		${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." ; \
  	  fi ; \
  	done
- 	cp camlp4.cma $(LIBDIR)/camlp4/.
+-	cp camlp4.cma $(LIBDIR)/camlp4/.
++	${BSD_INSTALL_DATA} camlp4.cma $(LIBDIR)/camlp4/.
  	for f in  camlp4.$(A)  camlp4.p.$(A) ; do \
  	  if test -f $$f ; then \
 -	     cp $$f "$(LIBDIR)/camlp4/." && ( cd  "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
diff --git a/lang/ocaml/patches/patch-am b/lang/ocaml/patches/patch-am
index 11556365857..65520166f2c 100644
--- a/lang/ocaml/patches/patch-am
+++ b/lang/ocaml/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.4 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-am,v 1.5 2006/10/03 21:06:25 adam Exp $
 
---- camlp4/lib/Makefile.orig	2004-11-30 19:57:03.000000000 +0100
+--- camlp4/lib/Makefile.orig	2006-09-14 17:32:20.000000000 +0200
 +++ camlp4/lib/Makefile
 @@ -44,19 +44,19 @@ compare:
  	done
@@ -8,14 +8,14 @@ $NetBSD: patch-am,v 1.4 2006/01/16 09:41:48 adam Exp $
  install:
 -	-$(MKDIR) "$(LIBDIR)/camlp4"
 -	cp $(TARGET) *.mli "$(LIBDIR)/camlp4/."
--	cp *.cmi "$(LIBDIR)/camlp4/."
-+	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
+-	cp *.cmi *.cmo "$(LIBDIR)/camlp4/."
++	-${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
 +	${BSD_INSTALL_DATA} $(TARGET) *.mli "$(LIBDIR)/camlp4/."
-+	${BSD_INSTALL_DATA} *.cmi "$(LIBDIR)/camlp4/."
++	${BSD_INSTALL_DATA} *.cmi *.cmo "$(LIBDIR)/camlp4/."
  	test -f $(TARGET:.cma=.cmxa) && $(MAKE) installopt LIBDIR="$(LIBDIR)" || true
  
  installopt:
- 	for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx ; do \
+ 	for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx *.o ; do \
 -		test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \
 +		test -f $$f && ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." || true ; \
  	done
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index f177f9c8183..2a95524d848 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
+$NetBSD: patch-at,v 1.12 2006/10/03 21:06:25 adam Exp $
 
---- configure.orig	2006-03-30 10:00:19.000000000 +0000
+--- configure.orig	2006-03-30 12:00:19.000000000 +0200
 +++ configure
 @@ -483,7 +483,7 @@ mksharedlibrpath=''
  
@@ -24,7 +24,15 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
    i[3456]86-*-darwin*)          arch=i386; system=macosx;;
    i[3456]86-*-gnu*)             arch=i386; system=gnu;;
    mips-*-irix6*)                arch=mips; system=irix;;
-@@ -672,6 +674,7 @@ case "$arch,$model,$system" in
+@@ -596,6 +598,7 @@ case "$host" in
+   x86_64-*-linux*)              arch=amd64; system=linux;;
+   x86_64-*-gnu*)                arch=amd64; system=gnu;;
+   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
++  x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
+   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
+ esac
+ 
+@@ -672,6 +675,7 @@ case "$arch,$model,$system" in
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
    amd64,*,gnu) profiling='prof';;
@@ -32,7 +40,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
    *) profiling='noprof';;
  esac
  
-@@ -1060,6 +1063,7 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1060,6 +1064,7 @@ if test "$pthread_wanted" = "yes"; then
    case "$host" in
      *-*-solaris*)  pthread_link="-lpthread -lposix4";;
      *-*-freebsd*)  pthread_link="-pthread";;
@@ -40,7 +48,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
      *-*-openbsd*)  pthread_link="-pthread";;
      *)             pthread_link="-lpthread";;
    esac
-@@ -1107,6 +1111,7 @@ fi
+@@ -1107,6 +1112,7 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -48,7 +56,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
  for dir in \
      $x11_include_dir          \
                                \
-@@ -1153,6 +1158,7 @@ do
+@@ -1153,6 +1159,7 @@ do
      break
    fi
  done
@@ -56,7 +64,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
-@@ -1242,31 +1248,8 @@ dbm_include="not found"
+@@ -1242,31 +1249,8 @@ dbm_include="not found"
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -90,7 +98,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg 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
-@@ -1278,8 +1261,8 @@ else
+@@ -1278,8 +1262,8 @@ else
    fi
    echo "DBM_INCLUDES=$dbm_include" >> Makefile
    echo "DBM_LINK=$dbm_link" >> Makefile
diff --git a/lang/ocaml/patches/patch-aw b/lang/ocaml/patches/patch-aw
index 64891d0797c..bc6ff1eed57 100644
--- a/lang/ocaml/patches/patch-aw
+++ b/lang/ocaml/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.4 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-aw,v 1.5 2006/10/03 21:06:25 adam Exp $
 
---- ocamldoc/Makefile.orig	2005-11-10 15:44:36.000000000 +0100
+--- ocamldoc/Makefile.orig	2006-08-10 14:45:09.000000000 +0200
 +++ ocamldoc/Makefile
-@@ -254,24 +254,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
+@@ -258,24 +258,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
  # Installation targets
  ######################
  install: dummy
diff --git a/lang/ocaml/patches/patch-bv b/lang/ocaml/patches/patch-bv
index d2d55625181..839dc22a8b0 100644
--- a/lang/ocaml/patches/patch-bv
+++ b/lang/ocaml/patches/patch-bv
@@ -1,15 +1,15 @@
-$NetBSD: patch-bv,v 1.2 2005/09/04 13:57:51 tonio Exp $
+$NetBSD: patch-bv,v 1.3 2006/10/03 21:06:25 adam Exp $
 
---- camlp4/compile/Makefile.orig	2005-09-03 16:16:48.000000000 +0200
-+++ camlp4/compile/Makefile	2005-09-03 16:18:35.000000000 +0200
-@@ -30,8 +30,8 @@
+--- camlp4/compile/Makefile.orig	2006-09-12 10:58:10.000000000 +0200
++++ camlp4/compile/Makefile
+@@ -30,8 +30,8 @@ $D_fast.ml: compile.cmo $(SRC)
  	OTOP=$(OTOP) EXE=$(EXE) ./compile.sh $(COMP_OPT) $(SRC) >> $D_fast.ml
  
  install:
 -	if test -f camlp4$D.fast.opt; then cp camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
--	for TARG in  pa_$D_fast.cmi  pa_$D_fast.cmo pa_$D_fast.cmx ; do if test -f $$TARG; then cp $$TARG "$(LIBDIR)/camlp4/."; fi; done
-+	if test -f camlp4$D.fast.opt; then ${BSD_INSTALL_PROGRAM} camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
-+	for TARG in  pa_$D_fast.cmi  pa_$D_fast.cmo pa_$D_fast.cmx ; do if test -f $$TARG; then ${BSD_INSTALL_DATA} $$TARG "$(LIBDIR)/camlp4/."; fi; done
+-	for TARG in  pa_$D_fast.cmi  pa_$D_fast.cmo pa_$D_fast.cmx pa_$D_fast.o ; do if test -f $$TARG; then cp $$TARG "$(LIBDIR)/camlp4/."; fi; done
++	if test -f camlp4$D.fast.opt; then ${BSD_INSTALL_DATA} camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
++	for TARG in  pa_$D_fast.cmi  pa_$D_fast.cmo pa_$D_fast.cmx pa_$D_fast.o ; do if test -f $$TARG; then ${BSD_INSTALL_DATA} $$TARG "$(LIBDIR)/camlp4/."; fi; done
  
  clean::
  	rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt