Merge the XML toolchain upgrade, which contains the following changes:

  - Upgrade to DocBook 4.5
  - Use XSLT instead of DSSSL to render XHTML-based output
  - Generate PDF from PS and simplify image processing
  - Fix make lint and validate the whole documentation set
  - Fix rendering of TOC elements
  - Fix misused link elements that resulted in a corrupt rendering
  - Use more human-friendly publication data and release info rendering
  - Add support for XInclude in DocBook documents
  - Add support for profiling with attributes [1]
  - Add support for Schematron constraints
  - Add experimental epub support
  - Add experimental support for XSL-FO-based printed output
  - Clean up obsolete SGML constructs
  - Clean up catalogs
  - Drop HTML Tidy since it is not needed any more

  [1] http://www.sagehill.net/docbookxsl/Profiling.html

The dependencies of the build will change as follows:
  - textproc/opensp
  - www/tidy-lib
  - textproc/html
  - textproc/linuxdoc
  - textproc/docbook-410
  - textproc/docbook-xml
  + textproc/docbook-xml-450
  + textproc/iso-schematron-xslt

Approved by:	doceng (implicit)

10 files changed, 51 insertions, 62 deletions

diff --git a/pt_BR.ISO8859-1/share/xml/catalog b/pt_BR.ISO8859-1/share/xml/catalog
index 81fb8e8799..2422c1740c 100644
--- a/pt_BR.ISO8859-1/share/xml/catalog
+++ b/pt_BR.ISO8859-1/share/xml/catalog
@@ -1,48 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- Portuguese Brazilian specific ........................................ --
-
-  -- The FreeBSD Documentation Project
-  -- The FreeBSD Brazilian Portuguese Documentation Project
-
-  -- Original revision: r38826
-
-  --
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
-        "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
-        "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
-        "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
-       "teams.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translators Entities//PT"
-        "translators.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
-	"trademarks.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
-        "words.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//PT"
-        "books.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//PT"
-        "articles.ent"
-
+       "freebsd.dsl"
diff --git a/pt_BR.ISO8859-1/share/xml/catalog.xml b/pt_BR.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..d44a80dbca
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//PT"
+        uri="translators.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+        uri="l10n.ent" />
+</catalog>
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 87648dace0..6776d9dcae 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+	"translators.ent">
 %translators;
-<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT">
+<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
+	"words.ent">
 %words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+	"teams.ent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
diff --git a/pt_BR.ISO8859-1/share/xml/l10n.ent b/pt_BR.ISO8859-1/share/xml/l10n.ent
index d82aec6554..6d7f8aa948 100644
--- a/pt_BR.ISO8859-1/share/xml/l10n.ent
+++ b/pt_BR.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (pt_BR).
 
diff --git a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
index 321eb0194b..77039cc53b 100644
--- a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Nomes das listas de discussão do FreeBSD e dos softwares
     relacionados
diff --git a/pt_BR.ISO8859-1/share/xml/newsgroups.ent b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
index 2c06789b80..e55b43329b 100644
--- a/pt_BR.ISO8859-1/share/xml/newsgroups.ent
+++ b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Names of FreeBSD newsgroups
 
diff --git a/pt_BR.ISO8859-1/share/xml/teams.ent b/pt_BR.ISO8859-1/share/xml/teams.ent
index 7476584e03..e1a4644091 100644
--- a/pt_BR.ISO8859-1/share/xml/teams.ent
+++ b/pt_BR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   Names and email address of teams of people working on specified
   tasks. Usually they're just mail aliases set up at hub.FreeBSD.org
diff --git a/pt_BR.ISO8859-1/share/xml/trademarks.ent b/pt_BR.ISO8859-1/share/xml/trademarks.ent
index 66359ab3b6..4e457d3b42 100644
--- a/pt_BR.ISO8859-1/share/xml/trademarks.ent
+++ b/pt_BR.ISO8859-1/share/xml/trademarks.ent
@@ -1,4 +1,5 @@
-<!-- $FreeBSD -->
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $FreeBSD$ -->
 
 <!ENTITY legalnotice '
 <legalnotice id="legalnotice">
diff --git a/pt_BR.ISO8859-1/share/xml/translators.ent b/pt_BR.ISO8859-1/share/xml/translators.ent
index 99a9f543e7..d6ff0d4fb8 100644
--- a/pt_BR.ISO8859-1/share/xml/translators.ent
+++ b/pt_BR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/words.ent b/pt_BR.ISO8859-1/share/xml/words.ent
index 659d4513cb..e77f89d3f8 100644
--- a/pt_BR.ISO8859-1/share/xml/words.ent
+++ b/pt_BR.ISO8859-1/share/xml/words.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Words that were deemed too controversial.  Which, therefore,
      would require several futher revisions.  Moreover, the use of