Make ocaml build with pkgsrc bdb.

2 files changed, 62 insertions, 2 deletions

diff --git a/lang/ocaml/patches/patch-ab b/lang/ocaml/patches/patch-ab
new file mode 100644
index 00000000000..174de108539
--- /dev/null
+++ b/lang/ocaml/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.4 2005/06/07 00:59:49 minskim Exp $
+
+--- otherlibs/dbm/cldbm.c.orig	2003-07-08 08:50:31.000000000 -0500
++++ otherlibs/dbm/cldbm.c
+@@ -21,8 +21,8 @@
+ #include <fail.h>
+ #include <callback.h>
+ 
+-#ifdef DBM_USES_GDBM_NDBM
+-#include <gdbm-ndbm.h>
++#ifdef DBM_USES_DB
++#include <db.h>
+ #else
+ #include <ndbm.h>
+ #endif
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index b05c7aed4be..4c569891448 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.5 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-at,v 1.6 2005/06/07 00:59:49 minskim Exp $
 
---- configure.orig	2005-01-24 15:22:46.000000000 +0000
+--- configure.orig	2005-01-24 09:22:46.000000000 -0600
 +++ configure
 @@ -573,6 +573,7 @@ case "$host" in
    i[3456]86-*-solaris*)         arch=i386; system=solaris;;
@@ -34,3 +34,48 @@ $NetBSD: patch-at,v 1.5 2005/03/24 11:32:50 adam Exp $
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
+@@ -1257,31 +1261,8 @@ dbm_include="not found"
+ dbm_link="not found"
+ use_gdbm_ndbm=no
+ 
+-for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do
+-  if test -f $dir/ndbm.h; then
+-    dbm_include=$dir
+-    if sh ./hasgot dbm_open; then
+-      dbm_link=""
+-    elif sh ./hasgot -lndbm dbm_open; then
+-      dbm_link="-lndbm"
+-    elif sh ./hasgot -ldb1 dbm_open; then
+-      dbm_link="-ldb1"
+-    elif sh ./hasgot -lgdbm dbm_open; then
+-      dbm_link="-lgdbm"
+-    elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
+-      dbm_link="-lgdbm_compat -lgdbm" 
+-    fi
+-    break
+-  fi
+-  if test -f $dir/gdbm-ndbm.h; then
+-    dbm_include=$dir
+-    use_gdbm_ndbm=yes
+-    if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
+-      dbm_link="-lgdbm_compat -lgdbm"
+-    fi
+-    break   
+-  fi
+-done
++dbm_include=/usr/include
++dbm_link=${BDB_LIBS}
+ if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
+   echo "NDBM not found, the \"dbm\" library will not be supported."
+ else
+@@ -1293,8 +1274,8 @@ else
+   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
++    echo "#define DBM_USES_DB" >> s.h
+   fi
+   otherlibraries="$otherlibraries dbm"
+ fi