svn commit: r40881 - projects/xml-tools/share/mk

[Gabor Kovesdan]

Author: gabor
Date: Mon Feb  4 09:05:59 2013
New Revision: 40881
URL: http://svnweb.freebsd.org/changeset/doc/40881

Log:
  - Do not pass unused XSLT params
  - Remove some conditionals since we always use XML catalogs

Modified:
  projects/xml-tools/share/mk/doc.xml.mk

Modified: projects/xml-tools/share/mk/doc.xml.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.xml.mk	Mon Feb  4 00:21:25 2013	(r40880)
+++ projects/xml-tools/share/mk/doc.xml.mk	Mon Feb  4 09:05:59 2013	(r40881)
@@ -275,22 +275,14 @@ XML_NOTICES=		${DOC_PREFIX}/share/xml/no
 XSLTPROC_ENV+=	XML_CATALOG_FILES="${XML_CATALOG_FILES}"
 
 XSLTPROCOPTS=	${XSLTPROCFLAGS}
-XSLTPROCOPTS+=	--xinclude
-XSLTPROCOPTS+=	--stringparam LOCALBASE ${LOCALBASE}
-XSLTPROCOPTS+=	--stringparam DOC_PREFIX ${DOC_PREFIX}
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XSLTPROCOPTS+=	--nonet
-.endif
+XSLTPROCOPTS+=	--xinclude --nonet
 .if defined(WWWFREEBSDORG)
 XSLTPROCOPTS+=	--param "html.header.script.google" "'INCLUDE'"
 .endif
 XSLTPROC=	env ${XSLTPROC_ENV} ${LOCALBASE}/bin/xsltproc
 
 XMLLINTOPTS=	${XMLLINTFLAGS}
-XMLLINTOPTS+=	--xinclude --valid --noout
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XMLLINTOPTS+=	--nonet
-.endif
+XMLLINTOPTS+=	--xinclude --valid --noout --nonet
 XMLLINT=	env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint
 
 .for D in ${XMLDOCS}