From owner-svn-doc-head@freebsd.org Wed Jul 29 16:58:18 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 C80763AE95A; Wed, 29 Jul 2020 16:58:18 +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 4BH09Q4ml4z41d3; Wed, 29 Jul 2020 16:58:18 +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 82ECC22EC9; Wed, 29 Jul 2020 16:58:18 +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 06TGwIEs048700; Wed, 29 Jul 2020 16:58:18 GMT (envelope-from blackend@FreeBSD.org) Received: (from blackend@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06TGwHpJ048698; Wed, 29 Jul 2020 16:58:17 GMT (envelope-from blackend@FreeBSD.org) Message-Id: <202007291658.06TGwHpJ048698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: blackend set sender to blackend@FreeBSD.org using -f From: Marc Fonvieille Date: Wed, 29 Jul 2020 16:58:17 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r54385 - head/share/mk X-SVN-Group: doc-head X-SVN-Commit-Author: blackend X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 54385 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: Wed, 29 Jul 2020 16:58:18 -0000 Author: blackend Date: Wed Jul 29 16:58:17 2020 New Revision: 54385 URL: https://svnweb.freebsd.org/changeset/doc/54385 Log: pdb format isn't supported since a while. Let's remove its remains. Modified: head/share/mk/doc.commands.mk head/share/mk/doc.docbook.mk head/share/mk/doc.project.mk Modified: head/share/mk/doc.commands.mk ============================================================================== --- head/share/mk/doc.commands.mk Wed Jul 29 11:13:42 2020 (r54384) +++ head/share/mk/doc.commands.mk Wed Jul 29 16:58:17 2020 (r54385) @@ -74,8 +74,6 @@ FOP?= ${PREFIX}/bin/fop GROFF?= groff -HTML2PDB?= ${PREFIX}/bin/iSiloBSD -HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} HTML2TXT?= ${PREFIX}/bin/links HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} Modified: head/share/mk/doc.docbook.mk ============================================================================== --- head/share/mk/doc.docbook.mk Wed Jul 29 11:13:42 2020 (r54384) +++ head/share/mk/doc.docbook.mk Wed Jul 29 16:58:17 2020 (r54385) @@ -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 pdb + epub txt rtf ps pdf tex dvi tar CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css @@ -240,9 +240,6 @@ XSLTPROCOPTS+= --maxdepth 12000 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor -.elif ${_cf} == "pdb" -_docs+= ${.CURDIR:T}.pdb -CLEANFILES+= ${.CURDIR:T}.pdb .endif .endif @@ -278,12 +275,7 @@ _curinst+= install-${_curformat}.${_curcomp} _docs+= ${DOC}.${_curformat}.${_curcomp} CLEANFILES+= ${DOC}.${_curformat}.${_curcomp} -.if ${_cf} == "pdb" -_docs+= ${.CURDIR:T}.${_curformat}.${_curcomp} -CLEANFILES+= ${.CURDIR:T}.${_curformat}.${_curcomp} - .endif -.endif .endfor .endfor .endif @@ -376,21 +368,6 @@ ${DOC}.txt: .endif .endif -# PDB -------------------------------------------------------------------- - -${DOC}.pdb: ${DOC}.html ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} - ${HTML2PDB} ${HTML2PDBOPTS} ${DOC}.html ${.TARGET} - -${.CURDIR:T}.pdb: ${DOC}.pdb - ${LN} -f ${.ALLSRC} ${.TARGET} - -.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED) -.for _curcomp in ${INSTALL_COMPRESSED} -${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp} - ${LN} -f ${.ALLSRC} ${.TARGET} -.endfor -.endif - # PS/PDF/RTF ----------------------------------------------------------------- ${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${DOC}.parsed.xml ${XML_INCLUDES} @@ -663,8 +640,6 @@ install-${_curformat}: ${DOC}.${_curformat} .for _curimage in ${IMAGES_EPS:N*/*} ${INSTALL_DOCS} ${_curimage} ${DESTDIR} .endfor -.elif ${_cf} == "pdb" - ${LN} -f ${DESTDIR}/${.ALLSRC} ${DESTDIR}/${.CURDIR:T}.${_curformat} .endif .if ${_cf} == "html-split" @@ -679,10 +654,6 @@ install-${_curformat}.tar.${_compressext}: ${DOC}.${_c install-${_curformat}.${_compressext}: ${DOC}.${_curformat}.${_compressext} @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR} ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR} -.if ${_cf} == "pdb" - ${LN} -f ${DESTDIR}/${.ALLSRC} \ - ${DESTDIR}/${.CURDIR:T}.${_curformat}.${_compressext} -.endif .endif .endfor .endif Modified: head/share/mk/doc.project.mk ============================================================================== --- head/share/mk/doc.project.mk Wed Jul 29 11:13:42 2020 (r54384) +++ head/share/mk/doc.project.mk Wed Jul 29 16:58:17 2020 (r54385) @@ -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 pdb +ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar .include "doc.commands.mk"