fixed docbook issues

8 files changed, 47 insertions, 22 deletions

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