From 4b2bcbbc88b6a5f41802f3b58fd17b77a3ec619c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 21 Apr 2010 02:09:05 +0200
Subject: [PATCH] docbook-xml: properly register the XML catalogs, bumprev.

--HG--
extra : convert_revision : 8314c1426125010b10117141277311074c93783f
---
 srcpkgs/docbook-xml/template | 40 ++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template
index dccc2acfaa2..05e81829589 100644
--- a/srcpkgs/docbook-xml/template
+++ b/srcpkgs/docbook-xml/template
@@ -1,6 +1,7 @@
 # Template file for 'docbook-xml'
 pkgname=docbook-xml
 version=4.5
+revision=1
 wrksrc="docbook"
 distfiles="
 http://www.oasis-open.org/docbook/xml/$version/$pkgname-$version.zip
@@ -31,6 +32,23 @@ noextract=yes
 Add_dependency full xmlcatmgr
 Add_dependency build unzip
 
+xml_catalogs="
+/usr/share/xml/docbook/4.2/catalog
+/usr/share/xml/docbook/4.3/catalog
+/usr/share/xml/docbook/4.4/catalog
+/usr/share/xml/docbook/4.5/catalog
+/usr/share/xml/docbook/4.2/catalog-4.1.2"
+
+xml_entries="
+rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2
+rewriteSystem http://www.oasis-open.org/docbook/xml/4.3 /usr/share/xml/docbook/4.3
+rewriteSystem http://www.oasis-open.org/docbook/xml/4.4 /usr/share/xml/docbook/4.4
+rewriteSystem http://www.oasis-open.org/docbook/xml/4.5 /usr/share/xml/docbook/4.5
+rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 /usr/share/xml/docbook/4.2"
+
+export xml_catalogs="${xml_catalogs}"
+export xml_entries="${xml_entries}"
+
 do_install()
 {
 	local versions="4.2 4.3 4.4 4.5"
@@ -51,28 +69,6 @@ do_install()
 
 post_install()
 {
-	local versions="4.2 4.3 4.4 4.5"
-	local uri="http://www.oasis-open.org/docbook/xml"
-	local ver dir
-
-	for ver in ${versions}; do
-		dir=/usr/share/xml/docbook/${ver}
-		xml_catalogs="${xml_catalogs} ${dir}/catalog"
-		xml_entries="${xml_entries} rewriteSystem ${uri}/${ver} ${dir}"
-	done
-
-	#
-	# 4.2 is backwards-compatible with 4.1.2, so just make 4.1.2 be
-	# an alias for 4.2.
-	#
-	dir=/usr/share/xml/docbook/4.2
-	xml_catalogs="${xml_catalogs} ${dir}/catalog-4.1.2"
-	xml_entries="${xml_entries} rewriteSystem ${uri}/4.1.2 ${dir}"
-
-	export xml_catalogs="${xml_catalogs}"
-	export xml_entries="${xml_entries}"
-	export sgml_catalogs="${sgml_catalogs}"
-	export sgml_entries="${sgml_entries}"
 	#
 	# Run the trigger to register its XML catalog entries.
 	#