Index: head/chinese/libtabe/Makefile
===================================================================
--- head/chinese/libtabe/Makefile	(revision 368437)
+++ head/chinese/libtabe/Makefile	(revision 368438)
@@ -1,72 +1,68 @@
 # Created by: Jing-Tang Keith Jang <keith@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libtabe
 PORTVERSION=	0.2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://cle.linux.org.tw/pub/xcin/cvs/
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Unified library for Chinese text processing
 
-USES=		gmake
+USES=		gmake libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_BDB=	yes
 OBSOLETE_BDB_VAR=	USE_DB2
 DATADIR=	${PREFIX}/share/tabe
 DOCSDIR=	${PREFIX}/share/doc/tabe
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--includedir=${PREFIX}/include/tabe \
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/tabe \
 		--with-db-name=${BDB_LIB_NAME} \
 		--with-db-inc=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR} \
-		--with-db-bin=${LOCALBASE}/bin \
-		--enable-shared
+		--with-db-bin=${LOCALBASE}/bin
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS X11
-OPTIONS_DEFAULT=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 PLIST_SUB+=	X11=""
 .else
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=	X11="@comment "
 .endif
 
 pre-everything::
 .if defined(WITH_BDB_VER)
 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:
-	${REINPLACE_CMD} -e '/objformat/s/echo aout/echo elf/' ${WRKSRC}/configure
 .if !${PORT_OPTIONS:MX11}
 	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' ${WRKSRC}/src/Makefile.in
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tsi-src/README ${STAGEDIR}${DOCSDIR}/README.tsi
 .if ${PORT_OPTIONS:MX11}
 	${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README ${STAGEDIR}${DOCSDIR}/README.bims
 .endif
 .for DOC in BoPoMoFo.shtml Changes Changes.pre-0.1 TODO ZuYinCode.txt \
 		et26.txt libtabe.sgml
 	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/chinese/libtabe/pkg-plist
===================================================================
--- head/chinese/libtabe/pkg-plist	(revision 368437)
+++ head/chinese/libtabe/pkg-plist	(revision 368438)
@@ -1,28 +1,30 @@
 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.so
-%%X11%%lib/libbims.so.3
+%%X11%%lib/libbims.so.2
+%%X11%%lib/libbims.so.2.1.0
 lib/libtabe.a
 lib/libtabe.so
-lib/libtabe.so.3
+lib/libtabe.so.2
+lib/libtabe.so.2.1.0
 lib/tabe/tsi.db
 lib/tabe/yin.db
 %%PORTDOCS%%%%DOCSDIR%%/BoPoMoFo.shtml
 %%PORTDOCS%%%%DOCSDIR%%/Changes
 %%PORTDOCS%%%%DOCSDIR%%/Changes.pre-0.1
 %%X11%%%%PORTDOCS%%%%DOCSDIR%%/README.bims
 %%PORTDOCS%%%%DOCSDIR%%/README.tsi
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/ZuYinCode.txt
 %%PORTDOCS%%%%DOCSDIR%%/et26.txt
 %%PORTDOCS%%%%DOCSDIR%%/libtabe.sgml
 @dirrm include/tabe
 @dirrm lib/tabe
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: head/chinese/p5-Lingua-ZH-TaBE/Makefile
===================================================================
--- head/chinese/p5-Lingua-ZH-TaBE/Makefile	(revision 368437)
+++ head/chinese/p5-Lingua-ZH-TaBE/Makefile	(revision 368438)
@@ -1,38 +1,38 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	Lingua-ZH-TaBE
 PORTVERSION=	0.07
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Chinese processing via libtabe
 
 LIB_DEPENDS=	libtabe.so:${PORTSDIR}/chinese/libtabe
 
 USES=		perl5
 USE_PERL5=	configure
 
 USE_BDB=	yes
 OBSOLETE_BDB_VAR=	WITH_DB
 
 CONFIGURE_ARGS=	DB="${BDB_LIB_NAME}"
 
 pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "You may specify db version to use:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "	WITH_BDB_VER=version	(Default 41)"
 .if defined(WITH_BDB_VER)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "WARNING:"
 	@${ECHO_CMD} "	You have defined WITH_BDB_VER. Make sure you use the same"
 	@${ECHO_CMD} "	db version that libtabe uses. Otherwise, this port may"
 	@${ECHO_CMD} "	not work correctly."
 .endif
 	@${ECHO_CMD} ""
 
 .include <bsd.port.mk>