svn commit: r39317 - in projects/sgml2xml: de_DE.ISO8859-1/htdocs/ports en_US.ISO8859-1/htdocs/ports en_US.ISO8859-1/htdocs/security fr_FR.ISO8859-1/htdocs fr_FR.ISO8859-1/htdocs/security hu_HU.ISO...

Sat Aug 4 17:56:05 UTC 2012

Author: gabor
Date: Sat Aug  4 17:56:04 2012
New Revision: 39317
URL: http://svn.freebsd.org/changeset/doc/39317

Log:
  - Drop HTML Tidy support on webpages; on articles/books it is still used
    since the default HTML output is not that clean
  
  Approved by:	doceng (implicit)

Modified:
  projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile
  projects/sgml2xml/en_US.ISO8859-1/htdocs/security/Makefile
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/Makefile
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/Makefile
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/Makefile
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile
  projects/sgml2xml/ja_JP.eucJP/htdocs/security/Makefile
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/gnome/Makefile
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/security/Makefile
  projects/sgml2xml/share/mk/doc.html.mk
  projects/sgml2xml/share/mk/doc.xml.mk
  projects/sgml2xml/share/mk/web.site.mk
  projects/sgml2xml/zh_CN.GB2312/htdocs/security/Makefile

Modified: projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile
==============================================================================

--- projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -59,8 +59,6 @@ Makefile.gen: categories-alpha.sgml cate
 		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
 	done
 	${ECHO_CMD} >> Makefile.gen
-.if defined(NO_TIDY)
-	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
 .endif
 
 .if defined(CLUSTER_MACHINE)

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -46,9 +46,7 @@ packages.exists:
 Makefile.gen: categories-alpha.sgml categories-grouped.sgml index.sgml \
 	installing.sgml master-index.sgml references.sgml searching.sgml \
 	statistics.ent updating.sgml .NOTMAIN
-	(	${ECHO_CMD} TIDY=${PERL};\
-		${ECHO_CMD} TIDYOPTS="-i'' -npe 's,\"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\",\"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\",'";\
-		${ECHO_CMD} DOCS= *.sgml;\
+	(	${ECHO_CMD} DOCS= *.sgml;\
 		${ECHO_CMD} -n "DYNAMIC_DOCS= ";\
 		${ECHO_CMD} -n " categories-alpha.sgml";\
 		${ECHO_CMD} -n " categories-grouped.sgml";\
@@ -59,8 +57,6 @@ Makefile.gen: categories-alpha.sgml cate
 		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
 	done
 	${ECHO_CMD} >> Makefile.gen
-.if defined(NO_TIDY)
-	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
 .endif
 
 .if defined(CLUSTER_MACHINE)

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/security/Makefile
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/security/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/security/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -27,13 +27,11 @@ XML.DEFAULT=		${XML_ADVISORIES}
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 PARAMS.advisories=	--param type "'advisory'"
 NO_DATA.advisories=	yes
-NO_TIDY.advisories=	yes
 
 XMLDOCS+=	notices:mkindex.xsl::notices.html.inc
 PARAMS.notices=		--param advisories.xml "'${XML_NOTICES}'"
 PARAMS.notices+=	--param type "'notice'"
 NO_DATA.notices=	yes
-NO_TIDY.notices=	yes
 
 XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
 XMLDOCS+=	advisories-rss:security-rss.xsl::rss.xml

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/Makefile
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -104,7 +104,5 @@ index.html: index.xsl ${XML_INCLUDES}\
 		--param curdate.xml "'${XML_EVENTS_CURDATE}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
 		${.CURDIR}/index.xsl ${XML_NEWS_NEWS} ${XML_EVENTS_EVENTS} ${XML_EVENTS_CURDATE}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/Makefile
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -25,6 +25,5 @@ XML.DEFAULT=		${XML_ADVISORIES}
 
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 NO_DATA.advisories=	yes
-NO_TIDY.advisories=	yes
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

Modified: projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/Makefile
==============================================================================
--- projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -26,7 +26,6 @@ XML.DEFAULT=		${XML_ADVISORIES}
 
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 NO_DATA.advisories=	yes
-NO_TIDY.advisories=	yes
 
 XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
 XMLDOCS+=	advisories-rss:security-rss.xsl::rss.xml

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -52,9 +52,7 @@ packages.exists:
 Makefile.gen: categories-alpha.sgml categories-grouped.sgml index.sgml \
 	installing.sgml master-index.sgml references.sgml searching.sgml \
 	statistics.ent updating.sgml .NOTMAIN
-	(	${ECHO_CMD} TIDY=${PERL};\
-		${ECHO_CMD} TIDYOPTS="-i'' -npe 's,\"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\",\"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\",'";\
-		${ECHO_CMD} DOCS= *.sgml;\
+	(	${ECHO_CMD} DOCS= *.sgml;\
 		${ECHO_CMD} -n "DYNAMIC_DOCS= ";\
 		${ECHO_CMD} -n " categories-alpha.sgml";\
 		${ECHO_CMD} -n " categories-grouped.sgml";\
@@ -65,8 +63,6 @@ Makefile.gen: categories-alpha.sgml cate
 		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
 	done
 	${ECHO_CMD} >> Makefile.gen
-.if defined(NO_TIDY)
-	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
 .endif
 
 .if defined(CLUSTER_MACHINE)

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/security/Makefile
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/security/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/security/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -29,13 +29,11 @@ XML.DEFAULT=		${XML_ADVISORIES}
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 PARAMS.advisories=	--param type "'advisory'"
 NO_DATA.advisories=	yes
-NO_TIDY.advisories=	yes
 
 XMLDOCS+=	notices:mkindex.xsl::notices.html.inc
 PARAMS.notices=		--param advisories.xml "'${XML_NOTICES}'"
 PARAMS.notices+=	--param type "'notice'"
 NO_DATA.notices=	yes
-NO_TIDY.notices=	yes
 
 #XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
 #XMLDOCS+=	advisories-rss:security-rss.xsl::rss.xml

Modified: projects/sgml2xml/ru_RU.KOI8-R/htdocs/gnome/Makefile
==============================================================================
--- projects/sgml2xml/ru_RU.KOI8-R/htdocs/gnome/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/ru_RU.KOI8-R/htdocs/gnome/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -27,22 +27,16 @@ CLEANFILES+=	news.rdf
 index.html! index.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS:N-nonet} -o index.html \
 		${.CURDIR}/index.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} index.html
 .endif
 
 news.rdf: rss.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o news.rdf \
 		${.CURDIR}/rss.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} -xml -wrap 0 ${TIDYOPTS} news.rdf
 .endif
 
 newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

Modified: projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile
==============================================================================
--- projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -62,9 +62,7 @@ packages.exists:
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
-	(	${ECHO_CMD} TIDY=${PERL};\
-		${ECHO_CMD} TIDYOPTS="-i'' -npe 's,\"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\",\"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\",'";\
-		${ECHO_CMD} DOCS= *.sgml;\
+	(	${ECHO_CMD} DOCS= *.sgml;\
 		${ECHO_CMD} -n "DYNAMIC_DOCS= ";\
 		${ECHO_CMD} -n " master-index.sgml";\
 		${ECHO_CMD} -n " index.sgml";\
@@ -72,8 +70,6 @@ Makefile.gen: index.sgml .NOTMAIN
 	for categoryfile in ${CATEGORYLIST}; do \
 		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
 	done
-.if defined(NO_TIDY)
-	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
 .endif
 
 index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN

Modified: projects/sgml2xml/ru_RU.KOI8-R/htdocs/security/Makefile
==============================================================================
--- projects/sgml2xml/ru_RU.KOI8-R/htdocs/security/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/ru_RU.KOI8-R/htdocs/security/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -33,13 +33,11 @@ XML.DEFAULT=		${XML_ADVISORIES}
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 PARAMS.advisories=	--param type "'advisory'"
 NO_DATA.advisories=	yes
-NO_TIDY.advisories=	yes
 
 XMLDOCS+=	notices:mkindex.xsl::notices.html.inc
 PARAMS.notices=		--param advisories.xml "'${XML_NOTICES}'"
 PARAMS.notices+=	--param type "'notice'"
 NO_DATA.notices=	yes
-NO_TIDY.notices=	yes
 
 XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
 XMLDOCS+=	advisories-rss:security-rss.xsl::rss.xml

Modified: projects/sgml2xml/share/mk/doc.html.mk
==============================================================================
--- projects/sgml2xml/share/mk/doc.html.mk	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/share/mk/doc.html.mk	Sat Aug  4 17:56:04 2012	(r39317)
@@ -30,14 +30,9 @@
 #
 # Variables used by both users and documents:
 #
-#	TIDYFLAGS	Additional flags to pass to Tidy.  Typically
-#			used to set "-raw" flag to handle 8bit characters.
-#
 #	EXTRA_CATALOGS	Additional catalog files that should be used by
 #			any SGML processing applications.
 #
-#	NO_TIDY		If you do not want to use tidy, set this to "YES".
-#
 # Documents should use the += format to access these.
 #
 
@@ -63,7 +58,6 @@ PKG_CREATE?=	/usr/sbin/pkg_create
 TAR?=		/usr/bin/tar
 XARGS?=		/usr/bin/xargs
 
-TIDYOPTS?=	-wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
 HTML2PDB?=	${PREFIX}/bin/iSiloBSD
 HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
 
@@ -143,10 +137,6 @@ all: ${_docs}
 
 ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
 	${SGMLNORM} -c ${HTMLCATALOG} ${SRCS:S|^|${.CURDIR}/|} > ${.TARGET}
-.if !defined(NO_TIDY)
-	${REINPLACE_TABS_CMD} ${.TARGET}
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
 
 ${DOC}.txt: ${DOC}.html
 	${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}

Modified: projects/sgml2xml/share/mk/doc.xml.mk
==============================================================================
--- projects/sgml2xml/share/mk/doc.xml.mk	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/share/mk/doc.xml.mk	Sat Aug  4 17:56:04 2012	(r39317)
@@ -269,10 +269,6 @@ XML_NOTICES=		${DOC_PREFIX}/share/sgml/n
 #   The ${TARGET.<id>} file will not be listed in $DATA if defined.
 #   NO_DATA.DEFAULT is the setting for all <id>s.
 #
-# NO_TIDY.<id>
-#   The ${TARGET.<id>} file will not be processed by tidy if defined.
-#   NO_TIDY.DEFAULT is the setting for all <id>s.
-#
 XSLTPROC_ENV+=	SGML_CATALOG_FILES=
 XSLTPROC_ENV+=	XML_CATALOG_FILES="${XML_CATALOG_FILES}"
 
@@ -334,13 +330,6 @@ DEPENDSET.${_ID}=	${DEPENDSET.DEFAULT}
 DEPENDSET.${_ID}=
 .endif
 .endif
-.if !defined(NO_TIDY.${_ID}) || empty(NO_TIDY.${_ID})
-.if defined(NO_TIDY.DEFAULT)
-NO_TIDY.${_ID}=	${NO_TIDY.DEFAULT}
-.else
-NO_TIDY.${_ID}=
-.endif
-.endif
 .if !defined(NO_DATA.${_ID}) || empty(NO_DATA.${_ID})
 .if defined(NO_DATA.DEFAULT)
 NO_DATA.${_ID}=	${NO_DATA.DEFAULT}
@@ -380,12 +369,6 @@ ${TARGET.${_ID}}: ${XML.${_ID}} ${DEPEND
 	${XSLTPROC} ${XSLTPROCOPTS.${_ID}} \
 		-o ${.TARGET} ${PARAMS.${_ID}} \
 		${XSLT.${_ID}} ${XML.${_ID}}
-. if !defined(NO_TIDY) || empty(NO_TIDY)
-.  if !defined(NO_TIDY.${_ID}) || empty(NO_TIDY.${_ID})
-	${REINPLACE_TABS_CMD} ${.TARGET}
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.  endif
-. endif
 
 VALIDATE_DOCS+=	VALIDATE.${_ID}
 VALIDATE.${_ID}:

Modified: projects/sgml2xml/share/mk/web.site.mk
==============================================================================
--- projects/sgml2xml/share/mk/web.site.mk	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/share/mk/web.site.mk	Sat Aug  4 17:56:04 2012	(r39317)
@@ -64,15 +64,6 @@ XSLTPROCOPTS?=	${XSLTPROCFLAGS}
 XMLLINT?=	${PREFIX}/bin/xmllint
 XMLLINTOPTS?=	${XMLLINTFLAGS}
 
-TIDY?=		${PREFIX}/bin/tidy
-.if defined(TIDY_VERBOSE)
-_TIDYLOGFILE=	tidyerr.${.TARGET}
-CLEANFILES+=	tidyerr.*
-.else
-_TIDYLOGFILE=	/dev/null
-.endif
-TIDYOPTS?=	-wrap 90 -m -raw -preserve -f ${_TIDYLOGFILE} -asxml ${TIDYFLAGS}
-
 HTML2TXT?=	${PREFIX}/bin/w3m
 HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
 ISPELL?=	ispell

Modified: projects/sgml2xml/zh_CN.GB2312/htdocs/security/Makefile
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/htdocs/security/Makefile	Sat Aug  4 17:33:59 2012	(r39316)
+++ projects/sgml2xml/zh_CN.GB2312/htdocs/security/Makefile	Sat Aug  4 17:56:04 2012	(r39317)
@@ -20,6 +20,5 @@ XML.DEFAULT=		${XML_ADVISORIES}
 
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
 NO_DATA.advisories=	yes
-NO_TIDY.advisories=	yes
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
