Index: head/chinese/libtabe/Makefile
===================================================================
--- head/chinese/libtabe/Makefile	(revision 383637)
+++ head/chinese/libtabe/Makefile	(revision 383638)
@@ -1,69 +1,68 @@
 # Created by: Jing-Tang Keith Jang <keith@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libtabe
 PORTVERSION=	0.2.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://cle.linux.org.tw/pub/xcin/cvs/
+MASTER_SITES=	${MASTER_SITE_DEBIAN:C|(/%SUBDIR%/)|/pool/main/libt/libtabe/|}
+DISTNAME=	libtabe_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unified library for Chinese text processing
 
-BROKEN=		Unfetchable
 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=	--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
+WRKSRC=		${WRKDIR}/${DISTNAME:S|_|-|}
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	DOCS X11
+OPTIONS_DEFINE=		DOCS X11
+OPTIONS_SUB=		X11
+X11_USE=		XORG=x11
+X11_CONFIGURE_WITH=	x
 
 .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:
 .if !${PORT_OPTIONS:MX11}
-	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' ${WRKSRC}/src/Makefile.in
+	${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
+	${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
+	${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/distinfo
===================================================================
--- head/chinese/libtabe/distinfo	(revision 383637)
+++ head/chinese/libtabe/distinfo	(revision 383638)
@@ -1,2 +1,2 @@
-SHA256 (libtabe-0.2.6.tar.gz) = 02b3f2e39958978dd6a1ffd95f892b7b9a087622dac409f2dbf8f325668714b6
-SIZE (libtabe-0.2.6.tar.gz) = 1788455
+SHA256 (libtabe_0.2.6.orig.tar.gz) = 7fbe0f7bb853f9385ccd14e0ce85a7b881342ecd702f1dfff6df803510e00d0c
+SIZE (libtabe_0.2.6.orig.tar.gz) = 1792199
Index: head/chinese/libtabe/files/patch-util__tsipackdb.in
===================================================================
--- head/chinese/libtabe/files/patch-util__tsipackdb.in	(revision 383637)
+++ head/chinese/libtabe/files/patch-util__tsipackdb.in	(revision 383638)
@@ -1,45 +1,44 @@
---- 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 @@
+--- util/tsipackdb.in.orig	2004-09-28 14:59:14 UTC
++++ util/tsipackdb.in
+@@ -26,13 +26,25 @@ mywhich () {
  }
  
  pack_db_file () {
 -    db_dump=`mywhich ${1}_dump`
 -    db_load=`mywhich ${1}_load`
 +    case "${1}" in
 +    db|db3|db4|db41) 
 +        db_dump=`mywhich ${1}_dump`
 +        db_load=`mywhich ${1}_load`
 +        ;;
 +    db-4.[234])
 +        db_name=${1#db-}
 +        db_dump=`mywhich db_dump-${db_name}`
 +        db_load=`mywhich db_load-${db_name}`
 +        ;;
 +    *)
-+        echo "unsupportted Berkyley version: ${1}"
++        echo "unsupported Berkeley version: ${1}"
 +        return 1
 +    esac
      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 && \
++ 	$db_dump $2 > $2.tmp && \
++ 	$db_load $2.new < $2.tmp && \
  	mv $2.new $2 && \
+ 	rm -f $2.tmp && \
  	return 0
- 
-@@ -42,9 +54,9 @@
+@@ -41,9 +53,9 @@ pack_db_file () {
      return 1
  }
  
 -for dbprefix in db db2 db3 db4
 +for dbname in @with_db_name@ db db2 db3 db4
  do
 -    pack_db_file $dbprefix $1 && exit 0
 +    pack_db_file $dbname $1 && exit 0
  done
  
  exit 0