From owner-freebsd-doc Sun Mar 23 5:50:17 2003 Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C51A37B401 for ; Sun, 23 Mar 2003 05:50:14 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19B7943FA3 for ; Sun, 23 Mar 2003 05:50:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h2NDoBNS038975 for ; Sun, 23 Mar 2003 05:50:11 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h2NDoBXG038974; Sun, 23 Mar 2003 05:50:11 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B3C037B404 for ; Sun, 23 Mar 2003 05:41:22 -0800 (PST) Received: from 213-84-207-11.adsl.xs4all.nl (nexus.xs4all.nl [213.84.207.11]) by mx1.FreeBSD.org (Postfix) with ESMTP id 971A643F75 for ; Sun, 23 Mar 2003 05:41:20 -0800 (PST) (envelope-from asmodai@nexus.ninth-circle.org) Received: by 213-84-207-11.adsl.xs4all.nl (Postfix, from userid 1000) id DC6D35B0; Sun, 23 Mar 2003 14:41:18 +0100 (CET) Message-Id: <20030323134118.DC6D35B0@213-84-207-11.adsl.xs4all.nl> Date: Sun, 23 Mar 2003 14:41:18 +0100 (CET) From: Jeroen Ruigrok van der Werven Reply-To: Jeroen Ruigrok van der Werven To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: docs/50211: [PATCH] Fix textfile creation Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 50211 >Category: docs >Synopsis: [PATCH] Fix textfile creation >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 23 05:50:11 PST 2003 >Closed-Date: >Last-Modified: >Originator: Jeroen Ruigrok van der Werven >Release: FreeBSD 4.7-STABLE i386 >Organization: Ninth Circle Enterprises >Environment: Not applicable. >Description: A person might want to have the latest links installed, however, this messes up textfile creation from html files since the latest links version does not support -dump anymore. >How-To-Repeat: Install docproj, install ports/www/links. >Fix: Ditch links in favour of elinks, see attached patches. Index: doc/share/mk/doc.docbook.mk =================================================================== RCS file: /home/ncvs/FreeBSD/doc/share/mk/doc.docbook.mk,v retrieving revision 1.78 diff -u -r1.78 doc.docbook.mk --- doc/share/mk/doc.docbook.mk 16 Feb 2003 14:59:30 -0000 1.78 +++ doc/share/mk/doc.docbook.mk 23 Mar 2003 13:37:43 -0000 @@ -217,7 +217,7 @@ GROFF?= groff TIDY?= ${PREFIX}/bin/tidy TIDYOPTS?= -i -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS} -HTML2TXT?= ${PREFIX}/bin/links +HTML2TXT?= ${PREFIX}/bin/elinks HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} HTML2PDB?= ${PREFIX}/bin/iSiloBSD HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} @@ -440,6 +440,9 @@ ${DOC}.html-text: ${DOC}.xml ${INDEX_SGML} ${HTML_INDEX} ${XSLTPROC} --param freebsd.output.html.images "'0'" ${XSLHTML} \ ${DOC}.xml > ${.TARGET} +.endif +.if !defined(NO_TIDY) + -${TIDY} ${TIDYOPTS} ${.TARGET} .endif ${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \ Index: doc/share/mk/doc.html.mk =================================================================== RCS file: /home/ncvs/FreeBSD/doc/share/mk/doc.html.mk,v retrieving revision 1.15 diff -u -r1.15 doc.html.mk --- doc/share/mk/doc.html.mk 27 Dec 2002 00:25:42 -0000 1.15 +++ doc/share/mk/doc.html.mk 23 Mar 2003 13:29:35 -0000 @@ -69,7 +69,7 @@ TIDY?= ${PREFIX}/bin/tidy TIDYOPTS?= -i -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS} -HTML2TXT?= ${PREFIX}/bin/links +HTML2TXT?= ${PREFIX}/bin/elinks HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} HTML2PDB?= ${PREFIX}/bin/iSiloBSD HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} Index: ports/textproc/docproj/Makefile =================================================================== RCS file: /home/ncvs/FreeBSD/ports/textproc/docproj/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- ports/textproc/docproj/Makefile 7 Mar 2003 06:11:39 -0000 1.41 +++ ports/textproc/docproj/Makefile 23 Mar 2003 13:34:02 -0000 @@ -27,7 +27,7 @@ ${PREFIX}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \ ${PREFIX}/bin/peps:${PORTSDIR}/graphics/peps \ ${PREFIX}/bin/pngtopnm:${PORTSDIR}/graphics/netpbm \ - ${PREFIX}/bin/links:${PORTSDIR}/www/links1 \ + ${PREFIX}/bin/elinks:${PORTSDIR}/www/elinks \ ${PREFIX}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \ ${PREFIX}/bin/scr2png:${PORTSDIR}/graphics/scr2png \ ${PREFIX}/bin/scr2txt:${PORTSDIR}/textproc/scr2txt >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message