1 files changed, 7 insertions, 45 deletions

diff --git a/zh_CN.GB2312/share/mk/doc.local.mk b/zh_CN.GB2312/share/mk/doc.local.mk
index a17f865589..7d78b8cead 100644
--- a/zh_CN.GB2312/share/mk/doc.local.mk
+++ b/zh_CN.GB2312/share/mk/doc.local.mk
@@ -11,20 +11,12 @@ CJKTEXSTY_PDFTEX_FLAGS?= -c -e ${SP_ENCODING} -f song
 
 # Don't use "?=" in the following two lines.
 # They have been pre-defined in "doc.project.mk".
-HTML2TXT=	${PREFIX}/bin/html2text
-HTML2TXTOPTS=	-nobs -style pretty
+# XXX: broken as of RELEASE_6_1_0
+#HTML2TXT=	${PREFIX}/bin/html2text
+#HTML2TXTOPTS=	-nobs -style pretty
 
-.for _curformat in ${FORMATS}
-_cf=${_curformat}
-.if ${_cf} == "pdf"
-# Temporary auxiliary files generated for teTeX & CJK
-CLEANFILES+= ${DOC}.tex-pdf-cjk
-.elif ${_cf} == "dvi" || ${_cf} == "ps"
-# Temporary auxiliary files generated for teTeX & CJK
-# PostScript file comes from corresponding DVI file.
-CLEANFILES+= ${DOC}.tex-cjk
-.endif
-.endfor
+# XXX: broken as of RELEASE_6_1_0
+NO_TEX=	yes
 
 # In "doc/share/mk/doc.project.mk", "doc.images.mk" and "doc.common.mk"
 # is included before "doc.local.mk". Thus, we can use variables defined
@@ -37,38 +29,8 @@ CLEANFILES+= ${DOC}.tex-cjk
 # But no problems about using their variables in other places.
 # Then, PMake expands variables just when they are ACTUALLY USED.
 
-
-# Generate Chinese PDF
-.if !target(${DOC}.pdf)
-${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
-.for _curimage in ${IMAGES_PDF:M*share*}
-	${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-.endfor
-	${CJKTEXSTY} ${CJKTEXSTY_PDFTEX_FLAGS} < ${DOC}.tex-pdf > ${DOC}.tex-pdf-cjk
-
-	-${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-cjk}'
-	@${ECHO} "==> PDFTeX passed 1/3"
-	-${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-cjk}'
-	@${ECHO} "==> PDFTeX passed 2/3"
-	-${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-cjk}'
-	@${ECHO} "==> PDFTeX passed 3/3"
-.endif
-
-# Generate Chinese DVI, preparing for Chinese PostScript.
-.if !target(${DOC}.dvi)
-${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
-.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
-	${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-.endfor
-	${CJKTEXSTY} ${CJKTEXSTY_TEX_FLAGS} < ${DOC}.tex > ${DOC}.tex-cjk
-
-	-${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-cjk}'
-	@${ECHO} "==> JadeTeX passed 1/3"
-	-${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-cjk}'
-	@${ECHO} "==> JadeTeX passed 2/3"
-	-${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-cjk}'
-	@${ECHO} "==> JadeTeX passed 3/3"
-.endif
+PDFJADETEX_PREPROCESS=	${CJKTEXSTY} ${CJKTEXSTY_PDFTEX_FLAGS}
+JADETEX_PREPROCESS=	${CJKTEXSTY} ${CJKTEXSTY_PDFTEX_FLAGS}
 
 # For Chinese-specific switch "output.for.print".
 print.index: ${SRCS} ${LOCAL_IMAGES_TXT}