fixed create to work within env

3 files changed, 94 insertions, 9 deletions

diff --git a/repo/devel/docbook-dtd.xibuild b/repo/devel/docbook-dtd.xibuild
index 96519c4..f751d36 100644
--- a/repo/devel/docbook-dtd.xibuild
+++ b/repo/devel/docbook-dtd.xibuild
@@ -35,10 +35,94 @@ EOF
 } 
 
 postinstall () {
-    install-catalog --add /etc/sgml/sgml-docbook-dtd-$PKG_VER.cat \
-    /usr/share/sgml/docbook/sgml-dtd-$PKG_VER/catalog &&
+    if [ ! -e /etc/xml/docbook ]; then
+        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" \
+        /etc/xml/catalog &&
+    xmlcatalog --noout --add "delegatePublic" \
+        "-//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" \
+        /etc/xml/catalog &&
+    xmlcatalog --noout --add "delegateURI" \
+        "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
 
-    install-catalog --add /etc/sgml/sgml-docbook-dtd-$PKG_VER.cat \
-        /etc/sgml/sgml-docbook.cat
 }
 
diff --git a/repo/devel/docbook4-xml.xibuild b/repo/devel/docbook4-xml.xibuild
index da2a4c7..36faa98 100644
--- a/repo/devel/docbook4-xml.xibuild
+++ b/repo/devel/docbook4-xml.xibuild
@@ -7,12 +7,13 @@ PKG_VER=4.5
 SOURCE=https://www.docbook.org/xml/$PKG_VER/docbook-xml-$PKG_VER.zip
 DESC="A widely used XML scheme for writing documentation and help"
 
-VERSIONS="4.5 4.4 4.3 4.2"
+VERSIONS="4.5 4.4 4.3 4.2 4.1"
 
 ADDITIONAL="
     https://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
     https://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
     https://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
+    https://www.docbook.org/xml/4.1/docbook-xml-4.1.zip
 "
 
 package () {
@@ -34,7 +35,7 @@ postinstall () {
     for v in $VERSIONS; do 
         if [ ! -e /etc/xml/docbook ]; then
             xmlcatalog --noout --create /etc/xml/docbook
-        fi &&
+        fi
         xmlcatalog --noout --add "public" \
             "-//OASIS//DTD DocBook XML V$v//EN" \
             "http://www.oasis-open.org/docbook/xml/$v/docbookx.dtd" \
@@ -81,7 +82,7 @@ postinstall () {
             /etc/xml/docbook
         if [ ! -e /etc/xml/catalog ]; then
             xmlcatalog --noout --create /etc/xml/catalog
-        fi &&
+        fi 
         xmlcatalog --noout --add "delegatePublic" \
             "-//OASIS//ENTITIES DocBook XML" \
             "file:///etc/xml/docbook" \
diff --git a/repo/devel/ninja.xibuild b/repo/devel/ninja.xibuild
index 8cb3011..8ae4868 100644
--- a/repo/devel/ninja.xibuild
+++ b/repo/devel/ninja.xibuild
@@ -3,8 +3,8 @@
 MAKEDEPS="python"
 DEPS="musl"
 
-SOURCE=git://github.com/ninja-build/ninja.git
-BRANCH=release
+PKG_VER=1.10.2
+SOURCE=https://github.com/ninja-build/ninja/archive/refs/tags/v$PKG_VER.tar.gz
 DESC="Small build system with a focus on speed"
 
 build () {