aboutsummaryrefslogtreecommitdiff
path: root/chinese/libtabe
diff options
context:
space:
mode:
Diffstat (limited to 'chinese/libtabe')
-rw-r--r--chinese/libtabe/Makefile26
-rw-r--r--chinese/libtabe/distinfo6
-rw-r--r--chinese/libtabe/files/patch-aa12
-rw-r--r--chinese/libtabe/files/patch-ab12
-rw-r--r--chinese/libtabe/files/patch-configure105
-rw-r--r--chinese/libtabe/files/patch-src::tabe_tsidbint.c114
-rw-r--r--chinese/libtabe/files/patch-src::tabe_tsiyindbint.c115
-rw-r--r--chinese/libtabe/files/patch-util-tsipackdb.in52
-rw-r--r--chinese/libtabe/pkg-plist9
9 files changed, 89 insertions, 362 deletions
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 83981f47dc62..90fd30f22777 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -6,21 +6,18 @@
#
PORTNAME= libtabe
-PORTVERSION= 0.2.5
-PORTREVISION= 3
+PORTVERSION= 0.2.6
CATEGORIES= chinese
-MASTER_SITES= ftp://ftp.linux.org.tw/pub/xcin/libtabe/devel/
+MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/
MAINTAINER= kcwu@csie.org
COMMENT= Unified library for Chinese text processing
-WRKSRC= ${WRKDIR}/libtabe
INSTALLS_SHLIB= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_BDB= yes
OBSOLETE_BDB_VAR= USE_DB2
-NOT_FOR_ARCHS= amd64
DATADIR= ${PREFIX}/share/tabe
DOCSDIR= ${PREFIX}/share/doc/tabe
CONFIGURE_ARGS= --prefix=${PREFIX} \
@@ -31,6 +28,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-db-bin=${LOCALBASE}/bin \
--enable-shared
+.include <bsd.port.pre.mk>
+
.if !defined(WITHOUT_X11)
USE_XLIB= yes
PLIST_SUB+= X11=""
@@ -39,16 +38,15 @@ CONFIGURE_ARGS+=--without-x
PLIST_SUB+= X11="@comment "
.endif
-.include <bsd.port.pre.mk>
-
pre-everything::
.if defined(WITH_BDB_VER)
- @${ECHO} ""
- @${ECHO} "WARNING:"
- @${ECHO} " You have defined WITH_BDB_VER. Make sure you use the same"
- @${ECHO} " db version for all ports that use libtabe, such as xcin."
- @${ECHO} " Otherwise, ports that use libtabe may not work correctly."
- @${ECHO} ""
+pre-everything::
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "WARNING:"
+ @${ECHO_CMD} " You have defined WITH_BDB_VER. Make sure you use the same"
+ @${ECHO_CMD} " db version for all ports that use libtabe, such as xcin."
+ @${ECHO_CMD} " Otherwise, ports that use libtabe may not work correctly."
+ @${ECHO_CMD} ""
.endif
post-patch:
@@ -68,7 +66,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${DOCSDIR}
.endfor
.endif
- ${MKDIR} ${DATADIR}
- ${TOUCH} ${DATADIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.post.mk>
diff --git a/chinese/libtabe/distinfo b/chinese/libtabe/distinfo
index 96ef7e2f5ce3..207493bdc550 100644
--- a/chinese/libtabe/distinfo
+++ b/chinese/libtabe/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtabe-0.2.5.tar.gz) = 8b03826b2858ae999b18d41099eb73c9
-SHA256 (libtabe-0.2.5.tar.gz) = 2223f81502a418a7fe6ea98217fe59cd54e7a308da7be38729b46120db0b7038
-SIZE (libtabe-0.2.5.tar.gz) = 1615825
+MD5 (libtabe-0.2.6.tar.gz) = 9e388ce6c13dacfe595bf31c54c2aaf9
+SHA256 (libtabe-0.2.6.tar.gz) = 02b3f2e39958978dd6a1ffd95f892b7b9a087622dac409f2dbf8f325668714b6
+SIZE (libtabe-0.2.6.tar.gz) = 1788455
diff --git a/chinese/libtabe/files/patch-aa b/chinese/libtabe/files/patch-aa
deleted file mode 100644
index 4f9f329a21e8..000000000000
--- a/chinese/libtabe/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.in.orig Wed Dec 5 13:56:10 2001
-+++ src/Makefile.in Wed Dec 5 13:56:23 2001
-@@ -55,8 +55,7 @@
-
- $(LIBNAME): $(LIBOBJS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
-- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) \
-- -release $(RELEASE_VER)
-+ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
-
- bims:
- (cd supports/bims; $(MAKE))
diff --git a/chinese/libtabe/files/patch-ab b/chinese/libtabe/files/patch-ab
deleted file mode 100644
index 3b34002f8f69..000000000000
--- a/chinese/libtabe/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/supports/bims/Makefile.in.orig Wed Dec 5 13:56:40 2001
-+++ src/supports/bims/Makefile.in Wed Dec 5 13:56:47 2001
-@@ -45,8 +45,7 @@
-
- $(LIBNAME): $(LIBOBJS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
-- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) \
-- -release $(RELEASE_VER)
-+ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
-
- bims.lo: bims.c bims.h
- $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
diff --git a/chinese/libtabe/files/patch-configure b/chinese/libtabe/files/patch-configure
index 85693dc3115f..e6f926766851 100644
--- a/chinese/libtabe/files/patch-configure
+++ b/chinese/libtabe/files/patch-configure
@@ -1,69 +1,46 @@
---- configure.orig Sat Oct 20 07:03:29 2001
-+++ configure Mon May 1 10:53:24 2006
-@@ -22,6 +22,8 @@
- ac_help="$ac_help
- --with-db-bin=PATH set the binary dir of Berkeley DB2/3."
- ac_help="$ac_help
-+ --with-db-name=NAME set the library name of Berkeley DB."
-+ac_help="$ac_help
- --enable-shared[=PKGS] build shared libraries [default=yes]"
- ac_help="$ac_help
- --enable-static[=PKGS] build static libraries [default=yes]"
-@@ -790,6 +792,14 @@
- :
- fi
-
-+# Check whether --with-db_name or --without-db_name was given.
-+if test "${with_db_name+set}" = set; then
-+ withval="$with_db_name"
-+ test x$withval != x && with_db_name="$withval"
-+else
-+ with_db_name='db'
-+fi;
-+
-
- if test "$program_prefix" != NONE; then
- program_prefix="$program_prefix/"
-@@ -5315,18 +5325,22 @@
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--test "$ac_cv_search_db_create" = "no" && for i in db db3; do
-+test "$ac_cv_search_db_create" = "no" && for i in $with_db_name; do
- LIBS="-l$i $ac_func_search_save_LIBS"
+--- configure.orig Mon Sep 20 01:16:48 2004
++++ configure Sat Apr 22 01:18:43 2006
+@@ -18984,6 +18984,10 @@
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$dbname $LIBS"
+__db_create="db_create"
-+if [ "$i" = "db-4.2" ]; then
++if [ "$dbname" = "db-4.2" ]; then
+ __db_create="db_create_4002"
+fi
- cat > conftest.$ac_ext <<EOF
- #line 5322 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -18997,11 +19001,11 @@
+ #endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char db_create();
-+char $__db_create();
+ builtin and then its argument prototype would still apply. */
+-char db_create ();
++char $__db_create ();
+ int
+ main ()
+ {
+-db_create ();
++$__db_create ();
+ ;
+ return 0;
+ }
+@@ -19253,7 +19257,9 @@
+ #endif
+ if(errno) return errno;
- int main() {
--db_create()
-+$__db_create()
- ; return 0; }
- EOF
- if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -5385,7 +5399,7 @@
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--test "$ac_cv_search_db_open" = "no" && for i in db db2; do
-+test "$ac_cv_search_db_open" = "no" && for i in $with_db_name; do
- LIBS="-l$i $ac_func_search_save_LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 5392 "configure"
-@@ -6219,6 +6233,7 @@
- s%@with_db_inc@%$with_db_inc%g
- s%@with_db_lib@%$with_db_lib%g
- s%@with_db_bin@%$with_db_bin%g
-+s%@with_db_name@%$with_db_name%g
- s%@USE_DB@%$USE_DB%g
- s%@x_includes@%$x_includes%g
- s%@x_libraries@%$x_libraries%g
+-#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);
+@@ -20833,6 +20839,7 @@
+ s,@with_db_inc@,$with_db_inc,;t t
+ s,@with_db_lib@,$with_db_lib,;t t
+ s,@with_db_bin@,$with_db_bin,;t t
++s,@with_db_name@,$with_db_name,;t t
+ s,@x_includes@,$x_includes,;t t
+ s,@x_libraries@,$x_libraries,;t t
+ s,@build_supports@,$build_supports,;t t
diff --git a/chinese/libtabe/files/patch-src::tabe_tsidbint.c b/chinese/libtabe/files/patch-src::tabe_tsidbint.c
index 3d9468e57be1..59fc267ca9e3 100644
--- a/chinese/libtabe/files/patch-src::tabe_tsidbint.c
+++ b/chinese/libtabe/files/patch-src::tabe_tsidbint.c
@@ -1,113 +1,13 @@
---- src/tabe_tsidbint.c.orig Sun Nov 11 07:33:07 2001
-+++ src/tabe_tsidbint.c Mon May 1 00:47:55 2006
-@@ -27,6 +27,7 @@
- #endif
-
- #include "tabe.h"
-+#define DB_VERSION (DB_VERSION_MAJOR*100000+DB_VERSION_MINOR*1000+DB_VERSION_PATCH)
-
- static void tabeTsiDBClose(struct TsiDB *tsidb);
- static int tabeTsiDBRecordNumber(struct TsiDB *tsidb);
-@@ -69,7 +70,7 @@
- {
- DB *dbp=NULL;
-
--#ifdef HAVE_DB3
-+#if DB_VERSION >= 300000
- /* create a db handler */
- if ((errno = db_create(&dbp, NULL, 0)) != 0) {
- fprintf(stderr, "db_create: %s\n", db_strerror(errno));
-@@ -82,26 +83,32 @@
- return(NULL);
- }
- else {
--#ifndef HAVE_DB3
-- errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
--#else
-+#if DB_VERSION >= 401025
-+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+#elif DB_VERSION >= 300000
- errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+#else
-+ errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
- #endif
- }
- }
- else {
- if (flags & DB_FLAG_READONLY) {
--#ifndef HAVE_DB3
-- errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
--#else
-+#if DB_VERSION >= 401025
-+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+#elif DB_VERSION >= 300000
- errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+#else
-+ errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
- #endif
- }
- else {
--#ifndef HAVE_DB3
-- errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
--#else
-+#if DB_VERSION >= 401025
-+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
-+#elif DB_VERSION >= 300000
- errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
-+#else
-+ errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
- #endif
- }
- }
-@@ -112,10 +119,10 @@
- }
- if (errno < 0) {
- /* DB specific errno */
--#ifndef HAVE_DB3
-- fprintf(stderr, "tabeTsiDBOpen(): DB error opening DB File %s.\n", db_name);
--#else
-+#if DB_VERSION >= 300000
- fprintf(stderr, "tabeTsiDBOpen(): %s.\n", db_strerror(errno));
-+#else
-+ fprintf(stderr, "tabeTsiDBOpen(): DB error opening DB File %s.\n", db_name);
- #endif
- return(NULL);
- }
-@@ -265,12 +272,18 @@
+--- src/tabe_tsidbint.c.orig Fri Apr 21 23:04:10 2006
++++ src/tabe_tsidbint.c Fri Apr 21 23:04:33 2006
+@@ -272,7 +272,9 @@
switch(tsidb->type) {
case DB_TYPE_DB:
dbp = (DB *)tsidb->dbp;
+-#if DB_VERSION >= 303011
+#if DB_VERSION >= 403000
-+ errno = dbp->stat(dbp, NULL, &sp, 0);
++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);
--#else
-+#if DB_VERSION >= 300000
- return(sp->bt_ndata); /* or sp->bt_nkeys? */
-+#else
-+ return(sp->bt_nrecs);
- #endif
- }
- break;
-@@ -502,14 +515,10 @@
- dbcp->c_close(dbcp);
- }
-
--#ifndef HAVE_DB3
--#if DB_VERSION_MINOR > 6 || (DB_VERSION_MINOR == 6 && DB_VERSION_PATCH > 4)
-+#if DB_VERSION >= 206004
- dbp->cursor(dbp, NULL, &dbcp, 0);
+ errno = dbp->stat(dbp, &sp, 0);
#else
- dbp->cursor(dbp, NULL, &dbcp);
--#endif
--#else
-- dbp->cursor(dbp, NULL, &dbcp, 0);
- #endif
- tsidb->dbcp = dbcp;
-
+ errno = dbp->stat(dbp, &sp, NULL, 0);
diff --git a/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c b/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
index 05002f976ad4..7cebbc6deb47 100644
--- a/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
+++ b/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
@@ -1,114 +1,13 @@
---- src/tabe_tsiyindbint.c.orig Mon May 1 00:49:54 2006
-+++ src/tabe_tsiyindbint.c Mon May 1 00:50:03 2006
-@@ -27,6 +27,7 @@
- #endif
-
- #include "tabe.h"
-+#define DB_VERSION (DB_VERSION_MAJOR*100000+DB_VERSION_MINOR*1000+DB_VERSION_PATCH)
-
- static void tabeTsiYinDBClose(struct TsiYinDB *tsiyindb);
- static int tabeTsiYinDBRecordNumber(struct TsiYinDB *tsiyindb);
-@@ -72,7 +73,7 @@
- {
- DB *dbp=NULL;
-
--#ifdef HAVE_DB3
-+#if DB_VERSION >= 300000
- /* create a db handler */
- if ((errno = db_create(&dbp, NULL, 0)) != 0) {
- fprintf(stderr, "db_create: %s\n", db_strerror(errno));
-@@ -85,26 +86,32 @@
- return(NULL);
- }
- else {
--#ifndef HAVE_DB3
-- errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
--#else
-+#if DB_VERSION >= 401025
-+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+#elif DB_VERSION >= 300000
- errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+#else
-+ errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
- #endif
- }
- }
- else {
- if (flags & DB_FLAG_READONLY) {
--#ifndef HAVE_DB3
-- errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
--#else
-+#if DB_VERSION >= 401025
-+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+#elif DB_VERSION >= 300000
- errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+#else
-+ errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
- #endif
- }
- else {
--#ifndef HAVE_DB3
-- errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
--#else
-+#if DB_VERSION >= 401025
-+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
-+#elif DB_VERSION >= 300000
- errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
-+#else
-+ errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
- #endif
- }
- }
-@@ -115,11 +122,11 @@
- }
- if (errno < 0) {
- /* DB specific errno */
--#ifndef HAVE_DB3
-+#if DB_VERSION >= 300000
-+ fprintf(stderr, "tabeTsiYinDBOpen(): %s.\n", db_strerror(errno));
-+#else
- fprintf(stderr, "tabeTsiYinDBOpen(): DB error opening DB File %s.\n",
- db_name);
--#else
-- fprintf(stderr, "tabeTsiYinDBOpen(): %s.\n", db_strerror(errno));
- #endif
- return(NULL);
- }
-@@ -268,12 +275,18 @@
+--- src/tabe_tsiyindbint.c.orig Fri Apr 21 23:04:40 2006
++++ src/tabe_tsiyindbint.c Fri Apr 21 23:04:55 2006
+@@ -275,7 +275,9 @@
switch(tsiyindb->type) {
case DB_TYPE_DB:
dbp = (DB *)tsiyindb->dbp;
+-#if DB_VERSION >= 303011
+#if DB_VERSION >= 403000
-+ errno = dbp->stat(dbp, NULL, &sp, 0);
++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);
--#else
-+#if DB_VERSION >= 300000
- return(sp->bt_ndata); /* or sp->bt_nkeys? */
-+#else
-+ return(sp->bt_nrecs);
- #endif
- }
- break;
-@@ -481,14 +494,10 @@
- dbcp->c_close(dbcp);
- }
-
--#ifndef HAVE_DB3
--#if DB_VERSION_MINOR > 6 || (DB_VERSION_MINOR == 6 && DB_VERSION_PATCH > 4)
-+#if DB_VERSION >= 206004
- dbp->cursor(dbp, NULL, &dbcp, 0);
+ errno = dbp->stat(dbp, &sp, 0);
#else
- dbp->cursor(dbp, NULL, &dbcp);
--#endif
--#else
-- dbp->cursor(dbp, NULL, &dbcp, 0);
- #endif
- tsiyindb->dbcp = dbcp;
-
+ errno = dbp->stat(dbp, &sp, NULL, 0);
diff --git a/chinese/libtabe/files/patch-util-tsipackdb.in b/chinese/libtabe/files/patch-util-tsipackdb.in
index 753ed93d6d39..b2a574cfb057 100644
--- a/chinese/libtabe/files/patch-util-tsipackdb.in
+++ b/chinese/libtabe/files/patch-util-tsipackdb.in
@@ -1,24 +1,11 @@
---- util/tsipackdb.in.orig Sun Nov 11 07:33:09 2001
-+++ util/tsipackdb.in Mon May 1 10:19:51 2006
-@@ -29,31 +29,37 @@
+--- util/tsipackdb.in.orig Sun Sep 19 22:25:51 2004
++++ util/tsipackdb.in Fri Apr 21 23:31:23 2006
+@@ -26,14 +26,26 @@
}
pack_db_file () {
-- db_stat=`mywhich ${1}_stat`
- db_dump=`mywhich ${1}_dump`
- db_load=`mywhich ${1}_load`
-- test x$db_stat != x && test x$db_dump != x && test x$db_load != x && \
-- $db_stat -d $2 2>&1 | (
-- read line
-- read line
-- test "$line" = "$3" && \
-- echo "Using $db_dump and $db_load to pack $2 ...." && \
-- ${1}_dump $2 | ${1}_load $2.new && \
-- mv $2.new $2 && \
-- return 0
-- return -1 \
-- )
--}
+ case "${1}" in
+ db|db3|db4|db41)
+ db_dump=`mywhich ${1}_dump`
@@ -33,31 +20,26 @@
+ echo "unsupportted Berkyley version: ${1}"
+ return 1
+ esac
-+ if [ -x "$db_dump" ] && [ -x "$db_load" ]; then
-+
-+ echo "Try using $db_dump and $db_load to pack $2 ...."
+ if [ -x "$db_dump" ] && [ -x "$db_load" ]; then
+ echo "Try using $db_dump and $db_load to pack $2 ...."
+
+- ${1}_dump $2 > $2.tmp && \
+- ${1}_load $2.new < $2.tmp && \
+ $db_dump $2 > $2.tmp && \
+ $db_load $2.new < $2.tmp && \
-+ mv $2.new $2 && \
-+ return 0
+ mv $2.new $2 && \
+ return 0
--if [ "$USE_DB" = "DB2" ]; then
-- pack_db_file db $1 "$DB2_VER" && exit 0
-- pack_db_file db2 $1 "$DB2_VER" && exit 0
--fi
-+ fi
-+
-+ return 1
-+}
+@@ -42,9 +54,9 @@
+ return 1
+ }
--if [ "$USE_DB" = "DB3" ]; then
-- pack_db_file db $1 "$DB3_VER" && exit 0
-- pack_db_file db3 $1 "$DB3_VER" && exit 0
--fi
+-for dbprefix in db db2 db3 db4
+for dbname in @with_db_name@ db db2 db3 db4
-+do
+ do
+- pack_db_file $dbprefix $1 && exit 0
+ pack_db_file $dbname $1 && exit 0
-+done
+ done
exit 0
diff --git a/chinese/libtabe/pkg-plist b/chinese/libtabe/pkg-plist
index 870b9e3ab67f..c07bf436fa55 100644
--- a/chinese/libtabe/pkg-plist
+++ b/chinese/libtabe/pkg-plist
@@ -1,18 +1,17 @@
bin/tsiadd
bin/tsidel
bin/tsidump
+bin/tsiguess
bin/tsiyincheck
bin/tsiyindump
%%X11%%include/tabe/bims.h
include/tabe/tabe.h
%%X11%%lib/libbims.a
-%%X11%%lib/libbims.la
%%X11%%lib/libbims.so
-%%X11%%lib/libbims.so.2
+%%X11%%lib/libbims.so.3
lib/libtabe.a
-lib/libtabe.la
lib/libtabe.so
-lib/libtabe.so.2
+lib/libtabe.so.3
lib/tabe/tsi.db
lib/tabe/yin.db
%%PORTDOCS%%%%DOCSDIR%%/BoPoMoFo.shtml
@@ -24,8 +23,6 @@ lib/tabe/yin.db
%%PORTDOCS%%%%DOCSDIR%%/ZuYinCode.txt
%%PORTDOCS%%%%DOCSDIR%%/et26.txt
%%PORTDOCS%%%%DOCSDIR%%/libtabe.sgml
-%%DATADIR%%/libtabe-0.2.5
@dirrm include/tabe
@dirrm lib/tabe
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 20:42:43 +0000