Changes 3.10.0:

- New language features
- New tools
- Faster type-checking of functor applications.
- Referencing an interface compiled with -rectypes from a module
    not compiled with -rectypes is now an error.
- Revised the "fragile matching" warning.
- Print a stack backtrace on an uncaught exception.
- Stack overflow detection on MS Windows 32 bits.
- Stack overflow detection on MacOS X PPC and Intel.
- Intel/AMD 64 bits: generate position-independent code by default.
- Fixed bug involving -for-pack and missing .cmx files.
- Fixed bug causing duplication of literals.
- C/Caml interface functions take "char const *" arguments
  instead of "char *" when appropriate.
- Faster string comparisons (fast case if strings are ==).
- Other

22 files changed, 70 insertions, 288 deletions

diff --git a/lang/ocaml/patches/patch-aa b/lang/ocaml/patches/patch-aa
index 5328669f175..23103cd9842 100644
--- a/lang/ocaml/patches/patch-aa
+++ b/lang/ocaml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2006/10/03 21:06:25 adam Exp $
+$NetBSD: patch-aa,v 1.8 2007/09/14 15:34:10 adam Exp $
 
---- asmcomp/i386/emit.mlp.orig	2006-03-29 16:49:19.000000000 +0200
+--- asmcomp/i386/emit.mlp.orig	2007-03-07 10:14:29.000000000 +0100
 +++ asmcomp/i386/emit.mlp
-@@ -835,7 +835,7 @@ let emit_profile () =
+@@ -860,7 +860,7 @@ let emit_profile () =
        `	movl	%esp, %ebp\n`;
        `	pushl	%ecx\n`;
        `	pushl	%edx\n`;
diff --git a/lang/ocaml/patches/patch-ab b/lang/ocaml/patches/patch-ab
index 174de108539..3925f0e671a 100644
--- a/lang/ocaml/patches/patch-ab
+++ b/lang/ocaml/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2005/06/07 00:59:49 minskim Exp $
+$NetBSD: patch-ab,v 1.5 2007/09/14 15:34:10 adam Exp $
 
 --- otherlibs/dbm/cldbm.c.orig	2003-07-08 08:50:31.000000000 -0500
 +++ otherlibs/dbm/cldbm.c
@@ -9,7 +9,7 @@ $NetBSD: patch-ab,v 1.4 2005/06/07 00:59:49 minskim Exp $
 -#ifdef DBM_USES_GDBM_NDBM
 -#include <gdbm-ndbm.h>
 +#ifdef DBM_USES_DB
-+#include <db.h>
++#include <ndbm.h>
  #else
  #include <ndbm.h>
  #endif
diff --git a/lang/ocaml/patches/patch-ac b/lang/ocaml/patches/patch-ac
index 24fbeacf619..c474fe7ff99 100644
--- a/lang/ocaml/patches/patch-ac
+++ b/lang/ocaml/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-ac,v 1.5 2007/09/14 15:34:10 adam Exp $
 
---- asmcomp/power/emit.mlp.orig	2004-10-14 15:39:35.000000000 +0100
-+++ asmcomp/power/emit.mlp	2004-10-14 15:41:11.000000000 +0100
-@@ -793,6 +793,30 @@
+--- asmcomp/power/emit.mlp.orig	2007-05-10 18:41:12.000000000 +0200
++++ asmcomp/power/emit.mlp
+@@ -825,6 +825,30 @@ let rec emit_all i =
        emit_instr i None;
        emit_all i.next
  
diff --git a/lang/ocaml/patches/patch-ai b/lang/ocaml/patches/patch-ai
deleted file mode 100644
index 55de5f28fd7..00000000000
--- a/lang/ocaml/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/04/22 09:18:36 tron Exp $
-
---- asmrun/i386.S.orig	Fri Jun  7 11:49:36 2002
-+++ asmrun/i386.S	Thu Apr 22 10:34:38 2004
-@@ -53,10 +53,10 @@
- #elif defined(SYS_bsd_elf)
- #define PROFILE_CAML \
-         pushl %ebp; movl %esp, %ebp; pushl %eax; pushl %ecx; pushl %edx; \
--        call .mcount; \
-+        call __mcount; \
-         popl %edx; popl %ecx; popl %eax; popl %ebp
- #define PROFILE_C \
--        pushl %ebp; movl %esp, %ebp; call .mcount; popl %ebp
-+        pushl %ebp; movl %esp, %ebp; call __mcount; popl %ebp
- #endif
- #else
- #define PROFILE_CAML
diff --git a/lang/ocaml/patches/patch-ak b/lang/ocaml/patches/patch-ak
deleted file mode 100644
index e0efeaad0bd..00000000000
--- a/lang/ocaml/patches/patch-ak
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2006/01/16 09:41:48 adam Exp $
-
---- camlp4/etc/Makefile.orig	2004-11-30 19:57:03.000000000 +0100
-+++ camlp4/etc/Makefile
-@@ -74,18 +74,19 @@ depend:
- get_promote:
- 
- install:
--	-$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
--	cp $(OBJS) "$(LIBDIR)/camlp4/."
--	cp $(INTF) "$(LIBDIR)/camlp4/."
--	cp camlp4o$(EXE) "$(BINDIR)/."
-+	-${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+	-${BSD_INSTALL_PROGRAM_DIR} "$(BINDIR)"
-+	${BSD_INSTALL_DATA} $(OBJS) "$(LIBDIR)/camlp4/."
-+	${BSD_INSTALL_DATA} $(INTF) "$(LIBDIR)/camlp4/."
-+	${BSD_INSTALL_SCRIPT} camlp4o$(EXE) "$(BINDIR)/."
- 	if test -f camlp4o.opt; then \
--	  cp camlp4o.opt "$(BINDIR)/camlp4o.opt$(EXE)"; \
--	  cp $(OBJSX) "$(LIBDIR)/camlp4/."; \
-+	  ${BSD_INSTALL_SCRIPT} camlp4o.opt "$(BINDIR)/camlp4o.opt$(EXE)"; \
-+	  ${BSD_INSTALL_DATA} $(OBJSX) "$(LIBDIR)/camlp4/."; \
- 	  for file in $(OBJSX); do \
--	    cp "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
-+	    ${BSD_INSTALL_DATA} "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
- 	  done ; \
- 	fi
--	cp mkcamlp4.sh "$(BINDIR)/mkcamlp4"
-+	${BSD_INSTALL_SCRIPT} mkcamlp4.sh "$(BINDIR)/mkcamlp4"
- 	chmod a+x "$(BINDIR)/mkcamlp4"
- 
- pr_extend.cmo: pa_extfun.cmo
diff --git a/lang/ocaml/patches/patch-al b/lang/ocaml/patches/patch-al
deleted file mode 100644
index 8ee37d75e7f..00000000000
--- a/lang/ocaml/patches/patch-al
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-al,v 1.6 2006/10/03 21:06:25 adam Exp $
-
---- camlp4/camlp4/Makefile.orig	2006-09-12 10:58:10.000000000 +0200
-+++ camlp4/camlp4/Makefile
-@@ -73,24 +73,24 @@ EXPORTED = mLast quotation ast2pt pcaml 
- install:
- 	-$(MKDIR) "$(BINDIR)"
- 	-$(MKDIR) "$(LIBDIR)/camlp4"
--	cp $(CAMLP4) "$(BINDIR)/."
-+	${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/.
-+	${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 ) ; \
-+	     ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." && ( cd  "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
- 	  fi ; \
- 	done
- 	for f in camlp4.cmxa camlp4.p.cmxa ; do \
- 	  if test -f $$f ; then \
--	     cp $$f "$(LIBDIR)/camlp4/." ; \
-+	     ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." ; \
- 	  fi ; \
- 	done
- 
diff --git a/lang/ocaml/patches/patch-am b/lang/ocaml/patches/patch-am
deleted file mode 100644
index 65520166f2c..00000000000
--- a/lang/ocaml/patches/patch-am
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-am,v 1.5 2006/10/03 21:06:25 adam Exp $
-
---- camlp4/lib/Makefile.orig	2006-09-14 17:32:20.000000000 +0200
-+++ camlp4/lib/Makefile
-@@ -44,19 +44,19 @@ compare:
- 	done
- 
- install:
--	-$(MKDIR) "$(LIBDIR)/camlp4"
--	cp $(TARGET) *.mli "$(LIBDIR)/camlp4/."
--	cp *.cmi *.cmo "$(LIBDIR)/camlp4/."
-+	-${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+	${BSD_INSTALL_DATA} $(TARGET) *.mli "$(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 *.o ; do \
--		test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \
-+		test -f $$f && ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." || true ; \
- 	done
- 	# Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A)) 
- 	target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \
- 	   if test -f $$target ; then \
--	      cp $$target "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$target ) \
-+	      ${BSD_INSTALL_DATA} $$target "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$target ) \
- 	  fi
- 
- include .depend
diff --git a/lang/ocaml/patches/patch-an b/lang/ocaml/patches/patch-an
index 66831b382e0..6ef9e624f6b 100644
--- a/lang/ocaml/patches/patch-an
+++ b/lang/ocaml/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-an,v 1.3 2007/09/14 15:34:11 adam Exp $
 
---- camlp4/man/Makefile.orig	2003-07-03 17:14:49.000000000 +0100
-+++ camlp4/man/Makefile	2004-10-12 22:28:52.000000000 +0100
-@@ -16,8 +16,8 @@
+--- camlp4/man/Makefile.orig	2006-06-29 10:12:44.000000000 +0200
++++ camlp4/man/Makefile
+@@ -9,8 +9,8 @@ include ../config/Makefile.base
  
- install:
+ install-local:
  	if test -n '$(MANDIR)'; then \
 -	  $(MKDIR) $(MANDIR)/man1 ; \
 -	  cp $(TARGET) $(MANDIR)/man1/. ; \
diff --git a/lang/ocaml/patches/patch-ao b/lang/ocaml/patches/patch-ao
deleted file mode 100644
index 2748838c32f..00000000000
--- a/lang/ocaml/patches/patch-ao
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/meta/Makefile.orig	2004-10-14 16:17:42.000000000 +0100
-+++ camlp4/meta/Makefile	2004-10-14 16:19:48.000000000 +0100
-@@ -43,15 +43,16 @@
- 	done
- 
- install:
--	-$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
--	cp $(OBJS) "$(LIBDIR)/camlp4/."
--	cp pa_macro.cmi pa_extend.cmi "$(LIBDIR)/camlp4/."
--	cp camlp4r$(EXE) "$(BINDIR)/."
-+	-${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+	-${BSD_INSTALL_PROGRAM_DIR} "$(BINDIR)"
-+	${BSD_INSTALL_DATA} $(OBJS) "$(LIBDIR)/camlp4/."
-+	${BSD_INSTALL_DATA} pa_macro.cmi pa_extend.cmi "$(LIBDIR)/camlp4/."
-+	${BSD_INSTALL_SCRIPT} camlp4r$(EXE) "$(BINDIR)/."
- 	if test -f camlp4r.opt; then \
--	  cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
--	  cp $(OBJSX) "$(LIBDIR)/camlp4/."; \
-+	  ${BSD_INSTALL_SCRIPT} camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
-+	  ${BSD_INSTALL_DATA} $(OBJSX) "$(LIBDIR)/camlp4/."; \
- 	  for file in $(OBJSX); do \
--	    cp "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
-+	    ${BSD_INSTALL_DATA} "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \
- 	  done ; \
- 	fi
- 
diff --git a/lang/ocaml/patches/patch-ap b/lang/ocaml/patches/patch-ap
deleted file mode 100644
index 043869ccf9d..00000000000
--- a/lang/ocaml/patches/patch-ap
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/ocpp/Makefile.orig	2004-10-14 16:20:22.000000000 +0100
-+++ camlp4/ocpp/Makefile	2004-10-14 16:21:32.000000000 +0100
-@@ -18,8 +18,9 @@
- 	rm -f *.cm[ioa] *.pp[io] *.o *.out *.bak .*.bak ocpp$(EXE)
- 
- install:
--	-$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
--	cp $(OBJS) "$(LIBDIR)/camlp4/."
--	cp ocpp$(EXE) "$(BINDIR)/."
-+	-${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4" 
-+	-${BSD_INSTALL_DATA_DIR} "$(BINDIR)"
-+	${BSD_INSTALL_DATA} $(OBJS) "$(LIBDIR)/camlp4/."
-+	${BSD_INSTALL_SCRIPT} ocpp$(EXE) "$(BINDIR)/."
- 
- depend:
diff --git a/lang/ocaml/patches/patch-aq b/lang/ocaml/patches/patch-aq
deleted file mode 100644
index 7304df87d4e..00000000000
--- a/lang/ocaml/patches/patch-aq
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/odyl/Makefile.orig	2004-10-15 15:13:11.000000000 +0100
-+++ camlp4/odyl/Makefile	2004-10-15 15:14:30.000000000 +0100
-@@ -66,16 +66,17 @@
- compare:
- 
- install:
--	-$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
--	cp odyl.cmo odyl.cma odyl_main.cmi $(LIBDIR)/camlp4/.
-+	-${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+	-${BSD_INSTALL_DATA_DIR} "$(BINDIR)"
-+	${BSD_INSTALL_DATA} odyl.cmo odyl.cma odyl_main.cmi $(LIBDIR)/camlp4/.
- 	for f in odyl.$(A) odyl.p.$(A)  ; do \
- 	   if test -f $$f ; then \
--		cp $$f "$(LIBDIR)/camlp4/."  && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
-+		${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/."  && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
- 	   fi ; \
- 	done
- 	for f in odyl.cmx odyl.o odyl.p.cmx odyl.p.o odyl.cmxa odyl.p.cmxa ; do \
- 	    if test -f $$f ; then \
--	       cp $$f "$(LIBDIR)/camlp4/." ; \
-+	       ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." ; \
- 	    fi ; \
- 	done
- 
diff --git a/lang/ocaml/patches/patch-ar b/lang/ocaml/patches/patch-ar
deleted file mode 100644
index 7b2c61ac088..00000000000
--- a/lang/ocaml/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2005/02/04 21:35:51 adrianp Exp $
-
---- camlp4/top/Makefile.orig	2004-10-15 15:15:30.000000000 +0100
-+++ camlp4/top/Makefile	2004-10-15 15:16:24.000000000 +0100
-@@ -42,7 +42,7 @@
- get_promote:
- 
- install:
--	-$(MKDIR) "$(LIBDIR)/camlp4"
--	cp $(TARGET) "$(LIBDIR)/camlp4/."
-+	-${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
-+	${BSD_INSTALL_DATA} $(TARGET) "$(LIBDIR)/camlp4/."
- 
- include .depend
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index 4c923d51a3e..b6feea61ceb 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,17 +1,17 @@
-$NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
+$NetBSD: patch-at,v 1.14 2007/09/14 15:34:12 adam Exp $
 
---- configure.orig	2006-03-30 05:00:19.000000000 -0500
+--- configure.orig	2007-05-03 14:49:56.000000000 +0200
 +++ configure
-@@ -483,7 +483,7 @@ mksharedlibrpath=''
+@@ -488,7 +488,7 @@ mksharedlibrpath=''
  
  if test $withsharedlibs = "yes"; then
    case "$host" in
--    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*)
-+    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*|*-*-netbsd*|*-*-dragonfly*)
+-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-gnu*)
++    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly*)
        sharedcccompopts="-fPIC"
        mksharedlib="$bytecc -shared -o"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -567,16 +567,18 @@ case "$host" in
+@@ -572,16 +572,18 @@ case "$host" in
    alpha*-*-netbsd*)             arch=alpha; system=netbsd;;
    alpha*-*-openbsd*)            arch=alpha; system=openbsd;;
    sparc*-*-sunos4.*)            arch=sparc; system=sunos;;
@@ -31,15 +31,7 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
    i[3456]86-*-darwin*)          arch=i386; system=macosx;;
    i[3456]86-*-gnu*)             arch=i386; system=gnu;;
    mips-*-irix6*)                arch=mips; system=irix;;
-@@ -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
+@@ -680,6 +682,7 @@ case "$arch,$model,$system" in
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
    amd64,*,gnu) profiling='prof';;
@@ -47,15 +39,16 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
    *) profiling='noprof';;
  esac
  
-@@ -1060,6 +1064,7 @@ if test "$pthread_wanted" = "yes"; then
-   case "$host" in
-     *-*-solaris*)  pthread_link="-lpthread -lposix4";;
-     *-*-freebsd*)  pthread_link="-pthread";;
-+    *-*-dragonfly*)  pthread_link="-pthread";;
-     *-*-openbsd*)  pthread_link="-pthread";;
-     *)             pthread_link="-lpthread";;
-   esac
-@@ -1107,6 +1112,7 @@ fi
+@@ -1070,6 +1073,8 @@ if test "$pthread_wanted" = "yes"; then
+                    pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
+     *-*-freebsd*)  pthread_link="-pthread"
+                    pthread_caml_link="-cclib -pthread";;
++    *-*-dragonfly*) pthread_link="-pthread"
++                   pthread_caml_link="-cclib -pthread";;
+     *-*-openbsd*)  pthread_link="-pthread"
+                    pthread_caml_link="-cclib -pthread";;
+     *)             pthread_link="-lpthread"
+@@ -1121,6 +1126,7 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -63,7 +56,7 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
  for dir in \
      $x11_include_dir          \
                                \
-@@ -1153,6 +1159,7 @@ do
+@@ -1167,6 +1173,7 @@ do
      break
    fi
  done
@@ -71,7 +64,7 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill Exp $
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
-@@ -1242,31 +1249,8 @@ dbm_include="not found"
+@@ -1256,31 +1263,8 @@ dbm_include="not found"
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -105,13 +98,13 @@ $NetBSD: patch-at,v 1.13 2007/01/06 00:11:43 dmcmahill 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 +1262,8 @@ else
+@@ -1290,8 +1274,8 @@ else
+   else
+     dbm_include="-I$dbm_include"
    fi
-   echo "DBM_INCLUDES=$dbm_include" >> Makefile
-   echo "DBM_LINK=$dbm_link" >> Makefile
 -  if test "$use_gdbm_ndbm" = "yes"; then
 -    echo "#define DBM_USES_GDBM_NDBM" >> s.h
-+  if test ${BDB_BUILTIN} != "yes"; then
++  if test ${BDB_BUILTIN} = "yes"; then
 +    echo "#define DBM_USES_DB" >> s.h
    fi
    otherlibraries="$otherlibraries dbm"
diff --git a/lang/ocaml/patches/patch-au b/lang/ocaml/patches/patch-au
index 0c3003caea1..a1b657d5fe6 100644
--- a/lang/ocaml/patches/patch-au
+++ b/lang/ocaml/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-au,v 1.3 2007/09/14 15:34:12 adam Exp $
 
---- debugger/Makefile.orig	2004-10-15 15:22:45.000000000 +0100
-+++ debugger/Makefile	2004-10-15 15:23:10.000000000 +0100
-@@ -81,7 +81,7 @@
+--- debugger/Makefile.orig	2006-12-09 14:49:10.000000000 +0100
++++ debugger/Makefile
+@@ -83,7 +83,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS)
  	$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS)
  
  install:
diff --git a/lang/ocaml/patches/patch-aw b/lang/ocaml/patches/patch-aw
index bc6ff1eed57..14f7b48eb1f 100644
--- a/lang/ocaml/patches/patch-aw
+++ b/lang/ocaml/patches/patch-aw
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.5 2006/10/03 21:06:25 adam Exp $
+$NetBSD: patch-aw,v 1.6 2007/09/14 15:34:12 adam Exp $
 
---- ocamldoc/Makefile.orig	2006-08-10 14:45:09.000000000 +0200
+--- ocamldoc/Makefile.orig	2007-09-02 08:28:20.000000000 +0200
 +++ ocamldoc/Makefile
 @@ -258,24 +258,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
  # Installation targets
@@ -19,7 +19,7 @@ $NetBSD: patch-aw,v 1.5 2006/10/03 21:06:25 adam Exp $
 +	${BSD_INSTALL_DATA} ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
 +	${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
  	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
--	$(CP) stdlib_man/* $(INSTALL_MANODIR)
+-	if test -d stdlib_man; then $(CP) stdlib_man/* $(INSTALL_MANODIR); else : ; fi
 +	${BSD_INSTALL_MAN} stdlib_man/* $(INSTALL_MANODIR)
  
  installopt:
diff --git a/lang/ocaml/patches/patch-az b/lang/ocaml/patches/patch-az
index 046888aaa1f..ae0c667e05f 100644
--- a/lang/ocaml/patches/patch-az
+++ b/lang/ocaml/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.1 2004/04/22 09:18:40 tron Exp $
+$NetBSD: patch-az,v 1.2 2007/09/14 15:34:12 adam Exp $
 
---- otherlibs/dynlink/Makefile.orig	Sun Jan 20 16:12:28 2002
-+++ otherlibs/dynlink/Makefile	Thu Apr 22 10:34:37 2004
-@@ -38,7 +38,7 @@
+--- 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
  	$(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo
  
  install:
diff --git a/lang/ocaml/patches/patch-ba b/lang/ocaml/patches/patch-ba
index ede411eea6f..c088eea37c3 100644
--- a/lang/ocaml/patches/patch-ba
+++ b/lang/ocaml/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.4 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-ba,v 1.5 2007/09/14 15:34:12 adam Exp $
 
---- otherlibs/graph/Makefile.orig	2003-08-05 13:39:33.000000000 +0000
+--- otherlibs/graph/Makefile.orig	2007-01-29 13:11:16.000000000 +0100
 +++ otherlibs/graph/Makefile
 @@ -18,10 +18,10 @@
  include ../../config/Makefile
@@ -10,11 +10,11 @@ $NetBSD: patch-ba,v 1.4 2005/03/24 11:32:50 adam Exp $
 -CAMLC=../../ocamlcomp.sh
 -CAMLOPT=../../ocamlcompopt.sh
 -MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-+CFLAGS+=-I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++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
+ COMPFLAGS=-warn-error A -g
  
  OBJS=open.o draw.o fill.o color.o text.o \
 @@ -50,13 +50,13 @@ clean: partialclean
diff --git a/lang/ocaml/patches/patch-bn b/lang/ocaml/patches/patch-bn
index 1681eaa777f..1031b61526a 100644
--- a/lang/ocaml/patches/patch-bn
+++ b/lang/ocaml/patches/patch-bn
@@ -1,6 +1,6 @@
-$NetBSD: patch-bn,v 1.3 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-bn,v 1.4 2007/09/14 15:34:12 adam Exp $
 
---- otherlibs/str/Makefile.orig	2002-12-09 14:05:18.000000000 +0000
+--- otherlibs/str/Makefile.orig	2007-01-29 13:11:16.000000000 +0100
 +++ otherlibs/str/Makefile
 @@ -19,7 +19,7 @@ include ../../config/Makefile
  
@@ -10,7 +10,7 @@ $NetBSD: patch-bn,v 1.3 2005/03/24 11:32:50 adam Exp $
 +CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
  CAMLC=../../ocamlcomp.sh
  CAMLOPT=../../ocamlcompopt.sh
- COMPFLAGS=-warn-error A
+ COMPFLAGS=-warn-error A -g
 @@ -48,13 +48,13 @@ clean: partialclean
  	rm -f *.a *.so *.o
  
diff --git a/lang/ocaml/patches/patch-bq b/lang/ocaml/patches/patch-bq
index fe18a01e8d5..6460a157a57 100644
--- a/lang/ocaml/patches/patch-bq
+++ b/lang/ocaml/patches/patch-bq
@@ -1,6 +1,6 @@
-$NetBSD: patch-bq,v 1.2 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-bq,v 1.3 2007/09/14 15:34:12 adam Exp $
 
---- otherlibs/unix/Makefile.orig	2004-04-09 13:25:20.000000000 +0000
+--- otherlibs/unix/Makefile.orig	2007-02-07 16:49:11.000000000 +0100
 +++ otherlibs/unix/Makefile
 @@ -19,7 +19,7 @@ include ../../config/Makefile
  
@@ -11,7 +11,7 @@ $NetBSD: patch-bq,v 1.2 2005/03/24 11:32:50 adam Exp $
  CAMLC=../../ocamlcomp.sh
  CAMLOPT=../../ocamlcompopt.sh
  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-@@ -66,13 +66,13 @@ clean: partialclean
+@@ -66,14 +66,14 @@ clean: partialclean
  	rm -f *.a *.o *.so
  
  install:
@@ -21,7 +21,9 @@ $NetBSD: patch-bq,v 1.2 2005/03/24 11:32:50 adam Exp $
 +	${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)
diff --git a/lang/ocaml/patches/patch-bs b/lang/ocaml/patches/patch-bs
index 892ab4a812f..9df022fa35c 100644
--- a/lang/ocaml/patches/patch-bs
+++ b/lang/ocaml/patches/patch-bs
@@ -1,6 +1,6 @@
-$NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
 
---- tools/Makefile.orig	2005-11-17 15:26:37.000000000 +0100
+--- tools/Makefile.orig	2007-02-07 11:31:36.000000000 +0100
 +++ tools/Makefile
 @@ -49,9 +49,9 @@ clean::
  	rm -f ocamldep.opt
@@ -36,8 +36,8 @@ $NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
  
  clean::
  	rm -f ocamlmktop
-@@ -92,7 +92,7 @@ ocamlmklib: ocamlmklib.cmo
- 	$(CAMLC) $(LINKFLAGS) -o ocamlmklib ocamlmklib.cmo
+@@ -97,7 +97,7 @@ myocamlbuild_config.ml: ../config/Makefi
+ 	cp ../myocamlbuild_config.ml .
  
  install::
 -	cp ocamlmklib $(BINDIR)/ocamlmklib
@@ -45,7 +45,7 @@ $NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
  
  clean::
  	rm -f ocamlmklib
-@@ -141,7 +141,7 @@ lexer301.ml: lexer301.mll
+@@ -146,7 +146,7 @@ lexer301.ml: lexer301.mll
  	$(CAMLLEX) lexer301.mll
  
  install::
@@ -54,7 +54,7 @@ $NetBSD: patch-bs,v 1.4 2006/01/16 09:41:48 adam Exp $
  
  clean::
  	rm -f scrapelabels lexer301.ml
-@@ -157,7 +157,7 @@ addlabels: addlabels.ml
+@@ -162,7 +162,7 @@ addlabels: addlabels.ml
  		$(ADDLABELS_IMPORTS) addlabels.ml
  
  install::
diff --git a/lang/ocaml/patches/patch-bt b/lang/ocaml/patches/patch-bt
index fe9f5abd94f..dbd1f964080 100644
--- a/lang/ocaml/patches/patch-bt
+++ b/lang/ocaml/patches/patch-bt
@@ -1,8 +1,8 @@
-$NetBSD: patch-bt,v 1.2 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-bt,v 1.3 2007/09/14 15:34:12 adam Exp $
 
---- Makefile.orig	2005-09-24 18:20:36.000000000 +0200
+--- Makefile.orig	2007-04-16 18:01:59.000000000 +0200
 +++ Makefile
-@@ -232,24 +232,24 @@ opt.opt: checkstack core ocaml opt-core 
+@@ -234,24 +234,24 @@ opt.opt: checkstack runtime core ocaml o
  
  # Installation
  install: FORCE
@@ -40,7 +40,7 @@ $NetBSD: patch-bt,v 1.2 2006/01/16 09:41:48 adam Exp $
  	cd tools; $(MAKE) install
  	-cd man; $(MAKE) install
  	for i in $(OTHERLIBRARIES); do \
-@@ -265,16 +265,16 @@ install: FORCE
+@@ -267,16 +267,16 @@ install: FORCE
  # Installation of the native-code compiler
  installopt:
  	cd asmrun; $(MAKE) install
diff --git a/lang/ocaml/patches/patch-bv b/lang/ocaml/patches/patch-bv
deleted file mode 100644
index 839dc22a8b0..00000000000
--- a/lang/ocaml/patches/patch-bv
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bv,v 1.3 2006/10/03 21:06:25 adam Exp $
-
---- 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 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