From owner-svn-doc-head@freebsd.org Sat Aug 1 10:16:41 2020 Return-Path: Delivered-To: svn-doc-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44798376D84; Sat, 1 Aug 2020 10:16:41 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BJg6d15t8z49f0; Sat, 1 Aug 2020 10:16:41 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E50A7112C4; Sat, 1 Aug 2020 10:16:40 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 071AGebl082327; Sat, 1 Aug 2020 10:16:40 GMT (envelope-from blackend@FreeBSD.org) Received: (from blackend@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 071AGeIY082325; Sat, 1 Aug 2020 10:16:40 GMT (envelope-from blackend@FreeBSD.org) Message-Id: <202008011016.071AGeIY082325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: blackend set sender to blackend@FreeBSD.org using -f From: Marc Fonvieille Date: Sat, 1 Aug 2020 10:16:40 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r54388 - head/share/mk X-SVN-Group: doc-head X-SVN-Commit-Author: blackend X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 54388 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Aug 2020 10:16:41 -0000 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?= doc@FreeBSD.org # Master list of known target formats. The doc..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"