svn commit: r39211 - projects/sgml2xml/share/mk

[Gabor Kovesdan]

Author: gabor
Date: Sun Jul 15 10:42:40 2012
New Revision: 39211
URL: http://svn.freebsd.org/changeset/doc/39211

Log:
  - Render pages with the newly added XSLT
  - Disable HTML tidy
  - Remove old comment
  
  Approved by:	doceng (implicit)

Modified:
  projects/sgml2xml/share/mk/web.site.mk

Modified: projects/sgml2xml/share/mk/web.site.mk
==============================================================================
--- projects/sgml2xml/share/mk/web.site.mk	Sun Jul 15 10:41:05 2012	(r39210)
+++ projects/sgml2xml/share/mk/web.site.mk	Sun Jul 15 10:42:40 2012	(r39211)
@@ -190,20 +190,12 @@ PREHTML?=	${SED} -e ${DATESUBST} ${BASES
 GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.sgml}
 
-# XXX: using a pipe between ${PREHTML} and ${SGMLNORM} should be better,
-# but very strange errors will be reported when using osgmlnorm (from
-# OpenSP.  sgmlnorm works fine).  For the moment, we use a temporary file
-# to prevent it.
-
-.sgml.html: ${_SGML_INCLUDES}
+.sgml.html: ${_DEPENDSET.wwwstd} ${DOC_PREFIX}/share/sgml/xhtml.xsl
 	${PREHTML} ${PREHTMLOPTS} ${.IMPSRC} > ${.IMPSRC}-tmp
-	${SETENV} SGML_CATALOG_FILES= \
-		${SGMLNORM} ${SGMLNORMOPTS} ${.IMPSRC}-tmp > ${.TARGET} || \
+	${XMLLINT} ${XMLLINTOPTS} ${.IMPSRC}-tmp
+	${XSLTPROC} ${XSLTPROCOPTS} --debug -o ${.TARGET} ${DOC_PREFIX}/share/sgml/xhtml.xsl ${.IMPSRC}-tmp || \
 			(${RM} -f ${.IMPSRC}-tmp ${.TARGET} && false)
 	${RM} -f ${.IMPSRC}-tmp
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
 
 ##################################################################
 # Special Targets