maj docbook-xml#4.5-2

4 files changed, 94 insertions, 348 deletions

diff --git a/base/docbook-xml/.footprint b/base/docbook-xml/.footprint
index 0cb34d978..b52101de7 100644
--- a/base/docbook-xml/.footprint
+++ b/base/docbook-xml/.footprint
@@ -1,133 +1,9 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/xml/
--rw-r--r--	root/root	etc/xml/docbook-xml
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/xml/
 drwxr-xr-x	root/root	usr/share/xml/docbook/
-drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/
--rwxrw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/calstblx.dtd
--rwxrw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/dbcentx.mod
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/dbgenent.mod
--rwxrw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/dbhierx.mod
--rwxrw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/dbnotnx.mod
--rwxrw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/dbpoolx.mod
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/docbook.cat
--rwxrw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/docbookx.dtd
-drwxrwxr-x	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amso.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-box.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-cyr1.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-cyr2.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-dia.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk1.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk2.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk3.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk4.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-lat1.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-lat2.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-num.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-pub.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-tech.ent
--rw-rw-r--	root/root	usr/share/xml/docbook/xml-dtd-4.1.2/soextblx.dtd
-drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.2/
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/calstblx.dtd
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/dbcentx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/dbgenent.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/dbhierx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/dbnotnx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/dbpoolx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/docbook.cat
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/docbookx.dtd
-drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-amsa.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-amsb.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-amsc.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-amsn.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-amso.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-amsr.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-box.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-cyr1.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-cyr2.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-dia.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-grk1.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-grk2.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-grk3.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-grk4.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-lat1.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-lat2.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-num.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-pub.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/ent/iso-tech.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.2/soextblx.dtd
-drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.3/
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/calstblx.dtd
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/dbcentx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/dbgenent.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/dbhierx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/dbnotnx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/dbpoolx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/docbook.cat
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/docbookx.dtd
-drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-amsa.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-amsb.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-amsc.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-amsn.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-amso.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-amsr.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-box.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-cyr1.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-cyr2.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-dia.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-grk1.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-grk2.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-grk3.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-grk4.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-lat1.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-lat2.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-num.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-pub.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/ent/iso-tech.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/htmltblx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.3/soextblx.dtd
-drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.4/
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/calstblx.dtd
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/dbcentx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/dbgenent.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/dbhierx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/dbnotnx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/dbpoolx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/docbook.cat
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/docbookx.dtd
-drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/README
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isoamsa.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isoamsb.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isoamsc.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isoamsn.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isoamso.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isoamsr.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isobox.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isocyr1.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isocyr2.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isodia.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isogrk1.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isogrk2.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isogrk3.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isogrk4.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isolat1.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isolat2.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isonum.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isopub.ent
--rw-r-xr--	root/root	usr/share/xml/docbook/xml-dtd-4.4/ent/isotech.ent
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/htmltblx.mod
--rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.4/soextblx.dtd
 drwxr-xr-x	root/root	usr/share/xml/docbook/xml-dtd-4.5/
 -rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd
 -rw-r--r--	root/root	usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod
diff --git a/base/docbook-xml/.md5sum b/base/docbook-xml/.md5sum
index 9c8b34785..1f627838d 100644
--- a/base/docbook-xml/.md5sum
+++ b/base/docbook-xml/.md5sum
@@ -1,5 +1 @@
-900d7609fb7e6d78901b357e4acfbc17  docbkx412.zip
-73fe50dfe74ca631c1602f558ed8961f  docbook-xml-4.2.zip
-ab200202b9e136a144db1e0864c45074  docbook-xml-4.3.zip
-cbb04e9a700955d88c50962ef22c1634  docbook-xml-4.4.zip
 03083e288e87a7e829e437358da7ef9e  docbook-xml-4.5.zip
diff --git a/base/docbook-xml/Pkgfile b/base/docbook-xml/Pkgfile
index 073a7b4e1..fd8f54aaf 100644
--- a/base/docbook-xml/Pkgfile
+++ b/base/docbook-xml/Pkgfile
@@ -6,215 +6,16 @@
 
 name=docbook-xml
 version=4.5
-release=1
-source=(http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip \
-        http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip \
-        http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip \
-        http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip \
-        http://www.docbook.org/xml/4.1.2/docbkx412.zip)
-
-# override pkgmk's unpack_source() function so that source files
-# don't get munged together in the same directory and lost
-
-unpack_source() {
-        # similarly-named versions first
-        for DB_VER in 4.5 4.4 4.3 4.2
-        do
-                mkdir $SRC/$name-$DB_VER
-                unzip -q -d $SRC/$name-$DB_VER $PKGMK_SOURCE_DIR/$name-$DB_VER.zip
-        done
-        # now 4.1.2, named differently
-        mkdir $SRC/$name-4.1.2
-        unzip -q -d $SRC/$name-4.1.2 $PKGMK_SOURCE_DIR/docbkx412.zip
-}
+release=2
+source=(http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip)
 
 build() {
-        # copy to proper locations
-        for DB_VER in 4.5 4.4 4.3 4.2 4.1.2
-        do
-                mkdir -p $PKG/usr/share/xml/docbook/xml-dtd-$DB_VER
-                cp -a $SRC/$name-$DB_VER/{ent,docbook.cat,*.dtd,*.mod} \
-                        $PKG/usr/share/xml/docbook/xml-dtd-$DB_VER/
-        done
-
-        # create initial docbook-xml catalog
-        mkdir -p $PKG/etc/xml
-        xmlcatalog --noout --create $PKG/etc/xml/$name
-
-        # add each version to the initial catalog
-        #
-        # 4.5
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD DocBook XML V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/calstblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/soextblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/dbpoolx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/dbhierx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/htmltblx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/dbnotx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/dbcentx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.5/dbgenent.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteSystem" \
-                "http://www.oasis-open.org/docbook/xml/4.5" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteURI" \
-                "http://www.oasis-open.org/docbook/xml/4.5" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-                $PKG/etc/xml/$name
-        # 4.4
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD DocBook XML V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/dbnotx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteSystem" \
-                "http://www.oasis-open.org/docbook/xml/4.4" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteURI" \
-                "http://www.oasis-open.org/docbook/xml/4.4" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-                $PKG/etc/xml/$name
-        # 4.2
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/DTD DocBook XML V4.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/DTD DocBook CALS Table Model V4.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/DTD XML Exchange Table Model 19990315//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/ELEMENTS DocBook Information Pool V4.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/ELEMENTS DocBook Document Hierarchy V4.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/ENTITIES DocBook Additional General Entities V4.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/ENTITIES DocBook Notations V4.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/dbnotx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS/ENTITIES DocBook Character Entities V4.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteSystem" \
-                "http://www.oasis-open.org/docbook/xml/4.2" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteURI" \
-                "http://www.oasis-open.org/docbook/xml/4.2" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-                $PKG/etc/xml/$name
-        # 4.1.2
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD DocBook XML V4.1.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "public" \
-                "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteSystem" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-                $PKG/etc/xml/$name
-        xmlcatalog --noout --add "rewriteURI" \
-                "http://www.oasis-open.org/docbook/xml/4.1.2" \
-                "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-                $PKG/etc/xml/$name
+	install -v -d -m755 $PKG/usr/share/xml/docbook/xml-dtd-4.5
+	install -v -d -m755 $PKG/etc/xml
+	chown -R root:root .
+	cp -v -af docbook.cat *.dtd ent/ *.mod \
+	$PKG/usr/share/xml/docbook/xml-dtd-4.5
+	
 
 }
 
diff --git a/base/docbook-xml/post-install b/base/docbook-xml/post-install
index 3faf92dcb..cd243e3fe 100644
--- a/base/docbook-xml/post-install
+++ b/base/docbook-xml/post-install
@@ -3,21 +3,94 @@
 # create XML catalog with initial docbook-xml catalog
 if [ ! -e /etc/xml/catalog ]
 then
-	xmlcatalog --noout --create /etc/xml/catalog
+	xmlcatalog --noout --create /etc/xml/docbook
 fi
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V4.5//EN" \
+    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/4.5" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/4.5" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+    /etc/xml/docbook
+
+if [ ! -e /etc/xml/catalog ]; then
+    xmlcatalog --noout --create /etc/xml/catalog
+fi &&
 xmlcatalog --noout --add "delegatePublic" \
-	"-//OASIS//ENTITIES DocBook XML" \
-	"file:///etc/xml/docbook-xml" \
-	/etc/xml/catalog
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog &&
 xmlcatalog --noout --add "delegatePublic" \
-	"-//OASIS//DTD DocBook XML" \
-	"file:///etc/xml/docbook-xml" \
-	/etc/xml/catalog
+    "-//OASIS//DTD DocBook XML" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog &&
 xmlcatalog --noout --add "delegateSystem" \
-	"http://www.oasis-open.org/docbook/" \
-	"file:///etc/xml/docbook-xml" \
-	/etc/xml/catalog
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog &&
 xmlcatalog --noout --add "delegateURI" \
-	"http://www.oasis-open.org/docbook/" \
-	"file:///etc/xml/docbook-xml" \
-	/etc/xml/catalog
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog
+
+for DTDVERSION in 4.1.2 4.2 4.3 4.4
+do
+  xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \
+    /etc/xml/docbook
+  xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+    /etc/xml/docbook
+  xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+    /etc/xml/docbook
+  xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog
+  xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog
+done
+