Fix building with db5; revision bump for db4 update

5 files changed, 70 insertions, 14 deletions

diff --git a/net/gift-openft/Makefile b/net/gift-openft/Makefile
index 872e6b830ea..86686577fb4 100644
--- a/net/gift-openft/Makefile
+++ b/net/gift-openft/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/12/21 20:34:06 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.17 2010/06/02 13:10:05 adam Exp $
 
 DISTNAME=	gift-openft-0.2.1.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gift/}
 
@@ -12,15 +11,16 @@ COMMENT=	OpenFT Plugin for the gift daemon
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-GNU_CONFIGURE=	yes
+BDB_ACCEPTED=		db4 db5
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
 
 PTHREAD_AUTO_VARS=	yes
 SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../net/gift/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gift-openft/distinfo b/net/gift-openft/distinfo
index cc45cf8ecfe..60b6546ae80 100644
--- a/net/gift-openft/distinfo
+++ b/net/gift-openft/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/01/25 23:33:06 wiz Exp $
+$NetBSD: distinfo,v 1.5 2010/06/02 13:10:05 adam Exp $
 
 SHA1 (gift-openft-0.2.1.6.tar.gz) = 7f7c19a3835859c3d76b7b32413161f2c9b007f4
 RMD160 (gift-openft-0.2.1.6.tar.gz) = 492ef2bb691de81a1de099a13c70bce0398adb0b
 Size (gift-openft-0.2.1.6.tar.gz) = 469969 bytes
-SHA1 (patch-aa) = 4a997c48d3bc3faf6a9a3172ddbaad0d66849ecd
+SHA1 (patch-aa) = dff35a901a7f25d1855a8cf7e3b0f394589d488c
+SHA1 (patch-ab) = 97e559c94f043b4481ed60cb972060a6acb11654
+SHA1 (patch-ac) = 9375a9967a8e93edd98a3a6e7c651c96a2d60b79
diff --git a/net/gift-openft/patches/patch-aa b/net/gift-openft/patches/patch-aa
index 191892a58cb..fdc57231351 100644
--- a/net/gift-openft/patches/patch-aa
+++ b/net/gift-openft/patches/patch-aa
@@ -1,8 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2004/07/27 15:39:21 recht Exp $
+$NetBSD: patch-aa,v 1.3 2010/06/02 13:10:05 adam Exp $
 
---- configure.orig	2004-05-08 04:24:24.000000000 +0200
-+++ configure	2004-07-27 17:32:35.000000000 +0200
-@@ -20100,7 +20100,7 @@
+--- configure.orig	2005-05-01 00:05:57.000000000 +0000
++++ configure
+@@ -19940,7 +19940,7 @@ if test x$use_libdb = xyes; then
+ 
+ 
+ 
+-for ac_header in db4/db.h db.h db3/db.h
++for ac_header in db5/db.h db4/db.h db.h db3/db.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -20094,13 +20094,13 @@ done
+ fi
+ if (test x$use_libdb = xyes) && ( test x$found_dbh = xyes); then
+ # AC_MSG_NOTICE([Checking for min version 3.2.9...])
+-    for dbname in db db3 db-3.0 db4 db-4.0 db-4; do
++    for dbname in db db3 db4 db5; do
+       ac_save_CFLAGS="$CFLAGS"
+       ac_save_LIBS="$LIBS"
        LIBS="$LIBS -l$dbname"
        echo "$as_me:$LINENO: checking for libdb (-l$dbname)" >&5
  echo $ECHO_N "checking for libdb (-l$dbname)... $ECHO_C" >&6
@@ -11,7 +27,17 @@ $NetBSD: patch-aa,v 1.2 2004/07/27 15:39:21 recht Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$cross_compiling" = yes; then
-@@ -20179,7 +20179,7 @@
+@@ -20117,6 +20117,9 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++        #ifdef HAVE_DB5_DB_H
++        #include <db5/db.h>
++        #endif
+         #ifdef HAVE_DB4_DB_H
+         #include <db4/db.h>
+         #endif
+@@ -20179,7 +20182,7 @@ echo "$as_me:$LINENO: result: $found_lib
  echo "${ECHO_T}$found_libdb" >&6
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
diff --git a/net/gift-openft/patches/patch-ab b/net/gift-openft/patches/patch-ab
new file mode 100644
index 00000000000..798482c6b37
--- /dev/null
+++ b/net/gift-openft/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.3 2010/06/02 13:10:05 adam Exp $
+
+--- src/ft_search_db.h.orig	2010-06-02 06:12:21.000000000 +0000
++++ src/ft_search_db.h
+@@ -77,6 +77,9 @@
+ /*****************************************************************************/
+ 
+ #ifdef USE_LIBDB
++# ifdef HAVE_DB5_DB_H
++#  include <db5/db.h>
++# endif
+ # ifdef HAVE_DB4_DB_H
+ #  include <db4/db.h>
+ # endif
diff --git a/net/gift-openft/patches/patch-ac b/net/gift-openft/patches/patch-ac
new file mode 100644
index 00000000000..6cc9ac7ef3c
--- /dev/null
+++ b/net/gift-openft/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2010/06/02 13:10:05 adam Exp $
+
+--- config.h.in.orig	2010-06-02 06:19:09.000000000 +0000
++++ config.h.in
+@@ -6,6 +6,9 @@
+ /* Define to 1 if you have the <db4/db.h> header file. */
+ #undef HAVE_DB4_DB_H
+ 
++/* Define to 1 if you have the <db5/db.h> header file. */
++#undef HAVE_DB5_DB_H
++
+ /* Define to 1 if you have the <db.h> header file. */
+ #undef HAVE_DB_H
+