Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Jul 2020 16:58:17 +0000 (UTC)
From:      Marc Fonvieille <blackend@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r54385 - head/share/mk
Message-ID:  <202007291658.06TGwHpJ048698@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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.<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 pdb
+ALL_FORMATS=	html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar
 
 .include "doc.commands.mk"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007291658.06TGwHpJ048698>