Update libtabe to 1.2.6.

While here, add DESTDIR support and relax bdb dependency from db3 to db2-4.

0.2.6: 2004/09/20
---------------------
1. Remove the "-release" flag from libtool, such that the naming convention
   of libtabe/libbims is changed to be: libtabe.so.X.X.X/libbims.so.X.X.X.
   Add release number information into utilities.
   Thanks to Roger So <roger.so@sw-linux.com>.

2. Porting to DB3-3.3.11: DB->stat() only takes 3 arguements.
   Thanks to Pofeng Lee <informer@ns1.m2000.idv.tw>
	     Rui-Xiang Guo <rxg@ms25.url.com.tw>

3. Change the "rm $(PACKDB)" from "make clean" to "make distclean".
   Thanks to Kuang-che Wu <kcwu@ck.tp.edu.tw>.

4. Fix several memory leakage problem.
   Thanks to Kuang-che Wu <kcwu@ck.tp.edu.tw>.

5. Add util/tsiguess.c.
   Add API: tabeChunkInfoFree(), tabeChunkInfoNew(), tabeTsiInfoNew(),
	    tabeTsiInfoFree().
   Thanks to Pofeng Lee <informer@ns1.m2000.idv.tw>.

6. Add bims facility: user add Tsi by hand and store to user DB files.
   Thanks to Eric Cheng <eric@fractal.myip.org>.

7. Add bims facility: simple algorithm to learn new phrase input by user.
   Thanks to Pofeng Lee <informer@ns1.m2000.idv.tw>.

8. A quick fix for segfault when there is no ~/.xcin/*.db
   Fixed by Geoffrey Lee <snailtalk@linux-mandrake.com>

9. Fixed the bug of signed/unsigned TsiInfo->refcount ( µüÀW 0 bug )
   Found by FixeShao-yu Cheng <eric@netgenes.org>
   Fixed by Kuang-che Wu <kcwu@ck.tp.edu.tw>

10. By <thhsieh@linux.org.tw>
    Fix a bug in libtabe/util/tsiguess: Do not always try to open
    $HOME/.xcin/newdb. But one can use the flag "-u" to specify the
    path of user defined DB file.

11. Fix bug in tabe_tsi.c: tabeChunkSegmentationComplex():
    the same floating point number precision problem found in bims.c.
    Speed up and clean up tsiguess.c and tabe_tsi.c
    By Kuang-che Wu <kcwu@ck.tp.edu.tw>

12. Set DB_FLAG_READONLY or DB_FLAG_NOUNPACK_YIN flags in
    tsidump, tsiguess, tsiyincheck, tsiyindump utilities when necessary.
    By Kuang-che Wu <kcwu@ck.tp.edu.tw>

13. Support Berkeley DB 4.
    Thansks to Cheng-Lung Sung <clsung@dragon2.net>.

14. Builds without libbims if configure --without-x
    Builds with specific BerkeleyDB lib name if configure --with-db-name
    tsipackdb.in try all db*_dump, don't check db version anymore

15. Add bimsToggleTsiGuess() and bimsToggleNoTsiGuess() functions.
    Update autotools files.

10 files changed, 77 insertions, 333 deletions

diff --git a/inputmethod/libtabe/Makefile b/inputmethod/libtabe/Makefile
index aebab5d5c72..bc6cd91b618 100644
--- a/inputmethod/libtabe/Makefile
+++ b/inputmethod/libtabe/Makefile
@@ -1,35 +1,40 @@
-# $NetBSD: Makefile,v 1.17 2009/06/30 00:07:17 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/11/24 11:15:14 obache Exp $
 #
 
-DISTNAME=	libtabe-0.2.5
-PKGREVISION=	2
+DISTNAME=	libtabe-0.2.6
 CATEGORIES=	chinese inputmethod
-MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/
+MASTER_SITES=	ftp://cle.linux.org.tw/pub/xcin/cvs/
 
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://libtabe.sourceforge.net/
 COMMENT=	Library for Chinese language processing
+LICENSE=	modified-bsd
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
-WRKSRC=			${WRKDIR}/libtabe
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3
-CONFIGURE_ARGS+=	--with-db-lib=${BUILDLINK_PREFIX.db3}/lib
+CONFIGURE_ARGS+=	--with-db-inc=${BDBBASE}/include/${BDB_TYPE}
+CONFIGURE_ARGS+=	--with-db-lib=${BDBBASE}/lib
+
+INSTALL_MAKE_FLAGS+=	program_prefix=${DESTDIR}
+
+INSTALLATION_DIRS+=	share/doc/tabe
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tabe
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/tabe
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/tabe
 	${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README \
-		${PREFIX}/share/doc/tabe/README.bims
+		${DESTDIR}${PREFIX}/share/doc/tabe/README.bims
 	${INSTALL_DATA} ${WRKSRC}/tsi-src/README \
-		${PREFIX}/share/doc/tabe/README.tsi
+		${DESTDIR}${PREFIX}/share/doc/tabe/README.tsi
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../databases/db3/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+BDB_ACCEPTED=	db2 db3 db4
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/libtabe/PLIST b/inputmethod/libtabe/PLIST
index 8fc2952b55d..fb0153ba2c8 100644
--- a/inputmethod/libtabe/PLIST
+++ b/inputmethod/libtabe/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:01:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/11/24 11:15:14 obache Exp $
 bin/tsiadd
 bin/tsidel
 bin/tsidump
+bin/tsiguess
 bin/tsiyincheck
 bin/tsiyindump
 include/bims.h
diff --git a/inputmethod/libtabe/buildlink3.mk b/inputmethod/libtabe/buildlink3.mk
index e45ecb8da32..e2d4cc33ba3 100644
--- a/inputmethod/libtabe/buildlink3.mk
+++ b/inputmethod/libtabe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/11/24 11:15:14 obache Exp $
 
 BUILDLINK_TREE+=	libtabe
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=	libtabe
 LIBTABE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libtabe+=	libtabe>=0.2.5
-BUILDLINK_ABI_DEPENDS.libtabe+=	libtabe>=0.2.5nb2
+BUILDLINK_ABI_DEPENDS.libtabe+=	libtabe>=0.2.6
 BUILDLINK_PKGSRCDIR.libtabe?=	../../inputmethod/libtabe
 
-.include "../../databases/db3/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .endif # LIBTABE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libtabe
diff --git a/inputmethod/libtabe/distinfo b/inputmethod/libtabe/distinfo
index 938d7b56830..66315bb4a9b 100644
--- a/inputmethod/libtabe/distinfo
+++ b/inputmethod/libtabe/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/09/28 17:09:43 rillig Exp $
+$NetBSD: distinfo,v 1.5 2009/11/24 11:15:14 obache Exp $
 
-SHA1 (libtabe-0.2.5.tar.gz) = 487f3b34fa6e560c4baad5ac37af509f2850bc82
-RMD160 (libtabe-0.2.5.tar.gz) = da459dae44241d7d51fa94805eaca5a85ca1056d
-Size (libtabe-0.2.5.tar.gz) = 1615825 bytes
-SHA1 (patch-aa) = 051f5149580f57fa163a347545b8ba419383d932
-SHA1 (patch-ab) = 516061f376622d70d116e7d9a24595adbac99a34
-SHA1 (patch-ac) = 6e51271ca10b6cb1608ec31d471a1cd3a5e7ccd0
-SHA1 (patch-ad) = 2e78b153cde1d0f28a63a9c6c8a604372b88442e
-SHA1 (patch-ae) = e8d64b941173dfd4a987cd33e0dbf66cdbd96ee9
-SHA1 (patch-af) = 80a645473bff5e3d526c246e0fac451a8905594f
+SHA1 (libtabe-0.2.6.tar.gz) = d0c6a8a82e22567fa47e897ba7141414c9b71431
+RMD160 (libtabe-0.2.6.tar.gz) = 0d5d6d5cadb8d099ec77a28d54a0366efacc9ffd
+Size (libtabe-0.2.6.tar.gz) = 1788455 bytes
+SHA1 (patch-aa) = 08687575e08a088a2b8d6325b6bafd698daf6161
+SHA1 (patch-ad) = 474f0ff1a02d949d66f2802c25b81ed1722041d1
+SHA1 (patch-ae) = 52985fda50a11adce231122c87ddb060773a7707
+SHA1 (patch-af) = 2b5efdddc1e2e4b40c8a8f1d5f9b66df004688cc
diff --git a/inputmethod/libtabe/patches/patch-aa b/inputmethod/libtabe/patches/patch-aa
index c54b18a8343..594d8220deb 100644
--- a/inputmethod/libtabe/patches/patch-aa
+++ b/inputmethod/libtabe/patches/patch-aa
@@ -1,239 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2005/09/28 17:09:43 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2009/11/24 11:15:14 obache Exp $
 
---- configure.orig	Tue Dec  4 23:05:00 2001
-+++ configure	Fri Dec  7 23:17:32 2001
-@@ -5477,6 +5477,37 @@
- done
- 
- 
-+echo $ac_n "checking DB3 API""... $ac_c" 1>&6
-+echo "configure:5482: checking DB3 API" >&5
-+if test x$USE_DB = xDB3; then
-+    cat > conftest.$ac_ext <<EOF
-+#line 5485 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <db.h>
-+int main() {
-+
-+DB dbs;
-+dbs.stat(&dbs, NULL, 0); 
-+; return 0; }
-+EOF
-+if { (eval echo configure:5496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+   cat >> confdefs.h <<\EOF
-+#define HAVE_DB3_STAT3 1
-+EOF
-+
-+	  echo "$ac_t""DB->stat() take 3 arguements." 1>&6 
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+   echo "$ac_t""DB->stat() take 4 arguements." 1>&6 
-+fi
-+rm -f conftest*
-+fi
-+
- if test x$with_db_lib = x; then
-     with_db_lib="$test_db_lib"
- else
-@@ -5497,7 +5528,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:5501: checking for X" >&5
-+echo "configure:5532: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -5559,12 +5590,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 5563 "configure"
-+#line 5594 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -5633,14 +5664,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5637 "configure"
-+#line 5668 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:5644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -5735,12 +5766,12 @@
- 
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:5739: checking for ANSI C header files" >&5
-+echo "configure:5770: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5744 "configure"
-+#line 5775 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -5748,7 +5779,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -5765,7 +5796,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 5769 "configure"
-+#line 5800 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -5783,7 +5814,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 5787 "configure"
-+#line 5818 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -5804,7 +5835,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5808 "configure"
-+#line 5839 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -5815,7 +5846,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -5842,17 +5873,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5846: checking for $ac_hdr" >&5
-+echo "configure:5877: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5851 "configure"
-+#line 5882 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -5880,12 +5911,12 @@
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:5884: checking for working const" >&5
-+echo "configure:5915: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5889 "configure"
-+#line 5920 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -5934,7 +5965,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -5956,7 +5987,7 @@
- 
- 
- echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:5960: checking for 8-bit clean memcmp" >&5
-+echo "configure:5991: checking for 8-bit clean memcmp" >&5
- if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5964,7 +5995,7 @@
-   ac_cv_func_memcmp_clean=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5968 "configure"
-+#line 5999 "configure"
- #include "confdefs.h"
- 
- main()
-@@ -5974,7 +6005,7 @@
- }
- 
- EOF
--if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_memcmp_clean=yes
- else
-@@ -5994,12 +6025,12 @@
- for ac_func in strdup strerror strstr
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5998: checking for $ac_func" >&5
-+echo "configure:6029: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6003 "configure"
-+#line 6034 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6022,7 +6053,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
+--- configure.orig	2004-09-20 06:16:48.000000000 +0000
++++ configure
+@@ -19253,7 +19253,9 @@ errno = db_open("foo.db", DB_BTREE, DB_C
+ #endif
+ if(errno) return errno;
+ 
+-#if DB_VERSION >= 303011
++#if DB_VERSION >= 403000
++errno = dbp->stat(dbp, NULL, &sp, 0);
++#elif DB_VERSION >= 303011
+ errno = dbp->stat(dbp, &sp, 0);
+ #else
+ errno = dbp->stat(dbp, &sp, NULL, 0);
diff --git a/inputmethod/libtabe/patches/patch-ab b/inputmethod/libtabe/patches/patch-ab
deleted file mode 100644
index 4639f8c1842..00000000000
--- a/inputmethod/libtabe/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/09/28 17:09:43 rillig Exp $
-
---- script/acconfig.h.orig	Mon Aug 20 11:53:03 2001
-+++ script/acconfig.h	Fri Dec  7 23:13:28 2001
-@@ -21,6 +21,8 @@
- 
- #undef HAVE_DB3
- 
-+#undef HAVE_DB3_STAT3
-+
- #undef LINUX
- 
- #undef FREEBSD
diff --git a/inputmethod/libtabe/patches/patch-ac b/inputmethod/libtabe/patches/patch-ac
deleted file mode 100644
index 303606d0673..00000000000
--- a/inputmethod/libtabe/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/09/28 17:09:43 rillig Exp $
-
---- script/config.h.in.orig	Sat Oct 20 19:22:07 2001
-+++ script/config.h.in	Fri Dec  7 23:17:32 2001
-@@ -13,6 +13,8 @@
- 
- #undef HAVE_DB3
- 
-+#undef HAVE_DB3_STAT3
-+
- #undef LINUX
- 
- #undef FREEBSD
diff --git a/inputmethod/libtabe/patches/patch-ad b/inputmethod/libtabe/patches/patch-ad
index f5e58e37aa3..85c1f3d2d66 100644
--- a/inputmethod/libtabe/patches/patch-ad
+++ b/inputmethod/libtabe/patches/patch-ad
@@ -1,23 +1,15 @@
-$NetBSD: patch-ad,v 1.1 2005/09/28 17:09:43 rillig Exp $
+$NetBSD: patch-ad,v 1.2 2009/11/24 11:15:14 obache Exp $
 
---- script/configure.in.orig	Tue Dec  4 23:05:00 2001
-+++ script/configure.in	Fri Dec  7 23:17:29 2001
-@@ -178,6 +178,18 @@
-       AC_MSG_RESULT([Please use --with-db-inc to configure.])
-       exit 1 ])
+--- script/configure.in.orig	2004-09-20 06:16:48.000000000 +0000
++++ script/configure.in
+@@ -203,7 +203,9 @@ errno = db_open("foo.db", DB_BTREE, DB_C
+ #endif
+ if(errno) return errno;
  
-+AC_MSG_CHECKING([DB3 API])
-+if test x$USE_DB = xDB3; then
-+    AC_TRY_LINK([
-+#include <stdlib.h>
-+#include <db.h>], [
-+DB dbs;
-+dbs.stat(&dbs, NULL, 0); ],
-+	[ AC_DEFINE(HAVE_DB3_STAT3)
-+	  AC_MSG_RESULT([DB->stat() take 3 arguements.]) ],
-+	[ AC_MSG_RESULT([DB->stat() take 4 arguements.]) ])
-+fi
-+
- if test x$with_db_lib = x; then
-     with_db_lib="$test_db_lib"
- else
+-#if DB_VERSION >= 303011
++#if DB_VERSION >= 403000
++errno = dbp->stat(dbp, NULL, &sp, 0);
++#elif DB_VERSION >= 303011
+ errno = dbp->stat(dbp, &sp, 0); 
+ #else
+ errno = dbp->stat(dbp, &sp, NULL, 0); 
diff --git a/inputmethod/libtabe/patches/patch-ae b/inputmethod/libtabe/patches/patch-ae
index 7fd383d8de9..4ddfa350022 100644
--- a/inputmethod/libtabe/patches/patch-ae
+++ b/inputmethod/libtabe/patches/patch-ae
@@ -1,16 +1,15 @@
-$NetBSD: patch-ae,v 1.1 2005/09/28 17:09:43 rillig Exp $
+$NetBSD: patch-ae,v 1.2 2009/11/24 11:15:14 obache Exp $
 
---- src/tabe_tsidbint.c.orig	Sun Nov 11 19:15:46 2001
-+++ src/tabe_tsidbint.c	Fri Dec  7 23:13:15 2001
-@@ -265,7 +265,11 @@
+--- src/tabe_tsidbint.c.orig	2004-01-24 20:14:55.000000000 +0000
++++ src/tabe_tsidbint.c
+@@ -272,7 +272,9 @@ tabeTsiDBRecordNumber(struct TsiDB *tsid
    switch(tsidb->type) {
    case DB_TYPE_DB:
      dbp = (DB *)tsidb->dbp;
-+#ifdef HAVE_DB3_STAT3
-+    errno = dbp->stat(dbp, &sp, 0);
-+#else
+-#if DB_VERSION >= 303011
++#if DB_VERSION >= 403000
++    errno = dbp->stat(dbp, NULL, &sp, 0);
++#elif DB_VERSION >= 303011
+     errno = dbp->stat(dbp, &sp, 0);
+ #else
      errno = dbp->stat(dbp, &sp, NULL, 0);
-+#endif
-     if (!errno) {
- #ifndef HAVE_DB3
-       return(sp->bt_nrecs);
diff --git a/inputmethod/libtabe/patches/patch-af b/inputmethod/libtabe/patches/patch-af
index d5f151994dd..ce20e0a9b87 100644
--- a/inputmethod/libtabe/patches/patch-af
+++ b/inputmethod/libtabe/patches/patch-af
@@ -1,16 +1,15 @@
-$NetBSD: patch-af,v 1.1 2005/09/28 17:09:43 rillig Exp $
+$NetBSD: patch-af,v 1.2 2009/11/24 11:15:14 obache Exp $
 
---- src/tabe_tsiyindbint.c.orig	Sun Nov 11 19:16:32 2001
-+++ src/tabe_tsiyindbint.c	Fri Dec  7 23:15:21 2001
-@@ -268,7 +268,11 @@
+--- src/tabe_tsiyindbint.c.orig	2004-01-24 20:14:55.000000000 +0000
++++ src/tabe_tsiyindbint.c
+@@ -275,7 +275,9 @@ tabeTsiYinDBRecordNumber(struct TsiYinDB
    switch(tsiyindb->type) {
    case DB_TYPE_DB:
      dbp = (DB *)tsiyindb->dbp;
-+#ifdef HAVE_DB3_STAT3
-+    errno = dbp->stat(dbp, &sp, 0);
-+#else
+-#if DB_VERSION >= 303011
++#if DB_VERSION >= 403000
++    errno = dbp->stat(dbp, NULL, &sp, 0);
++#elif DB_VERSION >= 303011
+     errno = dbp->stat(dbp, &sp, 0);
+ #else
      errno = dbp->stat(dbp, &sp, NULL, 0);
-+#endif
-     if (!errno) {
- #ifndef HAVE_DB3
-       return(sp->bt_nrecs);