From owner-svn-doc-projects@FreeBSD.ORG  Sun Jul 15 10:42:41 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D4E11065674;
	Sun, 15 Jul 2012 10:42:41 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 791BA8FC15;
	Sun, 15 Jul 2012 10:42:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6FAgfeT042289;
	Sun, 15 Jul 2012 10:42:41 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6FAgfoa042287;
	Sun, 15 Jul 2012 10:42:41 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201207151042.q6FAgfoa042287@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 15 Jul 2012 10:42:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39211 - projects/sgml2xml/share/mk
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for doc projects trees
	<svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jul 2012 10:42:41 -0000

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