Fix building with db5; revision bump for db4 update

5 files changed, 164 insertions, 7 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 7b0c1447cde..5b6771b289c 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2010/01/18 09:58:45 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/02 12:26:13 adam Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
@@ -12,7 +12,12 @@ CONFLICTS+=	umbrello-[0-9]*
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
+BDB_ACCEPTED=		db4 db5
 USE_TOOLS+=		lex perl:run
+CONFIGURE_ARGS+=	--with-db-dir=${BDBBASE}
+CONFIGURE_ARGS+=	--with-db-include=${BDB_TYPE}/db.h
+#CONFIGURE_ARGS+=	--with-db-include-dir=${BDBBASE}/include/${BDB_TYPE}
+CONFIGURE_ARGS+=	--with-db-name=${BDB_TYPE}
 
 REPLACE_PERL+=	cervisia/change_colors.pl \
 		cervisia/move_repositories.pl \
@@ -76,9 +81,10 @@ post-install:
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 765876f0335..0df0bcd30ae 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/01/18 09:58:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2010/06/02 12:26:13 adam Exp $
 
 BUILDLINK_TREE+=	kdesdk
 
@@ -9,10 +9,11 @@ BUILDLINK_API_DEPENDS.kdesdk+=	kdesdk>=3.5.0nb1
 BUILDLINK_ABI_DEPENDS.kdesdk?=	kdesdk>=3.5.10nb6
 BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
 
-.include "../../databases/db4/buildlink3.mk"
+BDB_ACCEPTED?=		db4 db5
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .endif # KDESDK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-kdesdk
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 93cbc81f7ad..ac70f2b4628 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2008/08/27 12:25:46 markd Exp $
+$NetBSD: distinfo,v 1.36 2010/06/02 12:26:13 adam Exp $
 
 SHA1 (kdesdk-3.5.10.tar.bz2) = 1a6702e8e7741690496327b8a908fabdab5d3c79
 RMD160 (kdesdk-3.5.10.tar.bz2) = 28a296667d66021c3b13c1991e1028d5e8554dfd
@@ -6,3 +6,4 @@ Size (kdesdk-3.5.10.tar.bz2) = 5252055 bytes
 SHA1 (patch-aa) = ab73e4306efb33344012f95c059ea0ed0adfafd1
 SHA1 (patch-ab) = 436454d5f54cdf783a5a1cb3d70a2e8398695f60
 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307
+SHA1 (patch-ad) = 5ae3bd5af9b76d7824d166109352bb8916c946f7
diff --git a/devel/kdesdk3/patches/patch-ad b/devel/kdesdk3/patches/patch-ad
new file mode 100644
index 00000000000..1e1857a1ec0
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ad
@@ -0,0 +1,29 @@
+$NetBSD: patch-ad,v 1.7 2010/06/02 12:26:13 adam Exp $
+
+--- configure.orig	2008-08-20 15:51:23.000000000 +0000
++++ configure
+@@ -33895,7 +33895,7 @@ fi
+ 
+ # Check whether --with-db-include was given.
+ if test "${with_db_include+set}" = set; then
+-  withval=$with_db_include;   ac_db_include_file=-I"$withval"
++  withval=$with_db_include;   ac_db_include_file="$withval"
+ 
+ fi
+ 
+@@ -33941,14 +33941,10 @@ int
+ main ()
+ {
+ 
+-#if DB_VERSION_MAJOR == 4
++#if DB_VERSION_MAJOR >= 4
+ DB *db;
+-#if DB_VERSION_MINOR > 0
+ db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+ #else
+-db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#endif
+-#else
+ error
+ #endif
+ 
diff --git a/devel/kdesdk3/patches/patch-ae b/devel/kdesdk3/patches/patch-ae
new file mode 100644
index 00000000000..82323747c8d
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ae
@@ -0,0 +1,120 @@
+$NetBSD: patch-ae,v 1.5 2010/06/02 12:26:13 adam Exp $
+
+--- kbabel/kbabeldict/modules/dbsearchengine/database.cpp.orig	2010-06-01 14:22:58.000000000 +0000
++++ kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+@@ -341,9 +341,7 @@ DataBaseManager::openDataBase ()
+     db_create (&indexDb, 0, 0);
+ 
+     ret = db->open (db,
+-#if DB_VERSION_MINOR > 0
+ 		    NULL,
+-#endif
+ 		    transfilename.local8Bit (), 0, DB_BTREE, 0, 0644);
+ 
+     if (ret == DB_OLD_VERSION)
+@@ -457,9 +455,7 @@ DataBaseManager::openDataBase ()
+ 		keysFile.unlink ();
+ 
+ 		ret = db->open (db,
+-#if DB_VERSION_MINOR > 0
+ 				NULL,
+-#endif
+ 				transfilename.local8Bit (), 0, DB_BTREE, 0,
+ 				0644);
+ 		if (ret != 0)
+@@ -483,9 +479,7 @@ DataBaseManager::openDataBase ()
+ 
+ 
+     ret = infoDb->open (infoDb,
+-#if DB_VERSION_MINOR > 0
+ 			NULL,
+-#endif
+ 			infofilename.local8Bit (), 0, DB_RECNO, 0, 0644);
+     if (ret != 0)
+       {
+@@ -501,9 +495,7 @@ DataBaseManager::openDataBase ()
+ // Words index database
+ 
+     ret = wordDb->open (wordDb,
+-#if DB_VERSION_MINOR > 0
+ 			NULL,
+-#endif
+ 			wordsfilename.local8Bit (), 0, DB_BTREE, 0, 0644);
+     if (ret != 0)
+       {
+@@ -515,9 +507,7 @@ DataBaseManager::openDataBase ()
+ //Index of keys.
+ 
+     ret = indexDb->open (indexDb,
+-#if DB_VERSION_MINOR > 0
+ 			 NULL,
+-#endif
+ 			 keysfilename.local8Bit (), 0, DB_RECNO, 0, 0644);
+     if (ret != 0)
+       {
+@@ -740,11 +730,7 @@ int
+ DataBaseManager::count ()
+ {
+     DB_BTREE_STAT *dstat = 0;
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
+     db->stat (db, NULL, &dstat, DB_FAST_STAT);
+-#else
+-    db->stat (db, &dstat, DB_FAST_STAT);
+-#endif
+     int ret = dstat->bt_nkeys;
+     free (dstat);
+ 
+@@ -800,9 +786,7 @@ DataBaseManager::createDataBase (QString
+ 
+     db->set_flags (db, DB_RECNUM);
+     ret = db->open (db,
+-#if DB_VERSION_MINOR > 0
+ 		    NULL,
+-#endif
+ 		    filename.local8Bit (), 0, DB_BTREE, DB_CREATE | DB_EXCL,
+ 		    mode);
+     if (ret != 0)
+@@ -818,9 +802,7 @@ DataBaseManager::createDataBase (QString
+ 
+     db_create (&infoDb, 0, 0);
+     ret = infoDb->open (infoDb,
+-#if DB_VERSION_MINOR > 0
+ 			NULL,
+-#endif
+ 			filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode);
+     if (ret != 0)
+ 	iAmOk = false;
+@@ -833,9 +815,7 @@ DataBaseManager::createDataBase (QString
+ 
+     db_create (&wordDb, 0, 0);
+     ret = wordDb->open (wordDb,
+-#if DB_VERSION_MINOR > 0
+ 			NULL,
+-#endif
+ 			filename.local8Bit (), 0, DB_BTREE, DB_CREATE, mode);
+     if (ret != 0)
+ 	iAmOk = false;
+@@ -848,9 +828,7 @@ DataBaseManager::createDataBase (QString
+ 
+     db_create (&indexDb, 0, 0);
+     ret = indexDb->open (indexDb,
+-#if DB_VERSION_MINOR > 0
+ 			 NULL,
+-#endif
+ 			 filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode);
+     if (ret != 0)
+ 	iAmOk = false;
+@@ -979,13 +957,8 @@ DataBaseManager::loadInfo ()
+     int nrec;
+     DB_BTREE_STAT *stat;
+ // memset(&stat,0,sizeof(DB_BTREE_STAT));
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
+     if (infoDb->stat (infoDb, NULL, &stat, DB_FAST_STAT))
+ 	fprintf (stderr, "Cannot stat\n");
+-#else
+-    if (infoDb->stat (infoDb, &stat, DB_FAST_STAT))
+-	fprintf (stderr, "Cannot stat\n");
+-#endif
+     nrec = stat->bt_nkeys;
+     free (stat);
+