From owner-svn-doc-projects@FreeBSD.ORG  Mon Feb  4 09:05:59 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DAA6A95F;
 Mon,  4 Feb 2013 09:05:59 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C3D8B3FE;
 Mon,  4 Feb 2013 09:05:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1495x3j064440;
 Mon, 4 Feb 2013 09:05:59 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1495xkV064439;
 Mon, 4 Feb 2013 09:05:59 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201302040905.r1495xkV064439@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 4 Feb 2013 09:05:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40881 - projects/xml-tools/share/mk
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Mon, 04 Feb 2013 09:05:59 -0000

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}