fix docbook

app/text/docbook-xml/docbook-xml.sysconf

@@ -2,23 +2,30 @@
 if [ -e /var/lib/ymp/sysconf/docbook-xml/postinstall.done ] ; then
     exit 0
 fi
-if [ -e /etc/xml/catalog.preserve ]; then
-    mv /etc/xml/catalog.preserve /etc/xml/catalog
-elif [ ! -e /etc/xml/catalog ]; then
+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
+
 xmlcatalog --noout --add "delegatePublic" \
     "-//OASIS//DTD DocBook XML" \
     "file:///etc/xml/docbook-xml" \
     /etc/xml/catalog
+
 xmlcatalog --noout --add "delegateSystem" \
     "http://www.oasis-open.org/docbook/" \
     "file:///etc/xml/docbook-xml" \
     /etc/xml/catalog
+
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook-xml" \
+    /etc/xml/catalog
+
 xmlcatalog --noout --add "delegateURI" \
     "http://www.oasis-open.org/docbook/" \
     "file:///etc/xml/docbook-xml" \

app/text/docbook-xsl/docbook-xsl.sysconf

@@ -1,5 +1,7 @@
 #!/bin/sh
-
+if [ -e /var/lib/ymp/sysconf/docbook-xsl/postinstall.done ] ; then
+    exit 0
+fi
 metadata="/var/lib/ymp/metadata/docbook-xsl.yaml"
 ver=$(grep version $metadata | cut -f2 -d":" | tr -d " ")
 
@@ -7,20 +9,19 @@ _xmlcatalog() {
   xmlcatalog --noout "$@" /etc/xml/catalog
 }
 
-[[ -f etc/xml/catalog ]] || _xmlcatalog --create
-for ver in $new current; do
+[[ ! -f etc/xml/catalog ]] || _xmlcatalog --create
+for new in $ver current; do
     for x in rewriteSystem rewriteURI; do
-        _xmlcatalog --add $x http://cdn.docbook.org/release/xsl/$ver \
-            /usr/share/xml/docbook/xsl-stylesheets-$ver
+    _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl/$new \
+            /usr/share/xml/docbook/xsl-stylesheets-$new
 
-        _xmlcatalog --add $x http://cdn.docbook.org/release/xsl-nons/$ver \
-            /usr/share/xml/docbook/xsl-stylesheets-$ver-nons
+        _xmlcatalog --add $x http://cdn.docbook.org/release/xsl/$new \
+            /usr/share/xml/docbook/xsl-stylesheets-$new
 
-        _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl-ns/$ver \
-            /usr/share/xml/docbook/xsl-stylesheets-$ver
+        _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl-ns/$new \
+            /usr/share/xml/docbook/xsl-stylesheets-$new
 
-        _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl/$ver \
-            /usr/share/xml/docbook/xsl-stylesheets-$ver-nons
     done
 done
 
+date > /var/lib/ymp/sysconf/docbook-xsl/postinstall.done

dev/libs/libxml2/ympbuild

@@ -22,6 +22,7 @@ cd $name-v$version
 setup(){
     autoreconf -fvi
     ./configure --prefix=/usr \
+    --sysconfdir=/etc \
     --with-history \
     --libdir=/usr/lib64 \
     $(use_opt python --with-python --without-python)