svn commit: r54388 - head/share/mk
Marc Fonvieille <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
Author: blackend
Date: Sat Aug 1 10:16:40 2020
New Revision: 54388
URL: https://svnweb.freebsd.org/changeset/doc/54388
Log:
Remove PS format. PS files are broken: fop is unable to embed fonts.
PS is, nowadays, replaced with PDF. If PS is still needed, pdf2ps(1)
can be simply used on PDF files.
Approved by: doceng
Modified:
head/share/mk/doc.docbook.mk
head/share/mk/doc.project.mk
Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk Sat Aug 1 06:41:51 2020 (r54387)
+++ head/share/mk/doc.docbook.mk Sat Aug 1 10:16:40 2020 (r54388)
@@ -74,7 +74,7 @@ FOPJAVAOPTS?= -Xss1024k -Xmx1431552k
FOPOPTS?= -c ${DOC_PREFIX}/share/misc/fop.xconf
KNOWN_FORMATS= html html.tar html-split html-split.tar \
- epub txt rtf ps pdf tex dvi tar
+ epub txt rtf pdf tex dvi tar
CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css
@@ -221,13 +221,6 @@ CLEANFILES+= ${DOC}.rtf-nopng
.elif ${_cf} == "tex"
CLEANFILES+= ${DOC}.aux ${DOC}.log
-.elif ${_cf} == "ps"
-CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \
- ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo
-.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
-CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
-.endfor
-
.elif ${_cf} == "pdf"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
${DOC}.tex ${DOC}.fo
@@ -377,18 +370,12 @@ ${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAG
${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
${SETENV} FOP_OPTS="${FOPJAVAOPTS}" ${FOP} ${FOPOPTS} ${DOC}.fo -pdf ${.TARGET}
-${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
- ${SETENV} FOP_OPTS="${FOPJAVAOPTS}" ${FOP} ${FOPOPTS} ${DOC}.fo -ps ${.TARGET}
-
${DOC}.rtf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
${SETENV} FOP_OPTS="${FOPJAVAOPTS}" ${FOP} ${FOPOPTS} ${DOC}.fo -rtf ${.TARGET}
.else
# Default is dblatex
${DOC}.pdf: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
${DBLATEX} ${DOC}.parsed.print.xml ${DBLATEXOPTS} -tpdf -o ${.TARGET}
-
-${DOC}.ps: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
- ${DBLATEX} ${DOC}.parsed.print.xml ${DBLATEXOPTS} -tps -o ${.TARGET}
.endif
@@ -560,7 +547,7 @@ _curinst+= ${FORMATS:S/^/install-/g}
.endif
.if defined(NO_TEX)
-_curinst_filter+=N*dvi* N*tex* N*ps* N*pdf*
+_curinst_filter+=N*dvi* N*tex* N*pdf*
.endif
.if defined(NO_RTF)
_curinst_filter+=N*rtf*
Modified: head/share/mk/doc.project.mk
==============================================================================
--- head/share/mk/doc.project.mk Sat Aug 1 06:41:51 2020 (r54387)
+++ head/share/mk/doc.project.mk Sat Aug 1 10:16:40 2020 (r54388)
@@ -67,7 +67,7 @@ MAINTAINER?= [email protected]
# Master list of known target formats. The doc.<format>.mk files implement
# the code to convert from their source format to one or more of these target
# formats
-ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar
+ALL_FORMATS= html html.tar html-split html-split.tar txt rtf pdf tex dvi tar
.include "doc.commands.mk"
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"