fixed create to work within env

54 files changed, 433 insertions, 132 deletions

diff --git a/auto/create.sh b/auto/create.sh
index 568c929..7640e3d 100755
--- a/auto/create.sh
+++ b/auto/create.sh
@@ -3,10 +3,10 @@ read -p "package name> " name
 repo=$(ls repo/ | fzf --prompt="repo> ")
 read -p "package version> " version
 read -p "description> " desc
-deps=$(find repo -type f | xargs -I % basename % .xibuild | fzf -m --prompt="dependencies> " | tr '\n' ' ')
+deps=$(find repo -type f | sed "s/.xibuild//g" | rev | cut -f1 -d/ | rev |fzf -m --prompt="dependencies> " | tr '\n' ' ')
 read -p "source url> " url
 read -p "additional urls> " additional
-type=$(find ./templates -type f | xargs -I % basename % .xibuild | fzf --prompt="build type> ")
+type=$(find ./templates -type f | sed "s/.xibuild//g" | rev | cut -f1 -d/ | rev | fzf --prompt="build type> ")
 
 clear
 echo Name: $name
diff --git a/extra/binutils/defang-no-split.patch b/extra/binutils/defang-no-split.patch
new file mode 100644
index 0000000..cea68ed
--- /dev/null
+++ b/extra/binutils/defang-no-split.patch
@@ -0,0 +1,38 @@
+From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Mon, 26 Jul 2021 22:51:18 +0100
+Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
+ [PR28144]
+
+Change 2faf902da ("generate single html manual page by default")
+added use of --no-split option to makeinfo. binutils reuses
+makeinfo options for texi2pod.pl wrapper. Unsupported option
+led to silent manpage truncation.
+
+The change adds no-op option support.
+
+etc/
+	PR 28144
+	* texi2pod.pl: Handle no-op --no-split option.
+
+(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
+---
+ etc/texi2pod.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
+index 11f70d156be..dcf2b437640 100644
+--- a/etc/texi2pod.pl
++++ b/etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ 	    $flag = shift;
+ 	}
+         push (@ipath, $flag);
++    } elsif (/^--no-split$/) {
++	# ignore option for makeinfo compatibility
+     } elsif (/^-/) {
+ 	usage();
+     } else {
+-- 
+2.27.0
+
diff --git a/extra/icu/fix-ucptrietest-golden-diff.patch b/extra/icu/fix-ucptrietest-golden-diff.patch
new file mode 100644
index 0000000..1b8082e
--- /dev/null
+++ b/extra/icu/fix-ucptrietest-golden-diff.patch
@@ -0,0 +1,33 @@
+Patch-Source: https://github.com/unicode-org/icu/pull/1925
+Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff
+
+diff --git a/icu4c/source/tools/toolutil/toolutil.cpp b/icu4c/source/tools/toolutil/toolutil.cpp
+index 1fc68aa69c8..a9dc37377a8 100644
+--- a/tools/toolutil/toolutil.cpp
++++ b/tools/toolutil/toolutil.cpp
+@@ -228,18 +228,19 @@ uprv_compareGoldenFiles(
+     std::ifstream ifs(goldenFilePath, std::ifstream::in);
+     int32_t pos = 0;
+     char c;
+-    while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) {
++    while (ifs.get(c) && pos < bufferLen) {
+         if (c != buffer[pos]) {
+             // Files differ at this position
+-            return pos;
++            break;
+         }
+         pos++;
+     }
+-    if (pos < bufferLen || c != std::char_traits<char>::eof()) {
+-        // Files are different lengths
+-        return pos;
++    if (pos == bufferLen && ifs.eof()) {
++        // Files are same lengths
++        pos = -1;
+     }
+-    return -1;
++    ifs.close();
++    return pos;
+ }
+ 
+ /*U_CAPI UDate U_EXPORT2
diff --git a/extra/snappy/cmakelists.patch b/extra/snappy/cmakelists.patch
index 9c16853..d6576a8 100644
--- a/extra/snappy/cmakelists.patch
+++ b/extra/snappy/cmakelists.patch
@@ -1,25 +1,5 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -86,6 +86,8 @@
- # it prominent in the GUI.
- option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF)
- 
-+option(BUILD_STATIC_LIBS "Build static libraries." ON)
-+
- option(SNAPPY_BUILD_TESTS "Build Snappy's own tests." ON)
- 
- option(SNAPPY_BUILD_BENCHMARKS "Build Snappy's benchmarks" ON)
-@@ -98,6 +100,10 @@
- 
- option(SNAPPY_INSTALL "Install Snappy's header and library" ON)
- 
-+if(NOT BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
-+  set(BUILD_STATIC_LIBS OFF)
-+endif ()
-+
- include(TestBigEndian)
- test_big_endian(SNAPPY_IS_BIG_ENDIAN)
- 
 @@ -213,19 +219,28 @@
    "snappy-stubs-public.h.in"
    "${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
diff --git a/extra/snappy/rtti.patch b/extra/snappy/rtti.patch
index 77b8178..80f89ff 100644
--- a/extra/snappy/rtti.patch
+++ b/extra/snappy/rtti.patch
@@ -1 +1,56 @@
-Too Many Requests
\ No newline at end of file
+From f73b11e87dfbe1cb4862b8ee489679d99534f40b Mon Sep 17 00:00:00 2001
+From: Tim Serong <tserong@suse.com>
+Date: Wed, 27 Oct 2021 18:49:04 +1100
+Subject: [PATCH] Re-enable RTTI (needed in order to subclass Source, etc.)
+
+Commit c98344f in snappy 1.1.9 disabled RTTI, which means the
+snappy library no longer exports typeinfo for snappy::Source,
+snappy::Sink, ..., so users of the library can't subclass these
+classes anymore.
+
+Here's a trivial reproducer:
+
+  #include <snappy-sinksource.h>
+  class MySource : snappy::Source {
+  public:
+    size_t Available() const override { return 0; }
+    const char *Peek(size_t *len) override { return NULL; }
+    void Skip(size_t n) override {}
+  };
+  int main(int argc, char **argv) {
+    MySource m;
+    return 0;
+  }
+
+Try `g++ -o snappy-test ./snappy-test.cc -lsnappy` with the above
+and the linker will fail with "undefined reference to `typeinfo
+for snappy::Source'" if RTTI was disabled in the snappy build.
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6eef485..755605d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
+   add_definitions(-D_HAS_EXCEPTIONS=0)
+-
+-  # Disable RTTI.
+-  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Use -Wall for clang and gcc.
+   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+@@ -77,9 +73,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+ 
+-  # Disable RTTI.
+-  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+ endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ 
+ # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
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 () {
diff --git a/repo/font/font-opensans.xibuild b/repo/font/font-opensans.xibuild
index 009c172..26369eb 100644
--- a/repo/font/font-opensans.xibuild
+++ b/repo/font/font-opensans.xibuild
@@ -9,7 +9,9 @@ DEPS="fontconfig mkfontscale "
 SOURCE="https://github.com/googlefonts/opensans.git"
 
 package() {
-	install -D -m644 fonts/ttf/*.ttf -t $PKG_DEST/usr/share/fonts/TTF/
+    for f in fonts/ttf/*.ttf; do
+        install -D -m644 $f $PKG_DEST/usr/share/fonts/TTF/
+    done
 }
 
 
diff --git a/repo/media/libvpx.xibuild b/repo/media/libvpx.xibuild
index ab8d127..7614473 100644
--- a/repo/media/libvpx.xibuild
+++ b/repo/media/libvpx.xibuild
@@ -10,6 +10,7 @@ SOURCE=https://github.com/webmproject/libvpx/archive/v$PKG_VER/libvpx-$PKG_VER.t
 
 prepare () {
     sed -i 's/cp -p/cp/' build/make/Makefile 
+    sed -i 's/diff --version/command -v diff/' configure
 }
 
 build () {
diff --git a/repo/media/mpd.xibuild b/repo/media/mpd.xibuild
index 9229a01..0907e1e 100644
--- a/repo/media/mpd.xibuild
+++ b/repo/media/mpd.xibuild
@@ -1,47 +1,22 @@
 #!/bin/sh
 
 NAME="mpd"
-DESC="Music daemon that plays MP3, FLAC, Ogg Vorbis files and Audio CDs"
+DESC="Minimalist command line interface to MPD"
 
-MAKEDEPS="meson ninja boost"
-DEPS="alsa-lib sbase expat faad2 flac fmt icu lame libao bzip2 libid3tag libmad libogg pulseaudio libsamplerate libmpdclient libvorbis musl opus pipewire soxr wavpack zlib"
+MAKEDEPS="meson ninja "
+DEPS="musl libmpdclient "
 
-PKG_VER=0.23.6
-SOURCE="https://www.musicpd.org/download/mpd/${PKG_VER%.*}/mpd-$PKG_VER.tar.xz"
-ADDITIONAL="libcdio-paa-version.patch libcdio-paranoia-version.patch mpd.confd mpd.initd"
-
-prepare () {
-    apply_patches
-}
+PKG_VER=0.34
+SOURCE="https://www.musicpd.org/download/mpc/${PKG_VER%.*}/mpc-$PKG_VER.tar.xz"
 
 build () {
-    cd build
+    mkdir build &&
+    cd build    &&
     meson --prefix=/usr \
-		-Dopus=enabled \
-		-Ddocumentation=enabled \
-		-Dlibmpdclient=enabled \
-		-Dwavpack=enabled \
-		-Dpipewire=enabled \
-        .. &&
-
+            .. &&
     ninja
 }
 
 package () {
     DESTDIR=$PKG_DEST ninja install
-    cd ..
-    install -d $PKG_DEST/etc
-	sed	-e 's:\#user.*:user\t\t"mpd":' \
-		-e 's:\#log_file.*:log_file\t\t"syslog":' \
-		doc/mpdconf.example > $PKG_DEST/etc/mpd.conf
-	install -m755 -D mpd.initd \
-		"$PKG_DEST"/etc/init.d/mpd
-	install -m644 -D mpd.confd \
-		"$PKG_DEST"/etc/conf.d/mpd
-	install -d -m775 \
-		"$PKG_DEST"/var/run/mpd \
-		"$PKG_DEST"/var/log/mpd \
-		"$PKG_DEST"/var/lib/mpd \
-		"$PKG_DEST"/var/lib/mpd/playlists \
-		"$PKG_DEST"/var/lib/mpd/music
 }
diff --git a/repo/media/pulsemixer.xibuild b/repo/media/pulsemixer.xibuild
index 79e7a74..4bf0850 100644
--- a/repo/media/pulsemixer.xibuild
+++ b/repo/media/pulsemixer.xibuild
@@ -4,8 +4,7 @@ NAME="pulsemixer"
 DESC="CLI and curses mixer for PulseAudio"
 
 MAKEDEPS=""
-DEPS="pulseaudio
-python"
+DEPS="pulseaudio python libtool"
 
 PKG_VER=1.5.1
 SOURCE="https://github.com/GeorgeFilipkin/pulsemixer/archive/$PKG_VER.tar.gz"
diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild
index 3d67d07..f7172ea 100644
--- a/repo/system/binutils.xibuild
+++ b/repo/system/binutils.xibuild
@@ -3,13 +3,14 @@
 MAKEDEPS="make dejagnu bzip2 xz zlib zstd patch"
 DEPS="musl zlib libelf"
 
-PKG_VER=2.37
+PKG_VER=2.38
 SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz
 
 ADDITIONAL="
 0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
 binutils-ld-fix-static-linking.patch
+defang-no-split.patch
 "
 
 DESC="Tools for handling object files"
@@ -29,7 +30,6 @@ build () {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-multilib \
-        --enable-shared \
 		--enable-ld=default \
         --enable-gold \
 		--enable-64-bit-bfd \
@@ -42,6 +42,7 @@ build () {
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
+        --with-system-zlib \
 		--with-mmap
 
     make tooldir=/usr
diff --git a/repo/system/findutils.xibuild b/repo/system/findutils.xibuild
index 6850095..1dbc9d3 100644
--- a/repo/system/findutils.xibuild
+++ b/repo/system/findutils.xibuild
@@ -1,20 +1,19 @@
 #!/bin/sh
 
-MAKEDEPS="make "
+MAKEDEPS="make sort"
 DEPS="musl sh"
 
-PKG_VER=4.8.0
-SOURCE=https://ftp.gnu.org/gnu/findutils/findutils-$PKG_VER.tar.xz
-DESC="GNU utilities to locate files"
+PKG_VER=0.8.6
+SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
+DESC="toybox utilities to locate files"
 
 build () {
-    case $(uname -m) in
-        i?86)   TIME_T_32_BIT_OK=yes ./configure --prefix=/usr --localstatedir=/var/lib/locate ;;
-        x86_64) ./configure --prefix=/usr --localstatedir=/var/lib/locate ;;
-    esac
-    make
+    make defconfig
+    make xargs
+    make find
 }
 
 package () {
-    make DESTDIR=$PKG_DEST install 
+    install -Dm755 find $PKG_DEST/usr/bin/find
+    install -Dm755 xargs $PKG_DEST/usr/bin/xargs
 }
diff --git a/repo/system/fribidi.xibuild b/repo/system/fribidi.xibuild
new file mode 100644
index 0000000..ec3ea83
--- /dev/null
+++ b/repo/system/fribidi.xibuild
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+NAME="fribidi"
+DESC="Free Implementation of the Unicode Bidirectional Algorithm"
+
+MAKEDEPS="meson ninja "
+DEPS="musl "
+
+PKG_VER=1.0.11
+SOURCE="https://github.com/fribidi/fribidi/releases/download/v$PKG_VER/fribidi-$PKG_VER.tar.xz"
+
+build () {
+    mkdir build &&
+    cd build    &&
+    meson --prefix=/usr \
+            .. &&
+    ninja
+}
+
+package () {
+    DESTDIR=$PKG_DEST ninja install
+}
diff --git a/repo/system/gobject-introspection.xibuild b/repo/system/gobject-introspection.xibuild
index 071dfbe..4202c8c 100644
--- a/repo/system/gobject-introspection.xibuild
+++ b/repo/system/gobject-introspection.xibuild
@@ -3,18 +3,11 @@
 MAKEDEPS="meson ninja patch flex"
 DEPS="python-mako python-markdown glib"
 
-PKG_VER=1.70.0
+PKG_VER=1.72.0
 SOURCE=https://download.gnome.org/sources/gobject-introspection/$(echo $PKG_VER | cut -d. -f-2)/gobject-introspection-$PKG_VER.tar.xz
-ADDITIONAL="
-        https://www.linuxfromscratch.org/patches/blfs/svn/gobject-introspection-$PKG_VER-build_fix-1.patch
-    "
 
 DESC="Introspection system for GObject-based libraries"
 
-prepare() {
-    patch -Np1 -i gobject-introspection-$PKG_VER-build_fix-1.patch
-}
-
 build () {
     mkdir build &&
     cd    build &&
diff --git a/repo/system/icu.xibuild b/repo/system/icu.xibuild
index 918982f..0d8d798 100644
--- a/repo/system/icu.xibuild
+++ b/repo/system/icu.xibuild
@@ -1,19 +1,30 @@
 #!/bin/sh
 
-MAKEDEPS="python gcc"
+MAKEDEPS="python"
 DEPS="bash"
 
-PKG_VER=70.1
+PKG_VER=71.1
 SOURCE=https://github.com/unicode-org/icu/releases/download/release-$(echo $PKG_VER | sed 's/\./-/g')/icu4c-$(echo $PKG_VER | sed 's/\./_/g')-src.tgz
 DESC="International Components for Unicode library"
+ADDITIONAL="
+fix-ucptrietest-golden-diff.patch
+"
 
 prepare () {
-    cd source                                    &&
+    cd source
+    autoreconf -fi
     sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure
 }
 
 build () {
-    ./configure --prefix=/usr                    &&
+    ./configure \
+        --prefix=/usr \
+		--sysconfdir=/etc \
+		--with-data-packaging=library \
+		--disable-samples \
+		--mandir=/usr/share/man
+
+    mkdir -p data/out
     make
 
 }
diff --git a/repo/system/intltool.xibuild b/repo/system/intltool.xibuild
index da4d84d..aee502e 100644
--- a/repo/system/intltool.xibuild
+++ b/repo/system/intltool.xibuild
@@ -12,9 +12,10 @@ build () {
     make
 }
 
-check () {
-    make check
-}
+#skip running testsuite due to incompatible cmp 
+#check () {
+    #make check
+#}
 
 package () {
     make DESTDIR=$PKG_DEST install 
diff --git a/repo/system/nss.xibuild b/repo/system/nss.xibuild
index 5d549e7..2da465a 100644
--- a/repo/system/nss.xibuild
+++ b/repo/system/nss.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make gyp perl mercurial python patch"
-DEPS="nspr libp11-kit bash zlib"
+DEPS="nspr libp11-kit sh zlib"
 
 PKG_VER=3.74
 
diff --git a/repo/system/pcre.xibuild b/repo/system/pcre.xibuild
index c92f242..dc86f46 100644
--- a/repo/system/pcre.xibuild
+++ b/repo/system/pcre.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl readline zlib bzip2 bash"
+DEPS="musl readline zlib bzip2 sh"
 
 PKG_VER=8.45
 SOURCE=https://sourceforge.net/projects/pcre/files/pcre/$PKG_VER/pcre-$PKG_VER.tar.gz
diff --git a/repo/system/perl.xibuild b/repo/system/perl.xibuild
index f12b9cf..494b9f1 100644
--- a/repo/system/perl.xibuild
+++ b/repo/system/perl.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make sed"
 DEPS="gdbm musl bzip2 zlib tar"
 
-PKG_VER=5.34.1
+PKG_VER=5.34.0
 SOURCE=https://www.cpan.org/src/5.0/perl-$PKG_VER.tar.gz
 DESC="The Practical Extraction and Report Language"
 ADDITIONAL="
diff --git a/repo/system/re2.xibuild b/repo/system/re2.xibuild
index c4ef938..4dd0e5d 100644
--- a/repo/system/re2.xibuild
+++ b/repo/system/re2.xibuild
@@ -14,5 +14,5 @@ build () {
 }
 
 package () {
-    make PREFIX=/usr DESTDIR=$PKGDEST install
+    make PREFIX=/usr DESTDIR=$PKG_DEST install
 }
diff --git a/repo/system/sbase.xibuild b/repo/system/sbase.xibuild
index e4a36cd..35c4dfc 100644
--- a/repo/system/sbase.xibuild
+++ b/repo/system/sbase.xibuild
@@ -29,7 +29,7 @@ package () {
     make PREFIX=/usr DESTDIR=$PKG_DEST install 
 
     # these are provided by other utils
-    for p in tar sed find xargs grep; do
+    for p in tar sed find xargs grep sort; do
         mv $PKG_DEST/usr/bin/$p $PKG_DEST/usr/bin/s$p
         mv $PKG_DEST/usr/share/man/man1/$p.1 $PKG_DEST/usr/share/man/man1/s$p.1
     done
diff --git a/repo/system/sed.xibuild b/repo/system/sed.xibuild
index a5b2297..ddb7102 100644
--- a/repo/system/sed.xibuild
+++ b/repo/system/sed.xibuild
@@ -1,21 +1,17 @@
 #!/bin/sh
 
-MAKEDEPS="make "
+MAKEDEPS="make sort"
 DEPS="musl acl attr"
 
-PKG_VER=4.8
-SOURCE=https://ftp.gnu.org/gnu/sed/sed-$PKG_VER.tar.xz
-DESC="GNU stream editor"
+PKG_VER=0.8.6
+SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
+DESC="stream editor from toybox"
 
 build () {
-    ./configure --prefix=/usr
-    make
-    #make html
+    ./configure 
+    make sed
 }
 
 package () {
-    make DESTDIR=$PKG_DEST install 
-
-    #install -d -m755    $PKG_DEST/usr/share/doc/sed-$PKG_VER
-    #install -m644 doc/sed.html $PKG_DEST/usr/share/doc/sed-$PKG_VER
+    install -Dm755 sed $PKG_DEST/usr/bin/
 }
diff --git a/repo/system/snappy.xibuild b/repo/system/snappy.xibuild
index 1d180bc..e266327 100644
--- a/repo/system/snappy.xibuild
+++ b/repo/system/snappy.xibuild
@@ -8,10 +8,17 @@ DEPS="musl "
 
 PKG_VER=1.1.9
 SOURCE="https://github.com/google/snappy/archive/$PKG_VER.tar.gz"
-ADDITIONAL="rtti.patch fix-inline.patch cmakelists.patch "
+
+_googletest_commit=18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6
+ADDITIONAL="
+rtti.patch fix-inline.patch 
+https://github.com/google/googletest/archive/$_googletest_commit.tar.gz"
 
 prepare () {
     apply_patches
+    rmdir third_party/googletest
+    tar xvf $_googletest_commit.tar.gz
+	ln -s ../googletest-$_googletest_commit third_party/googletest
 }
 
 build () {
diff --git a/repo/util/bash.xibuild b/repo/util/bash.xibuild
index fbaf390..63626b5 100644
--- a/repo/util/bash.xibuild
+++ b/repo/util/bash.xibuild
@@ -18,6 +18,7 @@ package () {
 
 postinstall () {
     command -v bash || exit 1
+    command -v grep || exit 1
 
     if [ -f /etc/shells ] || grep -vq "bash" /etc/shells; then
         echo "/bin/bash" >> /etc/shells
diff --git a/repo/util/diffutils.xibuild b/repo/util/diffutils.xibuild
index 0087a0d..2a3d0cd 100644
--- a/repo/util/diffutils.xibuild
+++ b/repo/util/diffutils.xibuild
@@ -1,17 +1,19 @@
 #!/bin/sh
 
-MAKEDEPS="make"
+MAKEDEPS="make sort"
 DEPS="musl sh"
 
-PKG_VER=3.8
-SOURCE=https://ftp.gnu.org/gnu/diffutils/diffutils-$PKG_VER.tar.xz
+PKG_VER=0.8.6
+SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
 DESC="Utility programs for creating patch files"
 
 build () {
-    ./configure --prefix=/usr 
-    make
+    make defconfig
+    make diff
+    make cmp
 }
 
 package () {
-    make DESTDIR=$PKG_DEST install 
+    install -Dm755 diff $PKG_DEST/usr/bin/
+    install -Dm755 cmp $PKG_DEST/usr/bin/
 }
diff --git a/repo/util/man-db.xibuild b/repo/util/man-db.xibuild
index 6f80d27..5d0e76c 100644
--- a/repo/util/man-db.xibuild
+++ b/repo/util/man-db.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="bash gdbm zlib groff libpipeline less"
+DEPS="gdbm zlib groff libpipeline less"
 
 PKG_VER=2.9.4
 SOURCE=http://download.savannah.nongnu.org/releases/man-db/man-db-$PKG_VER.tar.xz
diff --git a/repo/util/mandoc.xibuild b/repo/util/mandoc.xibuild
new file mode 100644
index 0000000..d74e6c8
--- /dev/null
+++ b/repo/util/mandoc.xibuild
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl zlib sbase"
+
+PKG_VER=1.14.6
+SOURCE=https://mandoc.bsd.lv/snapshots/mandoc-$PKG_VER.tar.gz
+DESC="mandoc (formerly mdocml) UNIX manpage compiler toolset"
+
+prepare () {
+	cat > configure.local << EOF
+PREFIX=/usr
+MANDIR=/usr/share/man
+LIBDIR=/usr/lib
+CFLAGS="$CFLAGS"
+UTF8_LOCALE="en_US.UTF-8"
+MANPATH_DEFAULT="/usr/share/man:/usr/local/man"
+MANPATH_BASE="/usr/share/man"
+LN="ln -sf"
+HAVE_LESS_T=0
+EOF
+
+}
+
+build () {
+    ./configure
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST base-install lib-install
+}
diff --git a/repo/util/mksh.xibuild b/repo/util/mksh.xibuild
new file mode 100644
index 0000000..d946695
--- /dev/null
+++ b/repo/util/mksh.xibuild
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="sbase musl"
+
+PKG_VER=59c
+SOURCE=https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R$PKG_VER.tgz
+DESC="MirBSD Korn Shell"
+
+prepare () {
+    rmdir mksh
+	sed -i check.t -e '/^name: selftest-tty-absent$/,/^---$/d'
+}
+
+build () {
+    sh Build.sh -r
+}
+
+package () {
+    install -Dm755 mksh $PKG_DEST/bin/mksh
+	install -Dm644 dot.mkshrc $PKG_DEST/etc/skel/.mkshrc
+	install -Dm644 mksh.1 $PKG_DEST/usr/share/man/man1/mksh.1
+}
+
+postinstall () {
+    command -v mksh || exit 1
+
+    if [ -f /etc/shells ] || grep -vq "mksh" /etc/shells; then
+        echo "/bin/mksh" >> /etc/shells
+    fi
+}
diff --git a/repo/util/mpd-mpc.xibuild b/repo/util/mpd-mpc.xibuild
new file mode 100644
index 0000000..2018d33
--- /dev/null
+++ b/repo/util/mpd-mpc.xibuild
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+NAME="mpd-mpc"
+DESC="Minimalist command line interface to MPD"
+
+MAKEDEPS=""
+DEPS=""
+
+PKG_VER=0.34
+SOURCE="https://www.musicpd.org/download/mpd-mpc/${PKG_VER%.*}/mpd-mpc-$PKG_VER.tar.xz"
+
diff --git a/repo/util/pm-utils.xibuild b/repo/util/pm-utils.xibuild
index 5f3e179..87c14ef 100644
--- a/repo/util/pm-utils.xibuild
+++ b/repo/util/pm-utils.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="xmlto docbook-xml docbook-xsl"
-DEPS="musl bash procps"
+DEPS="musl procps"
 
 PKG_VER=1.4.1
 SOURCE=https://pm-utils.freedesktop.org/releases/pm-utils-$PKG_VER.tar.gz
diff --git a/repo/util/sort.xibuild b/repo/util/sort.xibuild
new file mode 100644
index 0000000..5310d1b
--- /dev/null
+++ b/repo/util/sort.xibuild
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+MAKEDEPS="make sort"
+DEPS="musl sh"
+
+PKG_VER=0.8.6
+SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
+DESC="Sort from toybox"
+
+prepare () {
+    # remove the -s sort flag missing from sbase
+    sed -i "s/sort -s/sort/g" scripts/*.sh
+}
+
+build () {
+    ./configure 
+    make sort
+}
+
+package () {
+    install -Dm755 sort $PKG_DEST/usr/bin/
+}
diff --git a/repo/x11/harfbuzz.xibuild b/repo/x11/harfbuzz.xibuild
index 7164985..aa876b3 100644
--- a/repo/x11/harfbuzz.xibuild
+++ b/repo/x11/harfbuzz.xibuild
@@ -3,8 +3,8 @@
 NAME="harfbuzz"
 DESC="Text shaping library"
 
-MAKEDEPS="meson ninja "
-DEPS="freetype2 glib graphite musl "
+MAKEDEPS="meson ninja gtk-doc python-pygments"
+DEPS="freetype2 glib graphite musl"
 
 PKG_VER=4.2.0
 SOURCE="https://github.com/harfbuzz/harfbuzz/archive/$PKG_VER.tar.gz"
diff --git a/repo/x11/libsm.xibuild b/repo/x11/libsm.xibuild
index 0a7bbdc..9e132d9 100644
--- a/repo/x11/libsm.xibuild
+++ b/repo/x11/libsm.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make asciidoc xmlto lynx"
-DEPS="fontconfig libxcb elogind"
+DEPS="fontconfig libxcb elogind libice"
 
 PKG_VER=1.2.3
 SOURCE=https://www.x.org/pub/individual/lib/libSM-$PKG_VER.tar.bz2
diff --git a/repo/x11/libxaw.xibuild b/repo/x11/libxaw.xibuild
index 2532f54..e7e4788 100644
--- a/repo/x11/libxaw.xibuild
+++ b/repo/x11/libxaw.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make asciidoc xmlto lynx"
-DEPS="fontconfig libxcb elogind"
+DEPS="fontconfig libxcb elogind libxmu libxt libxpm"
 
 PKG_VER=1.0.14
 SOURCE=https://www.x.org/pub/individual/lib/libXaw-$PKG_VER.tar.bz2
diff --git a/repo/x11/libxmu.xibuild b/repo/x11/libxmu.xibuild
index 159531c..5127ccc 100644
--- a/repo/x11/libxmu.xibuild
+++ b/repo/x11/libxmu.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make asciidoc xmlto lynx"
-DEPS="fontconfig libxcb elogind"
+DEPS="fontconfig libxcb elogind libxt"
 
 PKG_VER=1.1.3
 SOURCE=https://www.x.org/pub/individual/lib/libXmu-$PKG_VER.tar.bz2
diff --git a/repo/x11/libxt.xibuild b/repo/x11/libxt.xibuild
index d801b21..293683d 100644
--- a/repo/x11/libxt.xibuild
+++ b/repo/x11/libxt.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make asciidoc xmlto lynx"
-DEPS="fontconfig libxcb elogind"
+DEPS="fontconfig libxcb elogind libsm libice"
 
 PKG_VER=1.2.1
 SOURCE=https://www.x.org/pub/individual/lib/libXt-$PKG_VER.tar.bz2
diff --git a/repo/x11/pango.xibuild b/repo/x11/pango.xibuild
index 2515487..03458aa 100644
--- a/repo/x11/pango.xibuild
+++ b/repo/x11/pango.xibuild
@@ -4,7 +4,7 @@ NAME="pango"
 DESC="library for layout and rendering of text"
 
 MAKEDEPS="meson ninja"
-DEPS="sbase cairo fontconfig freetype2 glib libx11 libxft libxrender musl"
+DEPS="sbase cairo fontconfig freetype2 glib libx11 libxft libxrender musl fribidi harfbuzz"
 
 PKG_VER=1.50.5
 SOURCE="https://download.gnome.org/sources/pango/${PKG_VER%.*}/pango-$PKG_VER.tar.xz"
diff --git a/repo/x11/sxhkd.xibuild b/repo/x11/sxhkd.xibuild
index b8e4d61..a18247a 100644
--- a/repo/x11/sxhkd.xibuild
+++ b/repo/x11/sxhkd.xibuild
@@ -9,9 +9,9 @@ SOURCE=https://github.com/baskerville/sxhkd/archive/refs/tags/$PKG_VER.tar.gz
 DESC="Simple X HotKey Daemon; reacts to input events by executing commands"
 
 build () {
-    make
+    make PREFIX=/usr
 }
 
 package () {
-    make DESTDIR=$PKG_DEST install
+    make PREFIX=/usr DESTDIR=$PKG_DEST install
 }
diff --git a/repo/x11/xdg-utils.xibuild b/repo/x11/xdg-utils.xibuild
index d3fb5ee..ad51ab4 100644
--- a/repo/x11/xdg-utils.xibuild
+++ b/repo/x11/xdg-utils.xibuild
@@ -3,7 +3,7 @@
 NAME="xdg-utils"
 DESC="Basic desktop integration functions"
 
-MAKEDEPS="make "
+MAKEDEPS="make docbook-dtd libxml2 libxslt xmlto lynx"
 DEPS="file xprop xset "
 
 PKG_VER=1.1.3
diff --git a/repo/xi/xiutils.xibuild b/repo/xi/xiutils.xibuild
index 4cbcc01..0c8ae25 100644
--- a/repo/xi/xiutils.xibuild
+++ b/repo/xi/xiutils.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make gcc"
 DEPS="musl sh"
 
-PKG_VER=1.2.2
+PKG_VER=1.2.4
 SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git
 BRANCH="v$PKG_VER"
 
diff --git a/repo/skip/alsa-oss.xibuild b/skip/alsa-oss.xibuild
index 48d9672..48d9672 100644
--- a/repo/skip/alsa-oss.xibuild
+++ b/skip/alsa-oss.xibuild
diff --git a/repo/skip/audit.xibuild b/skip/audit.xibuild
index fcfd2ec..fcfd2ec 100644
--- a/repo/skip/audit.xibuild
+++ b/skip/audit.xibuild
diff --git a/repo/skip/broadcom-wl.xibuild b/skip/broadcom-wl.xibuild
index 948c9bd..948c9bd 100644
--- a/repo/skip/broadcom-wl.xibuild
+++ b/skip/broadcom-wl.xibuild
diff --git a/repo/skip/cacert-utils.xibuild b/skip/cacert-utils.xibuild
index 2f21aeb..2f21aeb 100644
--- a/repo/skip/cacert-utils.xibuild
+++ b/skip/cacert-utils.xibuild
diff --git a/repo/skip/fakechroot.xibuild b/skip/fakechroot.xibuild
index 9a6f715..9a6f715 100644
--- a/repo/skip/fakechroot.xibuild
+++ b/skip/fakechroot.xibuild
diff --git a/repo/skip/fakeroot.xibuild b/skip/fakeroot.xibuild
index c824193..c824193 100644
--- a/repo/skip/fakeroot.xibuild
+++ b/skip/fakeroot.xibuild
diff --git a/repo/skip/icecream-sundae.xibuild b/skip/icecream-sundae.xibuild
index 58f08aa..58f08aa 100644
--- a/repo/skip/icecream-sundae.xibuild
+++ b/skip/icecream-sundae.xibuild
diff --git a/repo/skip/polybar.xibuild b/skip/polybar.xibuild
index 9c07012..9c07012 100644
--- a/repo/skip/polybar.xibuild
+++ b/skip/polybar.xibuild
diff --git a/repo/skip/ppp.xibuild b/skip/ppp.xibuild
index b6db516..b6db516 100644
--- a/repo/skip/ppp.xibuild
+++ b/skip/ppp.xibuild
diff --git a/repo/skip/test.xibuild b/skip/test.xibuild
index 8a8902f..8a8902f 100644
--- a/repo/skip/test.xibuild
+++ b/skip/test.xibuild
diff --git a/repo/skip/xf86-video-vga.xibuild b/skip/xf86-video-vga.xibuild
index f6cb712..f6cb712 100644
--- a/repo/skip/xf86-video-vga.xibuild
+++ b/skip/xf86-video-vga.xibuild
diff --git a/wishlist.md b/wishlist.md
index b028013..e1217de 100644
--- a/wishlist.md
+++ b/wishlist.md
@@ -31,9 +31,13 @@
 [ ] exiftool
 [?] mpc
 
-[ ] nvidia drivers
+[ ] nvidia drivers (LLLLL)
 [x] working xorg
 [x] sshd (openssh)
 [ ] broadcom wl drivers
 [ ] bluetoothctl
 
+!!
+
+[ ] lame
+[ ] mpd-mpc