head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.128 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.126 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.124 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.122 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.120 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.118 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.116 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.114 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.112 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.110 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.108 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.106 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.104 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.102 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.100 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.98 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.96 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.94 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.92 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.90 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.88 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.86 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.84 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.80 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.60 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.82 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.78 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.76 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.74 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.72 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.70 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.68 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.66 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.64 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.62 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.58 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.56 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.54 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.52 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.50 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.48 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.46 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.44 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.42 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.40 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.38 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.36 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.34 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.32 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.30 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.28 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.26 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.24 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.22 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.20 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.18 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.16 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.14 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.12 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.10 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.8 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.6 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.4 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.2 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.4.0.4 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.3.0.36 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.34 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.32 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.18 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.16 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.14 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.12 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.10 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2010.06.02.12.34.02; author adam; state Exp; branches; next 1.4; 1.4 date 2009.11.24.11.15.14; author obache; state Exp; branches; next 1.3; 1.3 date 2005.09.28.17.09.43; author rillig; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.22.59; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.06.04.08.31.11; author uebayasi; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.06.04.08.31.11; author uebayasi; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.06.04.08.31.11; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.47.55; author jlam; state Exp; branches; next ; desc @@ 1.5 log @Fix building with db5; revision bump for db4 update; clean-up @ text @$NetBSD$ --- configure.orig 2004-09-20 06:16:48.000000000 +0000 +++ configure @@@@ -18905,7 +18905,7 @@@@ OLD_LIBS=$LIBS CPPFLAGS="$OLD_CPPFLAGS $with_db_inc" LDFLAGS="$OLD_LDFLAGS $test_db_lib" -for dbname in $with_db_name db db2 db3 db4 +for dbname in $with_db_name db db2 db3 db4 db5 do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_open" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_open in -l$dbname" >&5 @@@@ -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); @ 1.4 log @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 . 2. Porting to DB3-3.3.11: DB->stat() only takes 3 arguements. Thanks to Pofeng Lee Rui-Xiang Guo 3. Change the "rm $(PACKDB)" from "make clean" to "make distclean". Thanks to Kuang-che Wu . 4. Fix several memory leakage problem. Thanks to Kuang-che Wu . 5. Add util/tsiguess.c. Add API: tabeChunkInfoFree(), tabeChunkInfoNew(), tabeTsiInfoNew(), tabeTsiInfoFree(). Thanks to Pofeng Lee . 6. Add bims facility: user add Tsi by hand and store to user DB files. Thanks to Eric Cheng . 7. Add bims facility: simple algorithm to learn new phrase input by user. Thanks to Pofeng Lee . 8. A quick fix for segfault when there is no ~/.xcin/*.db Fixed by Geoffrey Lee 9. Fixed the bug of signed/unsigned TsiInfo->refcount ( µüÀW 0 bug ) Found by FixeShao-yu Cheng Fixed by Kuang-che Wu 10. By 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 12. Set DB_FLAG_READONLY or DB_FLAG_NOUNPACK_YIN flags in tsidump, tsiguess, tsiyincheck, tsiyindump utilities when necessary. By Kuang-che Wu 13. Support Berkeley DB 4. Thansks to Cheng-Lung Sung . 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. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/09/28 17:09:43 rillig Exp $ d5 9 @ 1.3 log @Fixed pkglint warnings. Among others, split patch-aa into six patches. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2002/08/25 19:22:59 jlam Exp $ d3 13 a15 237 --- 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 < +#include +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 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 <&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 < #include @@@@ -5748,7 +5779,7 @@@@ #include 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 @@@@ -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 @@@@ -5804,7 +5835,7 @@@@ : else cat > conftest.$ac_ext < #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 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 <&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 <&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 <&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 @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:47:55 jlam Exp $ a239 71 --- 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 --- 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 --- 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 ]) +AC_MSG_CHECKING([DB3 API]) +if test x$USE_DB = xDB3; then + AC_TRY_LINK([ +#include +#include ], [ +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 --- 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 @@@@ switch(tsidb->type) { case DB_TYPE_DB: dbp = (DB *)tsidb->dbp; +#ifdef HAVE_DB3_STAT3 + errno = dbp->stat(dbp, &sp, 0); +#else errno = dbp->stat(dbp, &sp, NULL, 0); +#endif if (!errno) { #ifndef HAVE_DB3 return(sp->bt_nrecs); --- 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 @@@@ switch(tsiyindb->type) { case DB_TYPE_DB: dbp = (DB *)tsiyindb->dbp; +#ifdef HAVE_DB3_STAT3 + errno = dbp->stat(dbp, &sp, 0); +#else errno = dbp->stat(dbp, &sp, NULL, 0); +#endif if (!errno) { #ifndef HAVE_DB3 return(sp->bt_nrecs); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of libtabe, submitted by Rui-Xiang Guo in pkg/12171. After its pioneering work on Chinese i18n/l10n issues, TaBE Project extends its goal to more general Chinese language processing issues on computer systems. libtabe, the latest work made available by the Project, is a library which provides useful Chinese functions/routines that deal with many fundamental elements such as pronunciation(BoPoMoFo), character frequency, word identification, word frequency. It also comes with a free word database consists of more than 130,000 words. @ text @@ 1.1.1.1.2.1 log @file patch-aa was added on branch buildlink2 on 2002-06-23 18:47:55 +0000 @ text @d1 310 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 310 $NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:47:55 jlam 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 < +#include +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 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 <&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 < #include @@@@ -5748,7 +5779,7 @@@@ #include 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 @@@@ -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 @@@@ -5804,7 +5835,7 @@@@ : else cat > conftest.$ac_ext < #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 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 <&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 <&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 <&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 --- 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 --- 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 --- 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 ]) +AC_MSG_CHECKING([DB3 API]) +if test x$USE_DB = xDB3; then + AC_TRY_LINK([ +#include +#include ], [ +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 --- 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 @@@@ switch(tsidb->type) { case DB_TYPE_DB: dbp = (DB *)tsidb->dbp; +#ifdef HAVE_DB3_STAT3 + errno = dbp->stat(dbp, &sp, 0); +#else errno = dbp->stat(dbp, &sp, NULL, 0); +#endif if (!errno) { #ifndef HAVE_DB3 return(sp->bt_nrecs); --- 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 @@@@ switch(tsiyindb->type) { case DB_TYPE_DB: dbp = (DB *)tsiyindb->dbp; +#ifdef HAVE_DB3_STAT3 + errno = dbp->stat(dbp, &sp, 0); +#else errno = dbp->stat(dbp, &sp, NULL, 0); +#endif if (!errno) { #ifndef HAVE_DB3 return(sp->bt_nrecs); @