From owner-svn-doc-projects@FreeBSD.ORG  Sun Feb  3 21:11:23 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7DF9E5CF;
 Sun,  3 Feb 2013 21:11:23 +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 708D0A86;
 Sun,  3 Feb 2013 21:11:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r13LBNsF043921;
 Sun, 3 Feb 2013 21:11:23 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r13LBNus043920;
 Sun, 3 Feb 2013 21:11:23 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201302032111.r13LBNus043920@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 3 Feb 2013 21:11:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40877 - 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: Sun, 03 Feb 2013 21:11:23 -0000

Author: gabor
Date: Sun Feb  3 21:11:22 2013
New Revision: 40877
URL: http://svnweb.freebsd.org/changeset/doc/40877

Log:
  - Do not pass the --catalogs option to xmllint/xsltproc since we don't
    have SGML catalogs any more

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	Sun Feb  3 17:38:17 2013	(r40876)
+++ projects/xml-tools/share/mk/doc.xml.mk	Sun Feb  3 21:11:22 2013	(r40877)
@@ -279,7 +279,7 @@ XSLTPROCOPTS+=	--xinclude
 XSLTPROCOPTS+=	--stringparam LOCALBASE ${LOCALBASE}
 XSLTPROCOPTS+=	--stringparam DOC_PREFIX ${DOC_PREFIX}
 .if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XSLTPROCOPTS+=	--nonet --catalogs
+XSLTPROCOPTS+=	--nonet
 .endif
 .if defined(WWWFREEBSDORG)
 XSLTPROCOPTS+=	--param "html.header.script.google" "'INCLUDE'"
@@ -289,7 +289,7 @@ XSLTPROC=	env ${XSLTPROC_ENV} ${LOCALBAS
 XMLLINTOPTS=	${XMLLINTFLAGS}
 XMLLINTOPTS+=	--xinclude --valid --noout
 .if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XMLLINTOPTS+=	--nonet --catalogs
+XMLLINTOPTS+=	--nonet
 .endif
 XMLLINT=	env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint