diff options
author | minskim <minskim> | 2005-06-07 00:59:48 +0000 |
---|---|---|
committer | minskim <minskim> | 2005-06-07 00:59:48 +0000 |
commit | 74effee896305ad2e5881dd67ea7766f428571c3 (patch) | |
tree | 418ae9956af601301b7801efbb88fec4ba7d6188 /lang/ocaml | |
parent | c07184e7a4b7f5acc2a05e4d39439ddf246aa6fd (diff) | |
download | pkgsrc-74effee896305ad2e5881dd67ea7766f428571c3.tar.gz |
Make ocaml build with pkgsrc bdb.
Diffstat (limited to 'lang/ocaml')
-rw-r--r-- | lang/ocaml/Makefile | 7 | ||||
-rw-r--r-- | lang/ocaml/distinfo | 5 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-ab | 15 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-at | 49 |
4 files changed, 71 insertions, 5 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index adddf4864d7..d5e1a2add7f 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,9 +1,13 @@ -# $NetBSD: Makefile,v 1.36 2005/02/04 21:35:51 adrianp Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/07 00:59:48 minskim Exp $ .include "Makefile.common" CONFIGURE_ARGS+= -no-tk CONFIGURE_ENV+= disable_x11=yes +CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS} \ + BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}} + +CPPFLAGS+= -DDB_DBM_HSEARCH BUILD_TARGET= world .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ @@ -20,4 +24,5 @@ PLIST_SRC+= ${PKGDIR}/PLIST PLIST_SRC+= ${PKGDIR}/PLIST.stub .endif +.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index a496d49a9c8..e292fadf6f8 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.28 2005/03/26 16:20:35 adam Exp $ +$NetBSD: distinfo,v 1.29 2005/06/07 00:59:48 minskim Exp $ SHA1 (ocaml-3.08.3.tar.bz2) = c31dfbad9317853dd64d4234f46c6d61eb4b8677 RMD160 (ocaml-3.08.3.tar.bz2) = cf09753d9e61ed5148e59d1b1b923f80d9dd4d01 Size (ocaml-3.08.3.tar.bz2) = 2055260 bytes SHA1 (patch-aa) = 3f8945cac58be358ef4e3e15b6fc2d1ddf43d8be +SHA1 (patch-ab) = 66e50b0a601aa7c71655672685a48d04d8623230 SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3 SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488 @@ -17,7 +18,7 @@ SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5 -SHA1 (patch-at) = 1d18a9e0f3e5a4000d834a0716a8baae22ba7a7d +SHA1 (patch-at) = fcd0c25e72d02c218e0c3d64d586951e0fb0c8f1 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2 SHA1 (patch-aw) = d04e90deb9b13ecd67b2653623ed4c2039d348af 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 |