Get the db lib name right by using $BDB_LIBS. Also drop db4 as an option

as it reportedly doesn't work.

5 files changed, 13 insertions, 12 deletions

diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index f4530093453..6717b5a9e3b 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/10/15 11:54:11 tv Exp $
+# $NetBSD: Makefile,v 1.37 2004/11/27 10:46:37 markd Exp $
 
 DISTNAME=	kdevelop-3.1.1
 PKGNAME=	kdevelop-base-3.1.1
@@ -45,9 +45,10 @@ CONFIGURE_ARGS+= \
 	--with-qtdoc-dir=${QT3DIR}/qt3/doc/html \
 	--with-kdelibsdoxy-dir=${KDELIBDIR}/share/doc/kde/HTML/en/kdelibs-apidocs
 
-BDB_ACCEPTED=	db3 db4
+BDB_ACCEPTED=	db3
 .include "../../mk/bdb.buildlink3.mk"
 CPPFLAGS+= -I${BDBBASE}/include/${BDB_TYPE}
+MAKE_ENV+= BDB_LIBS="${BDB_LIBS}"
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index cf566ad1750..8c58146d858 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2004/10/13 13:00:53 markd Exp $
+$NetBSD: distinfo,v 1.15 2004/11/27 10:46:37 markd Exp $
 
 SHA1 (kdevelop-3.1.1.tar.bz2) = 5f70ba2c9a4281c2b855927545106459cdbc5932
 Size (kdevelop-3.1.1.tar.bz2) = 7911870 bytes
 SHA1 (patch-aa) = 7efffd47879e4d41923030f17087ab2c6c029e6c
 SHA1 (patch-ab) = a1b06e5abaeee53a3a7c61583326296f32dbf782
-SHA1 (patch-ac) = 99e472655c21d1efe933822cbad7cef0bf550aa5
-SHA1 (patch-ad) = 89a08baf91be02d2a78d0e4d46b2a06fc7f384d0
-SHA1 (patch-ae) = 32c4aec0503d0e0a0bd06449f8cdbe28b0f4253e
+SHA1 (patch-ac) = d7f377f7775502519a2843967fb6cd2c5ce9a834
+SHA1 (patch-ad) = dcd26e08910845b80d1db67091b400f1debb1413
+SHA1 (patch-ae) = daae38333bccae67e996a79b63b1b8041169b6f9
 SHA1 (patch-af) = 966f9b1854ca5bbbd97f7e77d3b8c39692d3ff56
 SHA1 (patch-ag) = aed55eb798ab40c571b23b22e8c22eb64ee8ab94
diff --git a/devel/kdevelop-base/patches/patch-ac b/devel/kdevelop-base/patches/patch-ac
index b4c802637b1..cd37f6fc35b 100644
--- a/devel/kdevelop-base/patches/patch-ac
+++ b/devel/kdevelop-base/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2004/08/21 15:39:02 markd Exp $
+$NetBSD: patch-ac,v 1.7 2004/11/27 10:46:37 markd Exp $
 
 --- languages/cpp/Makefile.in.orig	2004-08-21 09:24:14.000000000 +1200
 +++ languages/cpp/Makefile.in
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.6 2004/08/21 15:39:02 markd Exp $
 -libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -L$(top_srcdir)/bdb/dist
 -libkdevcppsupport_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la
 +libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-+libkdevcppsupport_la_LIBADD = -ldb $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la
++libkdevcppsupport_la_LIBADD = $(BDB_LIBS) $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la
  #>- libkdevcppsupport_la_SOURCES = cppsupportpart.cpp ccconfigwidget.cpp \
  #>- 	ccconfigwidgetbase.ui kdevdriver.cpp cppcodecompletion.cpp problemreporter.cpp \
  #>- 	configproblemreporter.ui backgroundparser.cpp ast_utils.cpp store_walker.cpp \
diff --git a/devel/kdevelop-base/patches/patch-ad b/devel/kdevelop-base/patches/patch-ad
index e14bd713374..1c833f203f1 100644
--- a/devel/kdevelop-base/patches/patch-ad
+++ b/devel/kdevelop-base/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2004/08/21 15:39:02 markd Exp $
+$NetBSD: patch-ad,v 1.7 2004/11/27 10:46:37 markd Exp $
 
 --- languages/java/Makefile.in.orig	2004-08-21 09:31:20.000000000 +1200
 +++ languages/java/Makefile.in
@@ -19,7 +19,7 @@ $NetBSD: patch-ad,v 1.6 2004/08/21 15:39:02 markd Exp $
  kde_module_LTLIBRARIES = libkdevjavasupport.la
  libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 -libkdevjavasupport_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
-+libkdevjavasupport_la_LIBADD = -ldb $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
++libkdevjavasupport_la_LIBADD = $(BDB_LIBS) $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
  #>- libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \
  #>- JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui  javasupportpart.cpp \
  #>- JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel
diff --git a/devel/kdevelop-base/patches/patch-ae b/devel/kdevelop-base/patches/patch-ae
index 4a14fcb86bc..bf66c9dc7f2 100644
--- a/devel/kdevelop-base/patches/patch-ae
+++ b/devel/kdevelop-base/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2004/08/21 15:39:02 markd Exp $
+$NetBSD: patch-ae,v 1.4 2004/11/27 10:46:37 markd Exp $
 
 --- languages/pascal/Makefile.in.orig	2004-08-14 12:07:01.000000000 +1200
 +++ languages/pascal/Makefile.in
@@ -21,7 +21,7 @@ $NetBSD: patch-ae,v 1.3 2004/08/21 15:39:02 markd Exp $
 -libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
 -libkdevpascalsupport_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
 +libkdevpascalsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-+libkdevpascalsupport_la_LIBADD = -ldb $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
++libkdevpascalsupport_la_LIBADD = $(BDB_LIBS) $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
  #>- libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp
  #>+ 1
  libkdevpascalsupport_la_SOURCES=pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp  problemreporter.cpp configproblemreporter.cpp