fixed docbook issues

26 files changed, 212 insertions, 169 deletions

diff --git a/repo/util/vim.xibuild b/repo/apps/vim.xibuild
index d8ee93b..7720081 100644
--- a/repo/util/vim.xibuild
+++ b/repo/apps/vim.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="gpm acl musl libgcrypt pcre zlib"
+DEPS="gpm acl musl libgcrypt pcre2 zlib"
 
 PKG_VER=8.2.4257
 SOURCE=https://github.com/vim/vim/archive/refs/tags/v$PKG_VER.tar.gz
diff --git a/repo/devel/autoconf2-13.xibuild b/repo/devel/autoconf2-13.xibuild
index 2bd4e7c..abddc17 100644
--- a/repo/devel/autoconf2-13.xibuild
+++ b/repo/devel/autoconf2-13.xibuild
@@ -13,8 +13,8 @@ DESC="GNU programs for producing shell scripts that can automatically configure
 
 prepare() {
     patch -Np1 -i autoconf-2.13-consolidated_fixes-1.patch &&
-    mv -v autoconf.texi autoconf213.texi                      &&
-    rm -v autoconf.info                                      
+    mv autoconf.texi autoconf213.texi                      &&
+    rm autoconf.info                                      
 
 }
 
@@ -25,6 +25,6 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install 
-    install -v -m644 autoconf213.info $PKG_DEST/usr/share/info &&
+    install -m644 autoconf213.info $PKG_DEST/usr/share/info &&
     install-info --info-dir=$PKG_DEST/usr/share/info autoconf213.info
 }
diff --git a/repo/devel/docbook-dtd.xibuild b/repo/devel/docbook-dtd.xibuild
index f6d4394..96519c4 100644
--- a/repo/devel/docbook-dtd.xibuild
+++ b/repo/devel/docbook-dtd.xibuild
@@ -32,4 +32,13 @@ PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
 
   -- End Single Major Version catalog changes --
 EOF
+} 
+
+postinstall () {
+    install-catalog --add /etc/sgml/sgml-docbook-dtd-$PKG_VER.cat \
+    /usr/share/sgml/docbook/sgml-dtd-$PKG_VER/catalog &&
+
+    install-catalog --add /etc/sgml/sgml-docbook-dtd-$PKG_VER.cat \
+        /etc/sgml/sgml-docbook.cat
 }
+
diff --git a/repo/devel/docbook-xml.xibuild b/repo/devel/docbook-xml.xibuild
index 2f54184..cf119ad 100644
--- a/repo/devel/docbook-xml.xibuild
+++ b/repo/devel/docbook-xml.xibuild
@@ -15,115 +15,117 @@ package () {
     install -dm755 $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5          &&
     install -m644   tools/db4-upgrade.xsl \
                     $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5
-    
-    mkdir -p $PKG_DEST/etc/xml
-    xmlcatalog --noout --create $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+} 
+
+postinstall () {
+    mkdir -p /etc/xml
+    if [ ! -e /etc/xml/docbook-$PKG_VER ]; then
+      xmlcatalog --noout --create /etc/xml/docbook-$PKG_VER
+    fi &&
 
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbook.rng" \
-      "file:/$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbook.rng" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbookxi.rng" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rng" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbook.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbook.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbookxi.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
 
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/sch/docbook.sch" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/sch/docbook.sch" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER
-
+      "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
+      /etc/xml/docbook-$PKG_VER
 
-    xmlcatalog --noout --create $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+    xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
 
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \
-      "docbook.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \
-      "docbook.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \
-      "docbookxi.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \
-      "docbookxi.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.rnc" \
-      "docbook.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.rnc" \
-      "docbook.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \
-      "docbookxi.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \
-      "docbookxi.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml
-    xmlcatalog --noout --create $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
+      "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml
+    xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
 
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \
-      "docbook.schemas/sch" $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
+      "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \
-      "docbook.schemas/sch" $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml
+      "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml
 
-
-    if [ ! -e $PKG_DEST/etc/xml/catalog ]; then
-      xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog
+    if [ ! -e /etc/xml/catalog ]; then
+      xmlcatalog --noout --create /etc/xml/catalog
     fi &&
     xmlcatalog --noout --add "delegatePublic" \
       "-//OASIS//DTD DocBook XML $PKG_VER//EN" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateSystem" \
       "http://docbook.org/xml/$PKG_VER/dtd/" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/dtd/" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/rng/"  \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/sch/"  \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/xsd/"  \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/xsd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog
-
+      "file:///usr/share/xml/docbook/schema/xsd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog
 }
+
diff --git a/repo/devel/docbook-xsl.xibuild b/repo/devel/docbook-xsl.xibuild
index 18af313..f5d576d 100644
--- a/repo/devel/docbook-xsl.xibuild
+++ b/repo/devel/docbook-xsl.xibuild
@@ -33,39 +33,42 @@ package () {
                     $PKG_DEST/usr/share/doc/docbook-xsl-nons-$PKG_VER
 
 
-    if [ ! -d $PKG_DEST/etc/xml ]; then install -m755 -d $PKG_DEST/etc/xml; fi &&
-        if [ ! -f $PKG_DEST/etc/xml/catalog ]; then
-    xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog
+                }
+
+postinstall () {
+    if [ ! -d /etc/xml ]; then install -m755 -d /etc/xml; fi &&
+    if [ ! -f /etc/xml/catalog ]; then
+        xmlcatalog --noout --create /etc/xml/catalog
     fi &&
 
     xmlcatalog --noout --add "rewriteSystem" \
-               "https://cdn.docbook.org/release/xsl-nons/$PKG_VER" \
-               "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \
-               $PKG_DEST/etc/xml/catalog &&
+               "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+               "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+        /etc/xml/catalog &&
 
     xmlcatalog --noout --add "rewriteURI" \
-               "https://cdn.docbook.org/release/xsl-nons/$PKG_VER" \
-               "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \
-        $PKG_DEST/etc/xml/catalog &&
+               "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+               "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+        /etc/xml/catalog &&
 
     xmlcatalog --noout --add "rewriteSystem" \
                "https://cdn.docbook.org/release/xsl-nons/current" \
-               "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \
-        $PKG_DEST/etc/xml/catalog &&
+               "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+        /etc/xml/catalog &&
 
     xmlcatalog --noout --add "rewriteURI" \
                "https://cdn.docbook.org/release/xsl-nons/current" \
-               "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \
-        $PKG_DEST/etc/xml/catalog &&
+               "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+        /etc/xml/catalog &&
 
     xmlcatalog --noout --add "rewriteSystem" \
                "http://docbook.sourceforge.net/release/xsl/current" \
-               "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \
-        $PKG_DEST/etc/xml/catalog &&
+               "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+        /etc/xml/catalog &&
 
     xmlcatalog --noout --add "rewriteURI" \
                "http://docbook.sourceforge.net/release/xsl/current" \
-               "/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER" \
-        $PKG_DEST/etc/xml/catalog
-
+               "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+        /etc/xml/catalog
 }
+
diff --git a/repo/devel/docbook4-xml.xibuild b/repo/devel/docbook4-xml.xibuild
index 34313f0..b29b7ef 100644
--- a/repo/devel/docbook4-xml.xibuild
+++ b/repo/devel/docbook4-xml.xibuild
@@ -14,73 +14,74 @@ package () {
     cp -af docbook.cat *.dtd ent/ *.mod \
         $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5
 
+    }
 
-    if [ ! -e $PKG_DEST/etc/xml/docbook ]; then
-        xmlcatalog --noout --create $PKG_DEST/etc/xml/docbook
+postinstall () {
+    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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook &&
+        /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" \
-        $PKG_DEST/etc/xml/docbook
-
-    if [ ! -e $PKG_DEST/etc/xml/catalog ]; then
-        xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog
+        /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" \
-        $PKG_DEST/etc/xml/catalog &&
+        /etc/xml/catalog &&
     xmlcatalog --noout --add "delegatePublic" \
         "-//OASIS//DTD DocBook XML" \
         "file:///etc/xml/docbook" \
-        $PKG_DEST/etc/xml/catalog &&
+        /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateSystem" \
         "http://www.oasis-open.org/docbook/" \
         "file:///etc/xml/docbook" \
-        $PKG_DEST/etc/xml/catalog &&
+        /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
         "http://www.oasis-open.org/docbook/" \
         "file:///etc/xml/docbook" \
-        $PKG_DEST/etc/xml/catalog
-
+        /etc/xml/catalog
 }
+
diff --git a/repo/devel/flex.xibuild b/repo/devel/flex.xibuild
index 1700c0c..623f963 100644
--- a/repo/devel/flex.xibuild
+++ b/repo/devel/flex.xibuild
@@ -18,7 +18,7 @@ check () {
 
 package () {
     make DESTDIR=$PKG_DEST install
-    ln -sv flex $PKG_DEST/usr/bin/lex
+    ln -s flex $PKG_DEST/usr/bin/lex
 }
 
 
diff --git a/repo/devel/git.xibuild b/repo/devel/git.xibuild
index 175aa13..4cf143f 100644
--- a/repo/devel/git.xibuild
+++ b/repo/devel/git.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="grep python make xmlto"
-DEPS="curl perl libressl pcre grep shadow zlib openssh"
+DEPS="curl perl libressl pcre2 grep shadow zlib openssh"
 
 PKG_VER=2.34.1
 SOURCE=https://www.kernel.org/pub/software/scm/git/git-$PKG_VER.tar.xz
diff --git a/repo/devel/llvm.xibuild b/repo/devel/llvm.xibuild
index be70e9d..134a994 100644
--- a/repo/devel/llvm.xibuild
+++ b/repo/devel/llvm.xibuild
@@ -24,6 +24,7 @@ build () {
           -DLLVM_ENABLE_RTTI=ON                     \
           -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
           -DLLVM_BUILD_TESTS=ON                     \
+          -DLLVM_INSTALL_UTILS=ON                   \
           -DLLVM_BINUTILS_INCDIR=/usr/include       \
           -Wno-dev -G Ninja ..                      &&
     ninja
@@ -31,5 +32,4 @@ build () {
 
 package () {
     DESTDIR=$PKG_DEST ninja install
-
 }
diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild
index e575ec7..0aadc6b 100644
--- a/repo/devel/rustc.xibuild
+++ b/repo/devel/rustc.xibuild
@@ -11,51 +11,54 @@ prepare () {
     mkdir -p $PKG_DEST/opt/rustc-$PKG_VER             &&
     ln -sf rustc-$PKG_VER $PKG_DEST/opt/rustc
 
-    cat > config.toml << EOF
-# see config.toml.example for more possible options
-[llvm]
+    openssl_file=vendor/openssl-sys/build/main.rs
+    checksum_before=$(sha256sum $openssl_file | cut -d' ' -f1)
+    sed -i "240i (3, 4, _) => ('3', '4', 'x')," $openssl_file
+    checksum_after=$(sha256sum $openssl_file | cut -d' ' -f1)
+    echo "checksum before: $checksum_before"
+    echo "checksum after: $checksum_after"
 
-# use ninja
-ninja = true
+    sed -i "s/$checksum_before/$checksum_after/g" vendor/openssl-sys/.cargo-checksum.json
 
-targets = "X86"
-# When compiling LLVM, the experimental targets (WebAssembly
-# and RISCV) are built by default - omit them
-experimental-targets = ""
-
-[build]
-# omit HTML docs to save time and space (comment this to build them)
-docs = false
-
-# install cargo as well as rust
-extended = true
-
-[install]
-# Adjust the prefix for the desired destination
-#prefix = "/usr"
-prefix = "/opt/rustc-$PKG_VER"
-
-# docdir is used even if the full awesome docs are not installed
-docdir = "share/doc/rustc-$PKG_VER"
-
-[rust]
-channel = "stable"
-rpath = false
-
-codegen-tests = false
-
-# get a trace if there is an Internal Compiler Exception
-backtrace-on-ice = true
-
-[target.x86_64-unknown-linux-musl]
-llvm-config = "/usr/bin/llvm-config"
-
-EOF
 }
 
 build () {
     export RUSTFLAGS="$RUSTFLAGS -C link-arg=-lffi" &&
-    python3 ./x.py build --exclude src/tools/miri
+    target=x86_64-unknown-linux-musl
+    build=x86_64-unknown-linux-musl
+    ./configure \
+        --build="$build" \
+        --host="$target" \
+        --target="$target" \
+		--prefix="/usr" \
+		--release-channel="stable" \
+		--llvm-root="/usr/lib/" \
+		--disable-docs \
+		--enable-extended \
+		--tools="analysis,cargo,src,rustfmt" \
+		--enable-llvm-link-shared \
+		--enable-option-checking \
+		--enable-locked-deps \
+		--enable-vendor \
+		--set="rust.musl-root=/usr" \
+		--set="rust.codegen-units=1" \
+		--set="rust.codegen-units-std=1" \
+		--set="rust.parallel-compiler=false" \
+		--set="target.$target.llvm-config=/usr/bin/llvm-config" \
+		--set="target.$target.musl-root=/usr" \
+		--set="target.$target.crt-static=false" \
+		--set="target.$target.cc=gcc" \
+		--set="target.$target.cxx=c++" \
+		--set="target.$target.ar=ar" \
+		--set="target.$target.linker=gcc" \
+		--set="target.$build.musl-root=/usr" \
+		--set="target.$build.crt-static=false" \
+		--set="target.$build.cc=gcc" \
+		--set="target.$build.cxx=c++" \
+		--set="target.$build.ar=ar" \
+		--set="target.$build.linker=gcc"
+
+        python ./x.py dist --jobs $JOBS
 
 }
 
diff --git a/repo/meta/all.xibuild b/repo/meta/all.xibuild
index ec8efc1..cb24e69 100644
--- a/repo/meta/all.xibuild
+++ b/repo/meta/all.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="AlL tHe pacKageS!!"
-DEPS=" feh rxvt-unicode xterm asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go help2man icecream-sundae icecream llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux cacert-utils fakechroot fakeroot acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss libressl pahole pam pcre perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs elfutils file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors lynx make-ca man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud sysconfigs xibuild xib xipkg xiutils"
+DEPS=" feh rxvt-unicode xterm asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go help2man icecream-sundae icecream llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux cacert-utils fakechroot fakeroot acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss libressl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs elfutils file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors lynx make-ca man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud sysconfigs xibuild xib xipkg xiutils"
diff --git a/repo/meta/system.xibuild b/repo/meta/system.xibuild
index 4ae00a4..e8b91e3 100644
--- a/repo/meta/system.xibuild
+++ b/repo/meta/system.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="All the the packages available in system"
-DEPS=" acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss libressl pahole pam pcre perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd"
+DEPS=" acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss libressl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd"
diff --git a/repo/system/elogind.xibuild b/repo/system/elogind.xibuild
index 9543945..64be2c1 100644
--- a/repo/system/elogind.xibuild
+++ b/repo/system/elogind.xibuild
@@ -19,12 +19,16 @@ prepare () {
     for p in *.patch; do
         patch -Np1 -i $p
     done
+
+    # skip the check that the source tree is "too far"
+    # (the assert_cc line)
+    sed -i '83d' src/basic/log.h
+
+    # remove -v options
+    sed -i 's/-v/-/g' tools/meson-symlink_headers.sh
 }
 
 build () {
-    mkdir build &&
-    cd    build &&
-
     # TODO re-enable BUILD_MANS
     meson \
 		-Dcgroup-controller=elogind \
@@ -33,16 +37,19 @@ build () {
 		-Dreboot-path=/sbin/reboot \
 		-Ddefault-hierarchy=hybrid \
 		-Ddefault-kill-user-processes=false \
-		-Dpolkit=true \
-		-Dman=true \
-		..
-    ninja
+		-Dpolkit=false \
+		-Dman=false \
+		build
+
+    ninja -C build
+
 }
 
 package () {
-    DESTDIR=$PKG_DEST ninja install &&
+    DESTDIR="$PKG_DEST" meson install --no-rebuild -C build
+
     ln -sf  libelogind.pc $PKG_DEST/usr/lib/pkgconfig/libsystemd.pc &&
-    ln -sfn elogind $PKG_DEST/usr/include/systemd
+    ln -sf  elogind $PKG_DEST/usr/include/systemd
 
 
     sed -e '/\[Login\]/a KillUserProcesses=no' \
diff --git a/repo/system/glib.xibuild b/repo/system/glib.xibuild
index 45ff5cd..264fa29 100644
--- a/repo/system/glib.xibuild
+++ b/repo/system/glib.xibuild
@@ -13,7 +13,7 @@ build () {
 
     meson --prefix=/usr       \
           --buildtype=release \
-          -Dman=true          \
+          -Dman=false          \
           ..                  &&
     ninja
 }
diff --git a/repo/system/js78.xibuild b/repo/system/js78.xibuild
index 0a88142..7b88f18 100644
--- a/repo/system/js78.xibuild
+++ b/repo/system/js78.xibuild
@@ -37,6 +37,6 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install 
-    [ -f $PKG_DEST/usr/lib/libjs_static.ajs ] && rm -v $PKG_DEST/usr/lib/libjs_static.ajs 
+    [ -f $PKG_DEST/usr/lib/libjs_static.ajs ] && rm $PKG_DEST/usr/lib/libjs_static.ajs 
     sed -i '/@NSPR_CFLAGS@/d' $PKG_DEST/usr/bin/js78-config
 }
diff --git a/repo/system/pcre.xibuild b/repo/system/pcre.xibuild
index 52ca2eb..89ef437 100644
--- a/repo/system/pcre.xibuild
+++ b/repo/system/pcre.xibuild
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl"
+DEPS="musl readline zlib bzip2 bash"
 
-PKG_VER=10.39
-SOURCE=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PKG_VER/pcre2-$PKG_VER.tar.gz
-DESC="A library that implements regular expressions in a perl style"
+PKG_VER=8.45
+SOURCE=https://sourceforge.net/projects/pcre/files/pcre/$PKG_VER/pcre-$PKG_VER.tar.gz
+DESC="A library that implements regular expressions in a perl style (old version)"
 
 build () {
     CC=gcc ./configure --prefix=/usr 
@@ -14,8 +14,6 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install
-    # this probably is not right but it works for now
-    #ln /usr/lib/libpcre2-8.so $PKG_DEST/usr/lib/libpcre.so.1
 }
 
 
diff --git a/repo/system/pcre2.xibuild b/repo/system/pcre2.xibuild
new file mode 100644
index 0000000..4f9b783
--- /dev/null
+++ b/repo/system/pcre2.xibuild
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl readline zlib bzip2 bash"
+
+PKG_VER=10.39
+SOURCE=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PKG_VER/pcre2-$PKG_VER.tar.gz
+DESC="A library that implements regular expressions in a perl style"
+
+build () {
+    CC=gcc ./configure --prefix=/usr 
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
+
diff --git a/repo/system/python.xibuild b/repo/system/python.xibuild
index 2a71dea..b17cf04 100644
--- a/repo/system/python.xibuild
+++ b/repo/system/python.xibuild
@@ -23,6 +23,7 @@ build () {
                 --with-system-ffi    \
                 --with-ensurepip=yes \
                 --with-pip=yes \
+                --with-openssl="/usr"  \
                 --enable-ipv6        \
                 --enable-loadable-sqlite-extensions \
                 --with-computed-gotos
diff --git a/repo/system/shadow.xibuild b/repo/system/shadow.xibuild
index 94b4efa..6518971 100644
--- a/repo/system/shadow.xibuild
+++ b/repo/system/shadow.xibuild
@@ -35,7 +35,7 @@ package () {
     make DESTDIR=$PKG_DEST -C man install-man
     mkdir -p $PKG_DEST/etc/default
 
-    install -v -m644 $PKG_DEST/etc/login.defs $PKG_DEST/etc/login.defs.orig &&
+    install -m644 $PKG_DEST/etc/login.defs $PKG_DEST/etc/login.defs.orig &&
     for FUNCTION in FAIL_DELAY               \
                     FAILLOG_ENAB             \
                     LASTLOG_ENAB             \
@@ -172,12 +172,12 @@ EOF
     for PROGRAM in chfn chgpasswd chsh groupadd groupdel \
                    groupmems groupmod useradd userdel usermod
     do
-        install -v -m644 $PKG_DEST/etc/pam.d/chage $PKG_DEST/etc/pam.d/${PROGRAM}
+        install -m644 $PKG_DEST/etc/pam.d/chage $PKG_DEST/etc/pam.d/${PROGRAM}
         sed -i "s/chage/$PROGRAM/" $PKG_DEST/etc/pam.d/${PROGRAM}
     done
 
-    [ -f $PKG_DEST/etc/login.access ] && mv -v $PKG_DEST/etc/login.access{,.NOUSE} || true
-    [ -f $PKG_DEST/etc/limits ] && mv -v $PKG_DEST/etc/limits{,.NOUSE} || true
+    [ -f $PKG_DEST/etc/login.access ] && mv $PKG_DEST/etc/login.access{,.NOUSE} || true
+    [ -f $PKG_DEST/etc/limits ] && mv $PKG_DEST/etc/limits{,.NOUSE} || true
 }
 
 postinstall () {
diff --git a/repo/system/slang.xibuild b/repo/system/slang.xibuild
index 1060429..b480936 100644
--- a/repo/system/slang.xibuild
+++ b/repo/system/slang.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS=""
-DEPS="pcre"
+DEPS="pcre2"
 
 PKG_VER=2.3.2
 SOURCE=https://www.jedsoft.org/releases/slang/slang-$PKG_VER.tar.bz2
diff --git a/repo/util/grep.xibuild b/repo/util/grep.xibuild
index 0ce778a..e7689f9 100644
--- a/repo/util/grep.xibuild
+++ b/repo/util/grep.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="grep make "
-DEPS="musl pcre"
+DEPS="musl pcre2"
 
 PKG_VER=3.7
 SOURCE=https://ftp.gnu.org/gnu/grep/grep-$PKG_VER.tar.xz
diff --git a/repo/util/less.xibuild b/repo/util/less.xibuild
index ddaf791..394bf91 100644
--- a/repo/util/less.xibuild
+++ b/repo/util/less.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl ncurses pcre"
+DEPS="musl ncurses pcre2"
 
 PKG_VER=590
 SOURCE=https://www.greenwoodsoftware.com/less/less-$PKG_VER.tar.gz
diff --git a/repo/util/nmap.xibuild b/repo/util/nmap.xibuild
index ab53620..3fd85e8 100644
--- a/repo/util/nmap.xibuild
+++ b/repo/util/nmap.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="libpcap lua pcre liblinear"
+DEPS="libpcap lua pcre2 liblinear"
 
 PKG_VER=7.92
 SOURCE=https://nmap.org/dist/nmap-$PKG_VER.tar.bz2
diff --git a/repo/util/wget.xibuild b/repo/util/wget.xibuild
index ac8be7b..035e231 100644
--- a/repo/util/wget.xibuild
+++ b/repo/util/wget.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl gnutls libidn2 libpsl nettle util-linux pcre2 zlib cacerts"
+DEPS="musl gnutls libidn2 libpsl nettle util-linux pcre22 zlib cacerts"
 
 PKG_VER=1.21.2
 SOURCE=https://ftp.gnu.org/gnu/wget/wget-$PKG_VER.tar.gz
diff --git a/repo/x11/libx11.xibuild b/repo/x11/libx11.xibuild
index 41f5471..90b6d57 100644
--- a/repo/x11/libx11.xibuild
+++ b/repo/x11/libx11.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make asciidoc xmlto lynx"
-DEPS="fontconfig libxcb elogind"
+DEPS="fontconfig libxcb elogind xtrans"
 
 PKG_VER=1.7.3.1
 SOURCE=https://www.x.org/pub/individual/lib/libX11-$PKG_VER.tar.xz
diff --git a/repo/x11/mesa.xibuild b/repo/x11/mesa.xibuild
index b9592cc..09d34d7 100644
--- a/repo/x11/mesa.xibuild
+++ b/repo/x11/mesa.xibuild
@@ -38,13 +38,13 @@ build () {
 
     unset GALLIUM_DRV DRI_DRIVERS &&
 
-    ninja
+    ninja -j$JOBS
 
 }
 
 package () {
     DESTDIR=$PKG_DEST ninja install
-    install -v -dm755 $PKG_DEST/usr/share/doc/mesa-$PKG_VER &&
-    cp -rfv ../docs/* $PKG_DEST/usr/share/doc/mesa-$PKG_VER
+    install -dm755 $PKG_DEST/usr/share/doc/mesa-$PKG_VER &&
+    cp -rf ../docs/* $PKG_DEST/usr/share/doc/mesa-$PKG_VER
 
 }