2 files changed, 64 insertions, 67 deletions

diff --git a/chinese/vim-scdoc/Makefile b/chinese/vim-scdoc/Makefile
index aa3b2e484df3..a5b610894074 100644
--- a/chinese/vim-scdoc/Makefile
+++ b/chinese/vim-scdoc/Makefile
@@ -23,9 +23,10 @@ VIM_PATH=	${PREFIX}/share/vim/vim62
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-install:
-	${CP} -rf ${WRKSRC}/doc ${WRKSRC}/doc.zh_CN
+	@${MKDIR} ${WRKSRC}/doc.zh_CN
+	${CP} -rf ${WRKSRC}/doc/ ${WRKSRC}/doc.zh_CN/
 	(cd ${WRKSRC}; ${TAR} -cf - doc.zh_CN) | \
-	${TAR} -xf - -C ${VIM_PATH}/
+	${TAR} --exclude CVS -xf - -C ${VIM_PATH}/
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" \
diff --git a/chinese/vim-scdoc/pkg-plist b/chinese/vim-scdoc/pkg-plist
index 723b9ee39df6..31725fd81059 100644
--- a/chinese/vim-scdoc/pkg-plist
+++ b/chinese/vim-scdoc/pkg-plist
@@ -1,65 +1,61 @@
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_11.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/CVS/Root
-share/vim/%%PATH_SUB%%//doc.zh_CN/CVS/Repository
-share/vim/%%PATH_SUB%%//doc.zh_CN/CVS/Entries
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_12.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_20.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_21.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_22.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_23.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_24.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_25.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_26.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_27.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_28.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_29.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_30.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_31.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_40.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_41.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_42.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_43.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_44.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_45.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/undo.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/recover.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/if_ole.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/pi_gzip.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/diff.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_90.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/pattern.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/os_msdos.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/fold.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/os_mint.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/quickref.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/debugger.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/gui_w16.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/mlang.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/gui_w32.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/gui_x11.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/develop.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/os_win32.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/scroll.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/os_dos.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/howto.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/quickfix.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/os_mac.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_toc.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/windows.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/os_unix.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/autocmd.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/tips.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/mbyte.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_01.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/help.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_02.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_03.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_04.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_05.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_06.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_07.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_08.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_09.txt
-share/vim/%%PATH_SUB%%//doc.zh_CN/usr_10.txt
-@dirrm share/vim/%%PATH_SUB%%//doc.zh_CN/CVS
-@dirrm share/vim/%%PATH_SUB%%//doc.zh_CN
+share/vim/%%PATH_SUB%%/doc.zh_CN/autocmd.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/debugger.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/develop.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/scroll.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/diff.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/fold.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/help.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/howto.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/gui_w16.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/gui_w32.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/gui_x11.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/if_ole.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/mbyte.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/mlang.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/os_dos.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/os_mac.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/os_mint.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/os_msdos.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/os_unix.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/os_win32.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/pattern.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/pi_gzip.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/quickfix.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/quickref.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/recover.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/tips.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/undo.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_01.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_02.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_03.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_04.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_05.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_06.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_07.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_08.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_09.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_10.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_11.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_12.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_20.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_21.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_22.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_23.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_24.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_25.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_26.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_27.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_28.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_29.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_30.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_31.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_40.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_41.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_42.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_43.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_44.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_45.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_90.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/usr_toc.txt
+share/vim/%%PATH_SUB%%/doc.zh_CN/windows.txt
+@dirrm share/vim/%%PATH_SUB%%/doc.zh_CN