From 96d704958ef25cbb9c7cf69bd081235ee7b6afd2 Mon Sep 17 00:00:00 2001 From: rillig Date: Wed, 28 Sep 2005 17:09:43 +0000 Subject: Fixed pkglint warnings. Among others, split patch-aa into six patches. --- inputmethod/libtabe/Makefile | 6 +-- inputmethod/libtabe/distinfo | 9 ++++- inputmethod/libtabe/patches/patch-aa | 73 +----------------------------------- inputmethod/libtabe/patches/patch-ab | 13 +++++++ inputmethod/libtabe/patches/patch-ac | 13 +++++++ inputmethod/libtabe/patches/patch-ad | 23 ++++++++++++ inputmethod/libtabe/patches/patch-ae | 16 ++++++++ inputmethod/libtabe/patches/patch-af | 16 ++++++++ 8 files changed, 92 insertions(+), 77 deletions(-) create mode 100644 inputmethod/libtabe/patches/patch-ab create mode 100644 inputmethod/libtabe/patches/patch-ac create mode 100644 inputmethod/libtabe/patches/patch-ad create mode 100644 inputmethod/libtabe/patches/patch-ae create mode 100644 inputmethod/libtabe/patches/patch-af (limited to 'inputmethod') diff --git a/inputmethod/libtabe/Makefile b/inputmethod/libtabe/Makefile index b5ee7129bbc..78165e843ba 100644 --- a/inputmethod/libtabe/Makefile +++ b/inputmethod/libtabe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:58 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/09/28 17:09:43 rillig Exp $ # DISTNAME= libtabe-0.2.5 @@ -11,9 +11,9 @@ HOMEPAGE= http://libtabe.sourceforge.net/ COMMENT= Library for Chinese language processing WRKSRC= ${WRKDIR}/libtabe -USE_LIBTOOL= # defined +USE_LIBTOOL= yes -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3 CONFIGURE_ARGS+= --with-db-lib=${BUILDLINK_PREFIX.db3}/lib diff --git a/inputmethod/libtabe/distinfo b/inputmethod/libtabe/distinfo index 13be8247342..938d7b56830 100644 --- a/inputmethod/libtabe/distinfo +++ b/inputmethod/libtabe/distinfo @@ -1,6 +1,11 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 21:00:35 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/09/28 17:09:43 rillig 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) = b9c996a2aa9d78a64486836fd7baab1fd3d81411 +SHA1 (patch-aa) = 051f5149580f57fa163a347545b8ba419383d932 +SHA1 (patch-ab) = 516061f376622d70d116e7d9a24595adbac99a34 +SHA1 (patch-ac) = 6e51271ca10b6cb1608ec31d471a1cd3a5e7ccd0 +SHA1 (patch-ad) = 2e78b153cde1d0f28a63a9c6c8a604372b88442e +SHA1 (patch-ae) = e8d64b941173dfd4a987cd33e0dbf66cdbd96ee9 +SHA1 (patch-af) = 80a645473bff5e3d526c246e0fac451a8905594f diff --git a/inputmethod/libtabe/patches/patch-aa b/inputmethod/libtabe/patches/patch-aa index a2167627fc4..c54b18a8343 100644 --- a/inputmethod/libtabe/patches/patch-aa +++ b/inputmethod/libtabe/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/08/25 19:22:59 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2005/09/28 17:09:43 rillig Exp $ --- configure.orig Tue Dec 4 23:05:00 2001 +++ configure Fri Dec 7 23:17:32 2001 @@ -237,74 +237,3 @@ $NetBSD: patch-aa,v 1.2 2002/08/25 19:22:59 jlam Exp $ 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); diff --git a/inputmethod/libtabe/patches/patch-ab b/inputmethod/libtabe/patches/patch-ab new file mode 100644 index 00000000000..4639f8c1842 --- /dev/null +++ b/inputmethod/libtabe/patches/patch-ab @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..303606d0673 --- /dev/null +++ b/inputmethod/libtabe/patches/patch-ac @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..f5e58e37aa3 --- /dev/null +++ b/inputmethod/libtabe/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.1 2005/09/28 17:09:43 rillig 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 ]) + ++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 diff --git a/inputmethod/libtabe/patches/patch-ae b/inputmethod/libtabe/patches/patch-ae new file mode 100644 index 00000000000..7fd383d8de9 --- /dev/null +++ b/inputmethod/libtabe/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1 2005/09/28 17:09:43 rillig 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 @@ + 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); diff --git a/inputmethod/libtabe/patches/patch-af b/inputmethod/libtabe/patches/patch-af new file mode 100644 index 00000000000..d5f151994dd --- /dev/null +++ b/inputmethod/libtabe/patches/patch-af @@ -0,0 +1,16 @@ +$NetBSD: patch-af,v 1.1 2005/09/28 17:09:43 rillig 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 @@ + 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); -- cgit v1.2.3