[pkgsrc/trunk]: pkgsrc Let x11/labltk use bdb if native ndbm is not available.

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a7b378962ef
branches:  trunk
changeset: 495601:9a7b378962ef
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 14 21:00:41 2005 +0000

description:
Let x11/labltk use bdb if native ndbm is not available.

diffstat:

 lang/ocaml/Makefile        |  7 +------
 lang/ocaml/Makefile.common |  7 ++++++-
 x11/labltk/Makefile        |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (69 lines):

diff -r 68b1af2abea6 -r 9a7b378962ef lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Tue Jun 14 20:14:50 2005 +0000
+++ b/lang/ocaml/Makefile       Tue Jun 14 21:00:41 2005 +0000
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2005/06/07 00:59:48 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2005/06/14 21:00:41 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") || \
@@ -24,5 +20,4 @@
 PLIST_SRC+=    ${PKGDIR}/PLIST.stub
 .endif
 
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 68b1af2abea6 -r 9a7b378962ef lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Tue Jun 14 20:14:50 2005 +0000
+++ b/lang/ocaml/Makefile.common        Tue Jun 14 21:00:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/06/14 21:00:41 minskim Exp $
 
 DISTNAME=      ocaml-3.08.3
 CATEGORIES=    lang
@@ -17,6 +17,9 @@
 CONFIGURE_ARGS+=       -prefix ${PREFIX}
 CONFIGURE_ARGS+=       -libs "${LDFLAGS}"
 CONFIGURE_ARGS+=       -with-pthread
+CONFIGURE_ENV+=                BDB_LIBS=${BDB_LIBS} \
+                       BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}}
+CPPFLAGS+=             -DDB_DBM_HSEARCH
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,6 +27,8 @@
 INSTALL_UNSTRIPPED=    yes
 .endif
 
+.include "../../mk/bdb.buildlink3.mk"
+
 post-extract: cp-power-bsd cp-gnu-config
 
 cp-power-bsd:
diff -r 68b1af2abea6 -r 9a7b378962ef x11/labltk/Makefile
--- a/x11/labltk/Makefile       Tue Jun 14 20:14:50 2005 +0000
+++ b/x11/labltk/Makefile       Tue Jun 14 21:00:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/14 21:00:41 minskim Exp $
 
 .include "../../lang/ocaml/Makefile.common"
 
@@ -23,6 +23,7 @@
 .endif
 
 BUILDLINK_DEPMETHOD.ocaml=     full
+BUILDLINK_DEPMETHOD.${BDB_TYPE}=build
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"