svn commit: r40850 - in projects/xml-tools: da_DK.ISO8859-1/share/xml de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/share/xml es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/x...

[Gabor Kovesdan]

Author: gabor
Date: Fri Feb  1 09:48:25 2013
New Revision: 40850
URL: http://svnweb.freebsd.org/changeset/doc/40850

Log:
  - Use exclusively the XML catalogs and drop the old SGML format

Deleted:
  projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog
  projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog
  projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog
  projects/xml-tools/en_US.ISO8859-1/share/xml/catalog
  projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog
  projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog
  projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog
  projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog
  projects/xml-tools/ja_JP.eucJP/share/xml/catalog
  projects/xml-tools/mn_MN.UTF-8/share/xml/catalog
  projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog
  projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog
  projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog
  projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog
  projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog
  projects/xml-tools/tr_TR.ISO8859-9/share/xml/catalog
  projects/xml-tools/zh_CN.GB2312/share/xml/catalog
  projects/xml-tools/zh_TW.Big5/share/xml/catalog
Modified:
  projects/xml-tools/share/mk/doc.docbook.mk
  projects/xml-tools/share/mk/doc.xml.mk

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Fri Feb  1 09:18:30 2013	(r40849)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Fri Feb  1 09:48:25 2013	(r40850)
@@ -146,8 +146,6 @@ DSLHTML?=	${DOC_PREFIX}/share/xml/defaul
 DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
 DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
 
-FREEBSDCATALOG=	${DOC_PREFIX}/share/xml/catalog
-LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
 ISO8879CATALOG=	${PREFIX}/share/sgml/iso8879/catalog
 DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
@@ -574,7 +572,7 @@ ${DOC}.rtf:
 .if ${PDFENGINE} == "jade"
 
 ${DOC}.parsed.xml: ${SRCS}
-	${XMLLINT} --catalogs --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
+	${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
 
 .if !defined(NO_TEX)
 #
@@ -695,7 +693,7 @@ ${DOC}.${_curformat}:
 #
 
 lint validate: ${SRCS}
-	${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC}
+	${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
 
 # ------------------------------------------------------------------------
 #

Modified: projects/xml-tools/share/mk/doc.xml.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.xml.mk	Fri Feb  1 09:18:30 2013	(r40849)
+++ projects/xml-tools/share/mk/doc.xml.mk	Fri Feb  1 09:48:25 2013	(r40850)
@@ -272,7 +272,6 @@ XML_NOTICES=		${DOC_PREFIX}/share/xml/no
 #   The ${TARGET.<id>} file will not be listed in $DATA if defined.
 #   NO_DATA.DEFAULT is the setting for all <id>s.
 #
-XSLTPROC_ENV+=	SGML_CATALOG_FILES=
 XSLTPROC_ENV+=	XML_CATALOG_FILES="${XML_CATALOG_FILES}"
 
 XSLTPROCOPTS=	${XSLTPROCFLAGS}