From 49010f9fabae168ec8f58296a4ec81ef2bad9168 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 4 Feb 2013 09:05:59 +0000
Subject: [PATCH] - Do not pass unused XSLT params - Remove some conditionals
 since we always use XML catalogs

---
 share/mk/doc.xml.mk | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index cc6e86b5ce..500f27b07c 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -275,22 +275,14 @@ XML_NOTICES=		${DOC_PREFIX}/share/xml/notices.xml
 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}