Update to 0.8.5.

Feature safe:	yes

3 files changed, 121 insertions, 104 deletions

diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index eefe473ee93..576fcbefe44 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -1,13 +1,8 @@
-# Ports collection makefile for:	reciteword
-# Date created:			1 November 2004
-# Whom:				hamigua <hamigua@cuc.cn>
-#
+# Created by: hamigua <hamigua@cuc.cn>
 # $FreeBSD$
-#
 
 PORTNAME=	reciteword
-PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	chinese
 MASTER_SITES=	SF:src \
 		SF/${PORTNAME}/${PORTNAME}-books/${PORTVERSION}:books \
@@ -29,20 +24,18 @@ CPPFLAGS+=	"-I${LOCALBASE}/include"
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO readme.txt
 
-OPTIONS=	RPTTS "With Real People TTS" off
+XTRACT_AFTER_ARGS+=	--exclude CVS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_RPTTS)
-RUN_DEPENDS+=	${LOCALBASE}/share/WyabdcRealPeopleTTS/a/a.wav:${PORTSDIR}/textproc/stardict2-rptts
-.endif
+LIB_DEPENDS+=	espeak:${PORTSDIR}/audio/espeak
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|' ${WRKSRC}/src/readword.cpp
 
 post-install:
 	@${MKDIR} ${DATADIR}
-	(cd ${WRKDIR}/ && ${COPYTREE_SHARE} "books dicts" ${DATADIR} "! ( -type d -a -name CVS )")
+	(cd ${WRKDIR}/ && ${COPYTREE_SHARE} "books dicts" ${DATADIR})
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
@@ -50,4 +43,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/reciteword/distinfo b/chinese/reciteword/distinfo
index 84664eb84a2..49ff67b52a6 100644
--- a/chinese/reciteword/distinfo
+++ b/chinese/reciteword/distinfo
@@ -1,6 +1,6 @@
-SHA256 (reciteword-0.8.4.tar.bz2) = 1fe9c1da4dc8c292759328a473144237dd617d9b259214ef2a52c3bc295cb218
-SIZE (reciteword-0.8.4.tar.bz2) = 7701325
-SHA256 (reciteword-books-0.8.4.tar.bz2) = aba1d8ae89ab87cb511055dff3d4106e2940ad0308fa3d251633de39e806df00
-SIZE (reciteword-books-0.8.4.tar.bz2) = 6430507
+SHA256 (reciteword-0.8.5.tar.bz2) = d0b0ec916148bb0bade75ef5d270a254e6e8c6c69fb96cddbcc4f840652b545c
+SIZE (reciteword-0.8.5.tar.bz2) = 7728960
+SHA256 (reciteword-books-0.8.5.tar.bz2) = a5405e118bb90931fb8d5a5394591b4493197fe3af3e98ee7086d843b9e578eb
+SIZE (reciteword-books-0.8.5.tar.bz2) = 6548327
 SHA256 (reciteword-dicts-0.8.2.tar.bz2) = 9b245749501b52e199d46660972d02da5e2ae800a462045fb75dff6d54f96eec
 SIZE (reciteword-dicts-0.8.2.tar.bz2) = 2430470
diff --git a/chinese/reciteword/pkg-plist b/chinese/reciteword/pkg-plist
index df6fb6f4a69..aa074128f5a 100644
--- a/chinese/reciteword/pkg-plist
+++ b/chinese/reciteword/pkg-plist
@@ -75,6 +75,8 @@ share/pixmaps/rwdict.png
 %%DATADIR%%/books/qqssbdc/bjbcz/ck-26.bok
 %%DATADIR%%/books/qqssbdc/bjbcz/dirname
 %%DATADIR%%/books/qqssbdc/bjbxx/Ck-k2.bok
+%%DATADIR%%/books/qqssbdc/bjbxx/ck-03.bok
+%%DATADIR%%/books/qqssbdc/bjbxx/ck-04.bok
 %%DATADIR%%/books/qqssbdc/bjbxx/ck-vv.bok
 %%DATADIR%%/books/qqssbdc/bjbxx/ck-xa.bok
 %%DATADIR%%/books/qqssbdc/bjbxx/ck-xb.bok
@@ -85,6 +87,8 @@ share/pixmaps/rwdict.png
 %%DATADIR%%/books/qqssbdc/bsdcz/Ck-I4.bok
 %%DATADIR%%/books/qqssbdc/bsdcz/Ck-I5.bok
 %%DATADIR%%/books/qqssbdc/bsdcz/dirname
+%%DATADIR%%/books/qqssbdc/cd/ck-33.bok
+%%DATADIR%%/books/qqssbdc/cd/dirname
 %%DATADIR%%/books/qqssbdc/cpfjch/ck-j1.bok
 %%DATADIR%%/books/qqssbdc/cpfjch/ck-j2.bok
 %%DATADIR%%/books/qqssbdc/cpfjch/ck-j3.bok
@@ -232,6 +236,7 @@ share/pixmaps/rwdict.png
 %%DATADIR%%/books/qqssbdc/pgych/ck-a5.bok
 %%DATADIR%%/books/qqssbdc/pgych/dirname
 %%DATADIR%%/books/qqssbdc/qt/Ck-x8.bok
+%%DATADIR%%/books/qqssbdc/qt/ck-01.bok
 %%DATADIR%%/books/qqssbdc/qt/dirname
 %%DATADIR%%/books/qqssbdc/rjbcz/ck-b1.bok
 %%DATADIR%%/books/qqssbdc/rjbcz/ck-b2.bok
@@ -282,6 +287,13 @@ share/pixmaps/rwdict.png
 %%DATADIR%%/books/qqssbdc/wmyy/ck-w3.bok
 %%DATADIR%%/books/qqssbdc/wmyy/ck-w4.bok
 %%DATADIR%%/books/qqssbdc/wmyy/dirname
+%%DATADIR%%/books/qqssbdc/wybcz/ck-27.bok
+%%DATADIR%%/books/qqssbdc/wybcz/ck-28.bok
+%%DATADIR%%/books/qqssbdc/wybcz/ck-29.bok
+%%DATADIR%%/books/qqssbdc/wybcz/ck-30.bok
+%%DATADIR%%/books/qqssbdc/wybcz/ck-31.bok
+%%DATADIR%%/books/qqssbdc/wybcz/ck-32.bok
+%%DATADIR%%/books/qqssbdc/wybcz/dirname
 %%DATADIR%%/books/qqssbdc/xbdxyy/Ck-x6.bok
 %%DATADIR%%/books/qqssbdc/xbdxyy/ck-x5.bok
 %%DATADIR%%/books/qqssbdc/xbdxyy/ck-xd.bok
@@ -389,6 +401,15 @@ share/pixmaps/rwdict.png
 %%DATADIR%%/books/qqssbdc/yjsyy/ck-yj.bok
 %%DATADIR%%/books/qqssbdc/yjsyy/ck-zt.bok
 %%DATADIR%%/books/qqssbdc/yjsyy/dirname
+%%DATADIR%%/books/qqssbdc/yjxx/CK-61.bok
+%%DATADIR%%/books/qqssbdc/yjxx/CK-62.bok
+%%DATADIR%%/books/qqssbdc/yjxx/CK-63.bok
+%%DATADIR%%/books/qqssbdc/yjxx/CK-64.bok
+%%DATADIR%%/books/qqssbdc/yjxx/CK-65.bok
+%%DATADIR%%/books/qqssbdc/yjxx/CK-66.bok
+%%DATADIR%%/books/qqssbdc/yjxx/CK-67.bok
+%%DATADIR%%/books/qqssbdc/yjxx/CK-68.bok
+%%DATADIR%%/books/qqssbdc/yjxx/dirname
 %%DATADIR%%/books/qqssbdc/ylbcz/CK-K9.bok
 %%DATADIR%%/books/qqssbdc/ylbcz/dirname
 %%DATADIR%%/books/qqssbdc/yxyy/ck-y1.bok
@@ -565,91 +586,94 @@ share/pixmaps/rwdict.png
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%/dicts
-@dirrm %%DATADIR%%/books/wyabdc/
-@dirrm %%DATADIR%%/books/qqssbdc/zwwl/
-@dirrm %%DATADIR%%/books/qqssbdc/zk/
-@dirrm %%DATADIR%%/books/qqssbdc/zhyy/
-@dirrm %%DATADIR%%/books/qqssbdc/zcyy/
-@dirrm %%DATADIR%%/books/qqssbdc/zbmg/
-@dirrm %%DATADIR%%/books/qqssbdc/yy/
-@dirrm %%DATADIR%%/books/qqssbdc/yxyy/
-@dirrm %%DATADIR%%/books/qqssbdc/ylbcz/
-@dirrm %%DATADIR%%/books/qqssbdc/yjsyy/
-@dirrm %%DATADIR%%/books/qqssbdc/yhbxx/
-@dirrm %%DATADIR%%/books/qqssbdc/xxxyy2/
-@dirrm %%DATADIR%%/books/qqssbdc/xsydx/
-@dirrm %%DATADIR%%/books/qqssbdc/xsjxx/
-@dirrm %%DATADIR%%/books/qqssbdc/xsjgz/
-@dirrm %%DATADIR%%/books/qqssbdc/xrjgz/
-@dirrm %%DATADIR%%/books/qqssbdc/xrjbxx/
-@dirrm %%DATADIR%%/books/qqssbdc/xrjbgz/
-@dirrm %%DATADIR%%/books/qqssbdc/xrjbcz/
-@dirrm %%DATADIR%%/books/qqssbdc/xmbrj/
-@dirrm %%DATADIR%%/books/qqssbdc/xmbcz/
-@dirrm %%DATADIR%%/books/qqssbdc/xgzyy/
-@dirrm %%DATADIR%%/books/qqssbdc/xglyy/
-@dirrm %%DATADIR%%/books/qqssbdc/xdxdg/
-@dirrm %%DATADIR%%/books/qqssbdc/xbzxx/
-@dirrm %%DATADIR%%/books/qqssbdc/xbzgz/
-@dirrm %%DATADIR%%/books/qqssbdc/xbjqse/
-@dirrm %%DATADIR%%/books/qqssbdc/xbjbxx/
-@dirrm %%DATADIR%%/books/qqssbdc/xbdxyy/
-@dirrm %%DATADIR%%/books/qqssbdc/wmyy/
-@dirrm %%DATADIR%%/books/qqssbdc/tdxl/
-@dirrm %%DATADIR%%/books/qqssbdc/sxsyy/
-@dirrm %%DATADIR%%/books/qqssbdc/swyy/
-@dirrm %%DATADIR%%/books/qqssbdc/shdjks/
-@dirrm %%DATADIR%%/books/qqssbdc/shbjc/
-@dirrm %%DATADIR%%/books/qqssbdc/rjbxx/
-@dirrm %%DATADIR%%/books/qqssbdc/rjbcz/
-@dirrm %%DATADIR%%/books/qqssbdc/qt/
-@dirrm %%DATADIR%%/books/qqssbdc/pgych/
-@dirrm %%DATADIR%%/books/qqssbdc/njxxyy/
-@dirrm %%DATADIR%%/books/qqssbdc/njgzyy/
-@dirrm %%DATADIR%%/books/qqssbdc/njczyy/
-@dirrm %%DATADIR%%/books/qqssbdc/njcz/
-@dirrm %%DATADIR%%/books/qqssbdc/mgzy/
-@dirrm %%DATADIR%%/books/qqssbdc/mgyyjc/
-@dirrm %%DATADIR%%/books/qqssbdc/ltseyy/
-@dirrm %%DATADIR%%/books/qqssbdc/lsxyy/
-@dirrm %%DATADIR%%/books/qqssbdc/kydjks/
-@dirrm %%DATADIR%%/books/qqssbdc/kydg/
-@dirrm %%DATADIR%%/books/qqssbdc/ktxxx/
-@dirrm %%DATADIR%%/books/qqssbdc/jsscz/
-@dirrm %%DATADIR%%/books/qqssbdc/jsjyy/
-@dirrm %%DATADIR%%/books/qqssbdc/jqseyy/
-@dirrm %%DATADIR%%/books/qqssbdc/jqgj/
-@dirrm %%DATADIR%%/books/qqssbdc/hbbgz/
-@dirrm %%DATADIR%%/books/qqssbdc/gzyy/
-@dirrm %%DATADIR%%/books/qqssbdc/gzxx/
-@dirrm %%DATADIR%%/books/qqssbdc/gkch/
-@dirrm %%DATADIR%%/books/qqssbdc/ggyy/
-@dirrm %%DATADIR%%/books/qqssbdc/dzyy/
-@dirrm %%DATADIR%%/books/qqssbdc/dxyyzy/
-@dirrm %%DATADIR%%/books/qqssbdc/dxyyjd/
-@dirrm %%DATADIR%%/books/qqssbdc/dxtyyy/
-@dirrm %%DATADIR%%/books/qqssbdc/dxchdg/
-@dirrm %%DATADIR%%/books/qqssbdc/ddyy/
-@dirrm %%DATADIR%%/books/qqssbdc/dddxyy/
-@dirrm %%DATADIR%%/books/qqssbdc/cykych/
-@dirrm %%DATADIR%%/books/qqssbdc/crgk/
-@dirrm %%DATADIR%%/books/qqssbdc/cpfjch/
-@dirrm %%DATADIR%%/books/qqssbdc/bsdcz/
-@dirrm %%DATADIR%%/books/qqssbdc/bjbxx/
-@dirrm %%DATADIR%%/books/qqssbdc/bjbcz/
-@dirrm %%DATADIR%%/books/qqssbdc/XXXyy/
-@dirrm %%DATADIR%%/books/qqssbdc/VOCABULARY/
-@dirrm %%DATADIR%%/books/qqssbdc/TOEIC/
-@dirrm %%DATADIR%%/books/qqssbdc/TOEFL/
-@dirrm %%DATADIR%%/books/qqssbdc/MBAdg/
-@dirrm %%DATADIR%%/books/qqssbdc/IELTS/
-@dirrm %%DATADIR%%/books/qqssbdc/GRE/
-@dirrm %%DATADIR%%/books/qqssbdc/GMAT/
-@dirrm %%DATADIR%%/books/qqssbdc/AAAyy/
-@dirrm %%DATADIR%%/books/qqssbdc/21sjdx/
-@dirrm %%DATADIR%%/books/qqssbdc/
-@dirrm %%DATADIR%%/books/ljjy/
-@dirrm %%DATADIR%%/books/fkbdc/
-@dirrm %%DATADIR%%/books/
+@dirrm %%DATADIR%%/books/wyabdc
+@dirrm %%DATADIR%%/books/qqssbdc/zwwl
+@dirrm %%DATADIR%%/books/qqssbdc/zk
+@dirrm %%DATADIR%%/books/qqssbdc/zhyy
+@dirrm %%DATADIR%%/books/qqssbdc/zcyy
+@dirrm %%DATADIR%%/books/qqssbdc/zbmg
+@dirrm %%DATADIR%%/books/qqssbdc/yy
+@dirrm %%DATADIR%%/books/qqssbdc/yxyy
+@dirrm %%DATADIR%%/books/qqssbdc/ylbcz
+@dirrm %%DATADIR%%/books/qqssbdc/yjxx
+@dirrm %%DATADIR%%/books/qqssbdc/yjsyy
+@dirrm %%DATADIR%%/books/qqssbdc/yhbxx
+@dirrm %%DATADIR%%/books/qqssbdc/xxxyy2
+@dirrm %%DATADIR%%/books/qqssbdc/xsydx
+@dirrm %%DATADIR%%/books/qqssbdc/xsjxx
+@dirrm %%DATADIR%%/books/qqssbdc/xsjgz
+@dirrm %%DATADIR%%/books/qqssbdc/xrjgz
+@dirrm %%DATADIR%%/books/qqssbdc/xrjbxx
+@dirrm %%DATADIR%%/books/qqssbdc/xrjbgz
+@dirrm %%DATADIR%%/books/qqssbdc/xrjbcz
+@dirrm %%DATADIR%%/books/qqssbdc/xmbrj
+@dirrm %%DATADIR%%/books/qqssbdc/xmbcz
+@dirrm %%DATADIR%%/books/qqssbdc/xgzyy
+@dirrm %%DATADIR%%/books/qqssbdc/xglyy
+@dirrm %%DATADIR%%/books/qqssbdc/xdxdg
+@dirrm %%DATADIR%%/books/qqssbdc/xbzxx
+@dirrm %%DATADIR%%/books/qqssbdc/xbzgz
+@dirrm %%DATADIR%%/books/qqssbdc/xbjqse
+@dirrm %%DATADIR%%/books/qqssbdc/xbjbxx
+@dirrm %%DATADIR%%/books/qqssbdc/xbdxyy
+@dirrm %%DATADIR%%/books/qqssbdc/wybcz
+@dirrm %%DATADIR%%/books/qqssbdc/wmyy
+@dirrm %%DATADIR%%/books/qqssbdc/tdxl
+@dirrm %%DATADIR%%/books/qqssbdc/sxsyy
+@dirrm %%DATADIR%%/books/qqssbdc/swyy
+@dirrm %%DATADIR%%/books/qqssbdc/shdjks
+@dirrm %%DATADIR%%/books/qqssbdc/shbjc
+@dirrm %%DATADIR%%/books/qqssbdc/rjbxx
+@dirrm %%DATADIR%%/books/qqssbdc/rjbcz
+@dirrm %%DATADIR%%/books/qqssbdc/qt
+@dirrm %%DATADIR%%/books/qqssbdc/pgych
+@dirrm %%DATADIR%%/books/qqssbdc/njxxyy
+@dirrm %%DATADIR%%/books/qqssbdc/njgzyy
+@dirrm %%DATADIR%%/books/qqssbdc/njczyy
+@dirrm %%DATADIR%%/books/qqssbdc/njcz
+@dirrm %%DATADIR%%/books/qqssbdc/mgzy
+@dirrm %%DATADIR%%/books/qqssbdc/mgyyjc
+@dirrm %%DATADIR%%/books/qqssbdc/ltseyy
+@dirrm %%DATADIR%%/books/qqssbdc/lsxyy
+@dirrm %%DATADIR%%/books/qqssbdc/kydjks
+@dirrm %%DATADIR%%/books/qqssbdc/kydg
+@dirrm %%DATADIR%%/books/qqssbdc/ktxxx
+@dirrm %%DATADIR%%/books/qqssbdc/jsscz
+@dirrm %%DATADIR%%/books/qqssbdc/jsjyy
+@dirrm %%DATADIR%%/books/qqssbdc/jqseyy
+@dirrm %%DATADIR%%/books/qqssbdc/jqgj
+@dirrm %%DATADIR%%/books/qqssbdc/hbbgz
+@dirrm %%DATADIR%%/books/qqssbdc/gzyy
+@dirrm %%DATADIR%%/books/qqssbdc/gzxx
+@dirrm %%DATADIR%%/books/qqssbdc/gkch
+@dirrm %%DATADIR%%/books/qqssbdc/ggyy
+@dirrm %%DATADIR%%/books/qqssbdc/dzyy
+@dirrm %%DATADIR%%/books/qqssbdc/dxyyzy
+@dirrm %%DATADIR%%/books/qqssbdc/dxyyjd
+@dirrm %%DATADIR%%/books/qqssbdc/dxtyyy
+@dirrm %%DATADIR%%/books/qqssbdc/dxchdg
+@dirrm %%DATADIR%%/books/qqssbdc/ddyy
+@dirrm %%DATADIR%%/books/qqssbdc/dddxyy
+@dirrm %%DATADIR%%/books/qqssbdc/cykych
+@dirrm %%DATADIR%%/books/qqssbdc/crgk
+@dirrm %%DATADIR%%/books/qqssbdc/cpfjch
+@dirrm %%DATADIR%%/books/qqssbdc/cd
+@dirrm %%DATADIR%%/books/qqssbdc/bsdcz
+@dirrm %%DATADIR%%/books/qqssbdc/bjbxx
+@dirrm %%DATADIR%%/books/qqssbdc/bjbcz
+@dirrm %%DATADIR%%/books/qqssbdc/XXXyy
+@dirrm %%DATADIR%%/books/qqssbdc/VOCABULARY
+@dirrm %%DATADIR%%/books/qqssbdc/TOEIC
+@dirrm %%DATADIR%%/books/qqssbdc/TOEFL
+@dirrm %%DATADIR%%/books/qqssbdc/MBAdg
+@dirrm %%DATADIR%%/books/qqssbdc/IELTS
+@dirrm %%DATADIR%%/books/qqssbdc/GRE
+@dirrm %%DATADIR%%/books/qqssbdc/GMAT
+@dirrm %%DATADIR%%/books/qqssbdc/AAAyy
+@dirrm %%DATADIR%%/books/qqssbdc/21sjdx
+@dirrm %%DATADIR%%/books/qqssbdc
+@dirrm %%DATADIR%%/books/ljjy
+@dirrm %%DATADIR%%/books/fkbdc
+@dirrm %%DATADIR%%/books
 @dirrm %%DATADIR%%
 @dirrmtry share/applications