Split build() into prepbuilddir() and build() functions in base, xorg, gtk, extra and

net subsection package build files
Upgraded base/rust to 1.64.0
Added cbindgen 0.24.3 to base
Upgraded base/gdbm to 1.23
Added -mno-outline-atomics as CXXFLAGS to fix build breakage in base/gpgme
Fixed rc.gtk script in base/initfs
Added preservestaticlibs to prevent static libraries from being discarded and upgraded base/libcap to 2.67
Upgraded base/nodejs to 18.14.2
Temporarily discarded unnecessary code and comments in installpkg script in base/pkgtools
Added protobuf 3.14.0 to base
Upgraded base/python3 to 3.9.16
Upgraded base/sccache to 0.3.3
Upgraded extra/abiword to 3.0.5
Added adafruit-io 2.7.0 to extra
Added code to discard creation of systemd directory in extra/bluez
Added code to discard /usr directory in extra/ffmpeg
Removed unnecessary CFLAGS in extra/freerdp
Upgraded extra/imagemagick to 7.1.0
Upgraded extra/vim to 9.0.1000
Added build option to disable linking against gtk2 in extra/xarchiver
Upgraded heavybuilds/firefox to 102.8.0 ESR, discarded extraneous files that were part of it
Upgraded net/fail2ban to 1.0.2
Discarded unnecessary CFLAGS in net/lynx
Optimised build code in net/maccalc
Fixed noautoconfsite variable and added --disable-xxhash build option to net/rsync
Removed unnecessary CFLAGS in xorg/libtiff and xorg/libxklavier

base/acl/acl.SMBuild

@@ -6,14 +6,16 @@ download="https://download.savannah.nongnu.org/releases/acl/acl-$version.tar.gz"
 requires="attr"
 desc="Tools and libraries for manipulating POSIX Access Control Lists"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/acpid/acpid.SMBuild

@@ -1,12 +1,12 @@
 app=acpid
 version=2.0.32
 build=1sml
-homepage="http://sourceforge.net/projects/acpid2/"
+homepage="https://sourceforge.net/projects/acpid2"
 download=""
 desc="Tools and daemon for implementing ACPI standard on Linux"
 requires="musl"
 
-build() {
+prepbuilddir() {
   compileonlyfor x86_64
   mkandenterbuilddir
   rm -rf $app-$version
@@ -14,7 +14,9 @@ build() {
   tar xf $srcdir/$app-$version.tar.?z**
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
@@ -35,4 +37,4 @@ build() {
 
 sha512sums="
 6b5ccc5ea460135b07a1ea894d0bc7200e24167669fdcf1aa9a9c49dc1b7c5cb4479ffb854b1d04cb8b25c55f4adf8dc7996d7899d5fe52c015259e7df84f314  acpid-2.0.32.tar.lz
-"
+"

base/alsa-lib/alsa-lib.SMBuild

@@ -6,16 +6,17 @@ download=""
 desc="Advanced Linux Sound Architecture provides audio and MIDI functionality for Linux"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z**
   cd $app-$version
   fixbuilddirpermissions
-
   applypatch $srcdir/remove-test.patch
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-python \
@@ -37,7 +38,7 @@ build() {
     mkdir -p etc ; touch etc/asound.conf.new
   )
 
-  if [ "$ARCH" = "aarch64" ]; then
+  if [ "$arch" = "aarch64" ]; then
     # Provide some sample conf files for using USB audio by overwriting the above file
     cp $srcdir/alsa.conf.rpi.usbaudio $pkg/share/alsa/alsa.conf.new
     cp $srcdir/asound.conf.rpi $pkg/etc/asound.conf.new

base/alsa-plugins/alsa-plugins.SMBuild

@@ -6,14 +6,16 @@ download=""
 desc="Plugins for ALSA"
 requires="alsa-lib"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z**
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --libdir=/lib 
@@ -28,4 +30,4 @@ build() {
 
 sha512sums="
 f6395a3753fcf2873d8aa54d9dd6f1a772b600de6a9ed9a36d7d64186d526ba1234dd957dd085f4c9ddad9ebf85440ef3c672c646b4e128607649262057b37d7  alsa-plugins-1.2.2.tar.lz
-"
+"

base/alsa-utils/alsa-utils.SMBuild

@@ -6,14 +6,16 @@ download=""
 requires="netbsd-curses alsa-lib"
 desc="Userland utilities for ALSA"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z**
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \

base/argon2/argon2.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/$version.
 desc="A password hashing function written in C"
 requires="musl"
    
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make OPTTARGET="none" LIBRARY_REL="lib" PREFIX="/"
   make OPTTARGET="none" LIBRARY_REL="lib" PREFIX="/" install DESTDIR=$pkg
 
@@ -24,4 +26,4 @@ build() {
 
 sha512sums="
 c79eb9f333f62f37d977aaf0ff9f09dd9d177727b91b0438ffbcec6e34150aebc8ae6c10bb10dbf122c9a4c59bee1feed6b946ba0c28f4f12faf6a847deb7c2d  argon2-20190702.tar.lz
-"
+"

base/argp-standalone/argp-standalone.SMBuild

@@ -7,7 +7,7 @@ desc="Hierarchical argument parsing library broken out of glibc"
 requires="musl"
 preservestaticlibs=1
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -17,7 +17,9 @@ build() {
 
   applypatch $srcdir/gnu89-inline.patch
   applypatch $srcdir/001-throw-in-funcdef.patch
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/asciidoc/asciidoc.SMBuild

@@ -6,14 +6,16 @@ download=""
 desc="Text document format for writing notes and documentation"
 requires="python3 libxslt docbook"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-"py3"-$version
 
   tar xf $srcdir/$app-"py3"-$version.tar.?z*
   cd $app-"py3"-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/aspell/aspell.SMBuild

@@ -5,14 +5,16 @@ homepage="http://aspell.net/"
 requires="gcc-libs netbsd-curses perl"
 desc="Spell checker for GNU Linux"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --sysconfdir=/etc/aspell \

base/aspell6/aspell6.SMBuild

@@ -6,14 +6,16 @@ download=""
 requires="aspell"
 desc="Dictionary files for aspell spelling checker"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version-2018.04.16-0.tar.bz2
   cd "$app-$version-2018.04.16-0"
   fixbuilddirpermissions
+}
 
+build() {
   ./configure 
 
   make
@@ -26,4 +28,4 @@ build() {
 
 sha512sums="
 70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2  aspell6-en-2018.04.16-0.tar.bz2
-"
+"

base/attr/attr.SMBuild

@@ -6,7 +6,7 @@ download="https://download.savannah.nongnu.org/releases/attr/attr-$version.src.t
 requires="musl"
 desc="Tools for manipulating extended attributes on filesystems"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -17,9 +17,10 @@ build() {
   sed -i 's@-o $(PKG_USER) -g $(PKG_GROUP)@@' include/buildmacros
   sed -i 's@CHOWN=_chown@CHOWN=true@' include/install-sh
   applypatch $srcdir/attr-cdefs.patch
-
   make clean
+}
 
+build() {
   CFLAGS="-static" \
   ./configure \
     --prefix="" \

base/autoconf/autoconf.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/autoconf/autoconf-$version.tar.xz"
 requires="m4 perl perl-modules diffutils gawk"
 desc="m4 macros extension to produce scripts for software packaging"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/automake/automake.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/automake/automake-$version.tar.xz"
 desc="GNU Makefile generator"
 requires="autoconf perl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/bash-completion/bash-completion.SMBuild

@@ -6,7 +6,7 @@ download="https://github.com/scop/bash-completion/archive/refs/tags/$version.tar
 requires="bash"
 desc="Programmable completion for the bash shell"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -16,7 +16,9 @@ build() {
 
   # Thank you slackware
   applypatch $srcdir/fixup-sh-script-completions.diff
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/bash/bash.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 requires="netbsd-curses"
 desc="GNU Bourne-Again SHell"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   bash_cv_getenv_redef=no \
   bash_cv_sys_named_pipes=yes \
   ac_cv_rl_version=5.0 \

base/bc/bc.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/gavinhoward/bc/releases/download/$version/bc-$versi
 desc="Arbitrary precision numeric processing language"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z**
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure.sh -EHNG
 
   make all

base/bison/bison.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/bison/bison-$version.tar.xz"
 desc="parser generator similar to yacc"
 requires="m4"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-nls 
@@ -26,4 +28,4 @@ build() {
 
 sha512sums="
 dadc5e1ee532cfacb149c130131b66f36a0bcf724737870a0820bbf1508e1d2035c0e06dda94518a477c330ec7f56eb2fbde38f74155c741b23556eb0c3de42c  bison-3.1.tar.lz
-"
+"

base/boost/boost-execinfo.patch

@@ -1,11 +0,0 @@
---- boost_1_60_0.org/tools/build/src/engine/execunix.c	2013-01-04 09:45:43.165000002 +0000
-+++ boost_1_60_0/tools/build/src/engine/execunix.c	2013-01-04 09:46:20.095000004 +0000
-@@ -18,7 +18,7 @@
- #include <sys/times.h>
- #include <sys/wait.h>
- 
--#if defined(sun) || defined(__sun)
-+#if defined(sun) || defined(__sun) || defined(__GLIBC__)
-     #include <wait.h>
- #endif
- 

base/boost/boost.SMBuild

@@ -7,14 +7,16 @@ download="https://boostorg.jfrog.io/artifactory/main/release/$version/source/boo
 requires="bzip2 zlib findutils python3 icu xz"
 desc="Huge collection of free peer-reviewed portable C++ source libraries"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf "$app"_"$sversion"
 
   tar xf $srcdir/"$app"_"$sversion".tar.?z*
   cd "$app"_"$sversion" 
   chown -R root.root .
+}
 
+build() {
   CC="$CC" \
   ./bootstrap.sh \
     --prefix="$pkg" --with-toolset=gcc --with-icu --with-python=python3 

base/brotli/brotli.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/google/brotli/archive/refs/tags/v$version.tar.gz"
 requires="musl"
 desc="Lossless compression algorithm based on LZ77, Huffman coding and 2nd order context modeling"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./bootstrap
 
   ./configure \

base/bubblewrap/bubblewrap.SMBuild

@@ -6,7 +6,7 @@ download=""
 desc="Unprivileged sandboxing tool to reduce attack surfaces"
 requires="libcap"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -15,7 +15,9 @@ build() {
   fixbuilddirpermissions
 
   applypatch $srcdir/realpath-workaround.patch
+}
 
+build() {
   ./configure \
     --prefix="" \
     --with-priv-mode=setuid \

base/busybox/busybox.SMBuild

@@ -6,7 +6,7 @@ download="https://www.busybox.net/downloads/busybox-$version.tar.bz2"
 requires="musl"
 desc="Swiss army knife of embedded linux providing subsets of common UNIX utilities"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -19,7 +19,9 @@ build() {
   applypatch $srcdir/busybox-fdisk-sector-size.patch
   applypatch $srcdir/busybox-libbb-make-unicode-printable.patch
   applypatch $srcdir/busybox-ping.patch
+}
 
+build() {
   cp $srcdir/busybox.config .config
   make CC="$CC" 
 

base/bzip2/bzip2.SMBuild

@@ -6,14 +6,16 @@ download="https://sourceware.org/pub/bzip2/bzip2-$version.tar.gz"
 requires="musl"
 desc="block-sorting file compressor based on Burrows-Wheeler text compression algorithm"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   # Prevent tests from running
   sed -i 's@all: libbz2.a bzip2 bzip2recover test@all: libbz2.a bzip2 bzip2recover@' Makefile
 

base/c-ares/c-ares.SMBuild

@@ -6,14 +6,16 @@ download="https://c-ares.haxx.se/download/c-ares-$version.tar.gz"
 desc="C library for asynchronous DNS requests including name resolves"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --enable-shared

base/ca-certificates/ca-certificates.SMBuild

@@ -5,7 +5,7 @@ homepage="https://ftp.debian.org/debian/pool/main/c/ca-certificates/"
 desc="PEM Files of CA Certificates"
 requires="musl curl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   tar xf $srcdir/$app.tar.?z*
 
@@ -14,7 +14,9 @@ build() {
 
   # Patch to remove incompatible arguments from run-parts
   applypatch $srcdir/fixup_update-ca-certificates.diff 
+}
 
+build() {
   # Update to certdata.txt from $srcdir:
   xzcat $srcdir/certdata-${version}.txt.xz > mozilla/certdata.txt
 

base/cbindgen/cbindgen.SMBuild

@@ -0,0 +1,30 @@
+app=cbindgen
+version=0.24.3
+build=1sml
+homepage="https://github.com/eqrion/cbindgen"
+download=""
+desc="Tool for generating Rust headers from C code"
+requires="rust"
+   
+prepbuilddir() {
+  mkandenterbuilddir
+  rm -rf $app-$version
+
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
+  fixbuilddirpermissions
+}
+
+build() {
+  RUSTONIG_DYNAMIC_LIBONIG=1 \
+  cargo build --offline --release --target $arch-unknown-linux-musl $MAKEFLAGS
+  install -Dm 755 target/$arch-unknown-linux-musl/release/cbindgen $pkg/bin/cbindgen
+
+  cp LICENSE $pkgdocs/
+
+  mkfinalpkg
+}
+
+sha512sums="
+9bed6bb1d4f9829a94eadca36cb56e8d6a4065c632823fa910ef684708db9cf3983ab3b462dcf24f3291c689c2beac9a6ce6aad5682ebfbb86fe7259f6bcbd0c  cbindgen-0.24.3.tar.lz
+"

base/ccache/ccache.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/ccache/ccache/releases/download/v$version/ccache-$v
 desc="Compiler cache to speed up re-compilation of C/C++ code by caching previous compiles"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   LDFLAGS="-static" \
   ./configure \
     --prefix="" 

base/chrony/chrony.SMBuild

@@ -6,14 +6,16 @@ download="https://download.tuxfamily.org/chrony/chrony-$version.tar.gz"
 desc="Lightweight program to maintain accuracy of the real time clock via NTP"
 requires="nettle libcap"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \
@@ -39,4 +41,4 @@ build() {
 
 sha512sums="
 df1f75305eda70294d5217131a63a1f42fc5fd78fd5d73d53c930c81707e2a0750a137ccc739d111f398f0c49775c847b73b27e1f00931d7a174261eb253c409  chrony-4.2.tar.lz
-"
+"

base/chrpath/chrpath.SMBuild

@@ -6,14 +6,16 @@ download="https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-$ver
 desc="Program to modify rpath aka dynamic library load path of binaries"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --mandir=/share/man
@@ -28,4 +30,4 @@ build() {
 
 sha512sums="
 3af577da5a271fa7194135a328ab1b8e2ec185dd3d37938425b46ed77ea1deb813db5ac9fc4f045a45fb7a27194d4a5d6227f922b62980ffd46451b972c4fc5c  chrpath-0.16.tar.lz
-"
+"

base/cmake/cmake.SMBuild

@@ -6,14 +6,16 @@ download="https://cmake.org/files/v$version/cmake-$version.tar.gz"
 desc="Cross-platform, open-source make system"
 requires="gcc-libs openssl libunistring libidn2"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   para="$(echo $MAKEFLAGS | sed 's/-j//')"
 
   ./bootstrap \

base/coreutils/coreutils.SMBuild

@@ -6,7 +6,7 @@ download="http://ftp.gnu.org/gnu/coreutils/coreutils-$version.tar.xz"
 desc="Core GNU utilities"
 requires="attr acl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -15,7 +15,9 @@ build() {
   fixbuilddirpermissions
 
   applypatch $srcdir/ls.patch
+}
 
+build() {
   FORCE_UNSAFE_CONFIGURE=1 \
   CFLAGS="$CFLAGS -static" \
   ./configure \

base/cpio/cpio.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/cpio/cpio-$version.tar.gz"
 desc="Backup and archiving utility"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   CFLAGS="$CFLAGS -fcommon" \
   ./configure \
     --prefix="" 

base/crda/crda.SMBuild

@@ -5,7 +5,7 @@ homepage="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
 requires="libnl libgcrypt python-m2crypto"
 desc="Udev wrapper for communicating between kernel and userspace"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -20,7 +20,9 @@ build() {
 
   # Disable -Werror, just in case
   sed -i 's@-Werror@@g' Makefile
+}
 
+build() {
   make PREFIX="/" SBINDIR="/bin"
   make PREFIX="/" SBINDIR="/bin" install DESTDIR=$pkg 
 

base/cryptsetup/cryptsetup.SMBuild

@@ -7,14 +7,16 @@ download="https://github.com/mbroz/cryptsetup/archive/refs/tags/v$mversion.tar.g
 desc="Utility for setting up encrypted filesystems"
 requires="popt util-linux libgpg-error libgcrypt lvm"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --sbindir=/bin \

base/curl/curl.SMBuild

@@ -7,14 +7,16 @@ desc="Command line URL data transfer tool"
 requires="zlib openssl brotli libssh2 libidn2 nghttp2 libunistring libpsl"
 preservestaticlibs=1
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
@@ -44,4 +46,4 @@ build() {
 
 sha512sums="
 f6cc99dd66d34392e149f99e97c4dfbcbd699e5bb104fa57d7c8be36547bd8c2ff0d64f76c806d1532632352a3251046a8fbbbdf91b5e1398061d38ffa7e0cda  curl-7.88.1.tar.lz
-"
+"

base/cython/cython.SMBuild

@@ -5,14 +5,16 @@ homepage="https://pypi.org/project/Cython"
 requires="python3 python-setuptools"
 desc="C-Extensions for Python3"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf Cython-$version
 
   tar xf $srcdir/Cython-$version.tar.?z*
   cd Cython-$version
   fixbuilddirpermissions
+}
 
+build() {
   python3 setup.py install --prefix="" --root=$pkg
 
   cp COPYING.txt LICENSE.txt $pkgdocs/

base/db/db.SMBuild

@@ -6,7 +6,7 @@ download="http://download.oracle.com/berkeley-db/db-$version.tar.gz"
 desc="Berkeley embedded database library"
 requires="gcc-libs"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -14,14 +14,16 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
+  applypatch $srcdir/bdb-configure.patch
+}
+
+build() {
   if [ "$arch" = "aarch64" ]; then
     db_atomic=gcc-builtin
   else
     db_atomic=x86/gcc-assembly
   fi
 
-  applypatch $srcdir/bdb-configure.patch
-
   cd build_unix
 
   db_cv_clock_monotonic=yes \

base/dcron/dcron.SMBuild

@@ -6,7 +6,7 @@ download="http://www.jimpryor.net/linux/releases/dcron-$version.tar.gz"
 desc="Dillons Cron daemon"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -18,7 +18,9 @@ build() {
   applypatch $srcdir/0006-Fixed-a-bug-whereby-syncs-killed-all-waiting-jobs.patch
   applypatch $srcdir/0007-Update-main.c.patch
   applypatch $srcdir/crontab.c.O_EXCL.diff
+}
 
+build() {
   make PREFIX="" BINDIR=/bin SBINDIR=/bin CRONTAB_GROUP=root 
 
   install -Dm 755 crond $pkg/bin/crond
@@ -41,10 +43,11 @@ build() {
 
   mkfinalpkg
 }
+
 sha512sums="
 19e645ecf073f38539cce45daf82e4d1eac58fbba514e18c9c4e8b9976dd9557ece7dcb2ad3c90bc0b05ec732f7fbb76617a97ec572cc28625398935734ac56a  dcron-4.5.tar.lz
 687ba63afc4bf6028a7a4f0debfcb8b8758aaacd1ddb317136d55dfae7c57c572d81edf340b4b36476280a38b71b740f23e9f56a02a95ebd0f0aacdcba735c59  0002-README-var-spool-cron-crontabs-root.patch
 faf6ecee8f678298b1a8cd27f42f42e3e3396062d73ea4bfff14f930ae71e99613354d9ec234407936e19c05b1de9cec46fffbf6df9ef71d4294d8b32bdad74d  0006-Fixed-a-bug-whereby-syncs-killed-all-waiting-jobs.patch
 534628dfaad83a0d746731b67756fff3dd6a5b305efb07e00e3a7acb6bac9138e7ee3cae22d1314ee3041b22b9dd3574c1342e26af39198d6d0685964318876d  0007-Update-main.c.patch
 a56862ea0fc1aa2f5fa77c2d341c2e35bb5d2ac5d9942c3dee25662eac6c9078fdd293835ec471ece22b2add4ae21db596cb0d41fb765ee92fb9aa53a4252287  crontab.c.O_EXCL.diff
-"
+"

base/desktop-file-utils/desktop-file-utils.SMBuild

@@ -5,7 +5,7 @@ homepage="https://www.freedesktop.org/wiki/Software/desktop-file-utils/"
 desc="Utilities for manipulating desktop files"
 requires="glib pcre"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -15,7 +15,9 @@ build() {
 
   # Thank you slackware
   applypatch $srcdir/desktop-file-utils.quiet.warnings.diff
+}
 
+build() {
   ./configure \
     --prefix=""
 

base/dialog/dialog.SMBuild

@@ -5,14 +5,16 @@ homepage="https://invisible-island.net/archives/dialog/"
 desc="display dialog boxes from shell scripts"
 requires="netbsd-curses"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version-20170509.tar.?z
   cd "$app-$version-20170509"
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \

base/diffutils/diffutils.SMBuild

@@ -6,7 +6,7 @@ download="https://ftp.gnu.org/gnu/diffutils/diffutils-$version.tar.xz"
 desc="Utilities to find and apply differences between files"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -17,7 +17,9 @@ build() {
   for i in tests gnulib-tests doc ; do
     printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > "$i"/Makefile.in
   done
+}
 
+build() {
   CPPFLAGS="$($srcdir/gnulibfix lib)" \
   LDFLAGS="-static" \
   ./configure \

base/dmidecode/dmidecode.SMBuild

@@ -6,7 +6,7 @@ download="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$version
 desc="DMI table decoder"
 requires="musl"
 
-build() {
+prepbuilddir() {
   compileonlyfor x86_64
   mkandenterbuilddir
   rm -rf $app-$version
@@ -14,7 +14,9 @@ build() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make
   make install DESTDIR=$pkg prefix="" mandir="/share/man" sbindir="/bin"
 

base/dmraid/dmraid.SMBuild

@@ -6,7 +6,7 @@ download="https://people.redhat.com/~heinzm/sw/dmraid/src/dmiraid-$version.rc16-
 desc="Tool and a library to discover, configure and activate ATA RAID devices"
 requires="lvm"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app
 
@@ -21,6 +21,11 @@ build() {
   applypatch $srcdir/005-fix_isw_sectors_calculation.patch
   applypatch $srcdir/006-musl-libc.patch
   applypatch $srcdir/007-fix-loff_t-musl.patch
+}
+
+build() {
+
+  unset MAKEFLAGS CFLAGS CXXFLAGS
 
   ./configure \
     --prefix="" \
@@ -32,7 +37,6 @@ build() {
     --disable-static_link \
     $builddist
 
-  unset MAKEFLAGS CFLAGS CXXFLAGS
   make -j1
   make install DESTDIR=$pkg 
 

base/docbook/docbook.SMBuild

@@ -8,14 +8,16 @@ xslv="1.79.2"
 desc="DocBook DTD for XML"
 requires="libxslt libxml2"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/docbook-xml-$docbookv.tar.?z*
   cd docbook-xml-$docbookv
   fixbuilddirpermissions
+}
 
+build() {
   xml_catalog="$pkg/etc/xml/catalog"
   xml_docbook="$pkg/etc/xml/docbook"
 

base/dosfstools/dosfstools.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/dosfstools/dosfstools/releases/download/v$version/d
 desc="Tools for working with FAT filesystems"
 requires="eudev"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   LDFLAGS="-static" \
   ./configure \
     --prefix="" \

base/e2fsprogs/e2fsprogs.SMBuild

@@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprog
 desc="Utilities for working with ext 2, 3 and 4 filesystems"
 requires="util-linux"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   for i in misc/fsck.c misc/mke2fs.c e2fsck/unix.c ; do
     sed -i 's@sbin@bin@g' $i
   done

base/ed/ed.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/ed/ed-$version.tar.lz"
 desc="Old-school POSIX-compliant text editor"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/enchant/enchant.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/AbiWord/$version/releases/download/v$version/enchan
 desc="spell checking library"
 requires="gcc-libs glib aspell hunspell"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static 

base/enet/enet.SMBuild

@@ -6,14 +6,16 @@ download="http://enet.bespin.org/download/enet-$version.tar.gz"
 requires="musl"
 desc="simple and robust network communication layer over UDP"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --enable-static=no
@@ -28,4 +30,4 @@ build() {
 
 sha512sums="
 dd18c68e395aa8b259607179bfdf8e116276397f89da4473f9c94538bab8ce0036a416c5feb893e01b65f78f16ee1a0dd8959657325f29c5df352d9c69ae33a5  enet-1.3.15.tar.lz
-"
+"

base/eudev/eudev.SMBuild

@@ -7,14 +7,16 @@ desc="Independent fork of udev dynamic device manager by Gentoo devs"
 requires="util-linux"
 preservestaticlibs=1
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \

base/exfat-utils/exfat-utils.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/relan/exfat/archive/refs/tags/v$version.tar.gz"
 desc="Utilities to create and manipulate Microsoft exFAT filesystems"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   CFLAGS="$CFLAGS -std=c99" \
   ./configure \
     --prefix="" \

base/exiv2/exiv2.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/Exiv2/exiv2/releases/download/v$version/exiv2-$vers
 desc="C++ library and a utility to read and write Exif, IPTC and XMP image metadata"
 requires="gcc-libs expat zlib curl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   mkdir smbuild && cd smbuild
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \

base/expat/expat.SMBuild

@@ -6,14 +6,16 @@ build=1sml
 desc="C library for parsing XML"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static 
@@ -28,4 +30,4 @@ build() {
 
 sha512sums="
 0fbd6e39cd318ed77363be0321e3f40002ac1c2e3f3f69c41de45afd94887d9ff6b0685f374649a50acd78eda8bfa8c52a98349f9845941790319d9fa5734088  expat-2.5.0.tar.lz
-"
+"

base/faad2/faad2.SMBuild

@@ -7,14 +7,16 @@ download="https://github.com/knik0/faad2/archive/refs/tags/$mversion.tar.gz"
 desc="HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static

base/fdk-aac/fdk-aac.SMBuild

@@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-$v
 desc="AAC audio encoding and decoding library"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --enable-shared \

base/fftw/fftw.SMBuild

@@ -6,14 +6,16 @@ download="https://www.fftw.org/fftw-$version.tar.gz"
 desc="Collection of fast C routines for computing the Discrete Fourier Transform in multiple dimensions"
 requires="gcc-libs"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   sed -i 's@-mtune=native@$CFLAGS@g' configure
 
   # Default compile options

base/file/file.SMBuild

@@ -6,7 +6,7 @@ download="http://astron.com/pub/file/file-$version.tar.gz"
 desc="Utility to determine file types"
 requires="bzip2 zlib"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -16,7 +16,9 @@ build() {
 
   applypatch $srcdir/file.etc.file.diff
   applypatch $srcdir/file.short.diff
+}
 
+build() {
   # linking against libseccomp causes weird "Bad system call" issues
   CFLAGS="$CFLAGS --std=c99" \
   ./configure \

base/findutils/findutils.SMBuild

@@ -6,7 +6,7 @@ download="https://ftp.gnu.org/gnu/findutils/findutils-$version.tar.gz"
 desc="POSIX-compliant utilities to locate files"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -16,7 +16,9 @@ build() {
 
   applypatch $srcdir/findutils.no.default.options.warnings.diff
   applypatch $srcdir/mountlist.c.patch
+}
 
+build() {
   LDFLAGS="-static" \
   ./configure \
     --prefix="" \

base/flac/flac.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.osuosl.org/pub/xiph/releases/flac/flac-$version.tar.xz"
 desc="Open-source lossless audio codec"
 requires="libogg"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-sse 

base/flex/flex.SMBuild

@@ -6,16 +6,17 @@ download="https://github.com/westes/flex/archive/refs/tags/v$version.tar.gz"
 desc="fast lexical analyzer generator"
 requires="m4"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   unset CPPFLAGS
-
   printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in
 
   CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \

base/fmt/fmt.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/fmtlib/fmt/archive/refs/tags/$version.tar.gz"
 desc="Formatting library for C++"
 requires="musl gcc-libs"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   mkdir smbuild && cd smbuild
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \
@@ -32,4 +34,4 @@ build() {
 
 sha512sums="
 3e67202ab0f91b7e26526bc632ddde063ab06d0029e34286ecf0321f7226dc2d5689a5c6aacb81d516e2c72206daf9cfb037a78cd5b0f472fadbb18934f0c424  fmt-8.1.0.tar.lz
-"
+"

base/fribidi/fribidi.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/fribidi/fribidi/releases/download/v$version/fribidi
 desc="Unicode BiDirectional algorithm library"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static 

base/fuse/fuse.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/libfuse/libfuse/releases/download/fuse-$version/fus
 desc="Interface to export virtual filesystem in userspace"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \

base/fuse3/fuse3.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/libfuse/libfuse/archive/refs/tags/fuse3-$version.ta
 desc="Filesystem in Userspace v3"
 requires="udev"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf fuse-$version
 
   tar xf $srcdir/fuse-$version.tar.?z*
   cd fuse-$version
   fixbuilddirpermissions
+}
 
+build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/" \

base/gawk/gawk.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gawk/gawk-$version.tar.xz"
 desc="POSIX-compliant pattern scanning and processing language"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   CFLAGS="$CFLAGS -static" \
   ./configure \
     --prefix="" \

base/gdb/gdb.SMBuild

@@ -7,14 +7,16 @@ desc="GNU symbolic debugger"
 requires="gcc-libs netbsd-curses expat xz python3 gmp mpfr"
 noautoconfsite=1
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z* 
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-werror \

base/gdbm/gdbm.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gdbm/gdbm-$version.tar.gz"
 desc="set of database routines that work similar to the standard UNIX dbm routines"
 requires="readline"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-nls \
@@ -28,5 +30,5 @@ build() {
 }
 
 sha512sums="
-7e62e23fcec1351e0db6fa7a530711bd1fe8c01d72a8c69f178af2556bb9d47f4e37ea689a196e6e33d6c27b536bf9f8075f17c7e208e2892bc8d2add9e5331c  gdbm-1.18.tar.lz
+eee8e46baecaeb9e8e4844d7a941195bd9e85ac04133499634ea5a1de9a1eaa3dd80da9fdf92ba29f2b54c6960b5c6f3eaf96c09117c1128568722ddbb3104f8  gdbm-1.23.tar.lz
 "

base/gettext/gettext.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.xz"
 desc="Toolkit to internationalize messages given by shell scripts"
 requires="attr acl libxml2"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
-   
+}
+
+build() {
   ./configure \
     --prefix="" \
     --disable-static \

base/giflib/giflib.SMBuild

@@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/giflib/files/giflib-$version.tar.gz"
 desc="Library for manipulating GIF files"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -15,7 +15,9 @@ build() {
   fixbuilddirpermissions
 
   applypatch $srcdir/giflib-5.1.9-fix-missing-quantize-API-symbols.patch
+}
 
+build() {
   make CFLAGS="$CFLAGS"
   make install DESTDIR=$pkg PREFIX="/"
 

base/git/git.SMBuild

@@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/software/scm/git/git-$version.tar.
 desc="Fast, scalable, distributed revision control system"
 requires="curl openssl pcre asciidoc"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make CC="$CC" $MAKEFLAGS CFLAGS="$CFLAGS" \
     prefix="/" gitexecdir="/lib/git-core" \
     NO_TCLTK=1 NO_PYTHON=1 NO_EXPAT=1 NO_GETTEXT=1 \
@@ -31,4 +33,4 @@ build() {
 
 sha512sums="
 a01b3c2a2aab6ad3e7604d3c15de3969249dae114dd5cc0505a534b1142b4342fc8160449d41dd6561b8fd4441a3b1de516d6b6d0cbf07fe0fd97dfcab8de2f9  git-2.30.8.tar.lz
-"
+"

base/glib/glib.SMBuild

@@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/glib/2.66/glib-$version.tar.xz"
 desc="library of C routines"
 requires="libffi util-linux pcre python3 gettext meson"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   mkdir smbuild && cd smbuild
 
   meson .. --prefix="/" \
@@ -33,4 +35,4 @@ build() {
 
 sha512sums="
 993853772132feb0844e868408fa0ee803d4dad5e0827ed6410105b8746c05440313a9514d3b8d87385fe5133aacc2ff1e3e6418c0ce69c8f69f2977733f623c  glib-2.70.3.tar.lz
-"
+"

base/gloox/gloox.SMBuild

@@ -6,7 +6,7 @@ download="https://camaya.net/download/gloox-$version.tar.bz2"
 desc="Rock-solid, full-featured Jabber/XMPP client library in C++"
 requires="gcc-libs libidn gnutls"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -15,7 +15,9 @@ build() {
   fixbuilddirpermissions
 
   applypatch $srcdir/gloox-musl.patch
+}
 
+build() {
   ./configure \
     --prefix="" \
     --enable-shared \

base/gmime/gmime.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/jstedfast/gmime/archive/refs/tags/2.6.23.tar.gz"
 desc="Library to parse and create messages in MIME format"
 requires="netbsd-curses libffi glib util-linux pcre gpgme"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static \

base/gmp/gmp.SMBuild

@@ -6,14 +6,16 @@ download="https://gmplib.org/download/gmp/gmp-$version.tar.lz"
 desc="GNU multiple precision arithmetic library"
 requires="gcc-libs"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --with-pic \

base/gnu-efi/gnu-efi.SMBuild

@@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/gnu-efi/files/gnu-efi-$version.tar.bz
 desc="library to develop applications using GNU toolchain and EFI dev environment"
 requires="libelf-compat"
 
-build() {
+prepbuilddir() {
   compileonlyfor x86_64
   mkandenterbuilddir
   rm -rf $app-$version
@@ -14,7 +14,9 @@ build() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make PREFIX="/" INSTALLROOT="$pkg" -j1 all install
 
   mkfinalpkg

base/gnupg2/gnupg2.SMBuild

@@ -6,14 +6,16 @@ download="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$version.tar.bz2"
 desc="The GNU Privacy Guard version 2.x"
 requires="bzip2 sqlite libassuan readline libksba libusb gnutls npth"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf gnupg-$version
 
   tar xf $srcdir/gnupg-$version.tar.?z*
   cd gnupg-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --sbindir=/bin 

base/gnutls/gnutls.SMBuild

@@ -6,14 +6,16 @@ download="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$version.tar.xz"
 desc="GNU TLS 1.0 and SSL 3.0 implementation"
 requires="gcc-libs zlib gmp libidn libtasn1 nettle openssl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="/" \
     --disable-openssl-compatibility \

base/gperf/gperf.SMBuild

@@ -6,14 +6,16 @@ download="http://ftp.gnu.org/pub/gnu/gperf/gperf-$version.tar.gz"
 desc="perfect hash function generator in C++"
 requires="gcc-libs"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" 
 

base/gpgme/gpgme.SMBuild

@@ -6,15 +6,18 @@ download="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-$version.tar.bz2"
 desc="C language library to easily add crypto to a program"
 requires="gcc-libs libassuan libgpg-error"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   # TODO: disable linking against qt5 
+  CXXFLAGS="$CXXFLAGS -mno-outline-atomics" \
   ./configure \
     --prefix="" \
     --disable-static \
@@ -30,4 +33,4 @@ build() {
 
 sha512sums="
 cf3e44b4f6ded9c486f37bafa3d059863a177f01d6e3a635abe90ce8af23a5f6ee86eee854c313e90c5506be9a78bee4e2ed3fa24faa887c8f8c19895613d0b1  gpgme-1.13.1.tar.lz
-"
+"

base/gptfdisk/gptfdisk.SMBuild

@@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$version/gptf
 desc="GPT fdisk utilities"
 requires="gcc-libs netbsd-curses popt util-linux"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   sed -i '/^#include /s|ncursesw/||' gptcurses.cc
   make
 
@@ -29,4 +31,4 @@ build() {
 
 sha512sums="
 2e0ff7321c8083073b08abc49d8d22b14384c3bd80ed8c02f59a6a1ca77ac75623fed6b7c4c476fb6d54cb7f68af4e1c7b0bdd7592760d913c4d52580e394b05  gptfdisk-1.0.5.tar.lz
-"
+"

base/grep/grep.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/grep/grep-$version.tar.xz"
 desc="print lines matching a pattern"
 requires="pcre"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   CFLAGS="$CFLAGS -static" \
   ./configure \
     --prefix="" \

base/groff/groff.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/groff/groff-$version.tar.gz"
 desc="GNU replacement for nroff and troff text formatters"
 requires="gcc-libs perl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --without-x

base/gsl/gsl.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gsl/gsl-$version.tar.gz"
 desc="Numerical library for C and C++ programmers written in ANSI C"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static

base/gstreamer/gstreamer.SMBuild

@@ -6,14 +6,16 @@ download="https://gstreamer.freedesktop.org/data/src/gstreamer/gstreamer-$versio
 desc="streaming multimedia framework"
 requires="glib pcre libffi zlib"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   mkdir -p smbuild && cd smbuild
 
   meson .. \

base/gyp/gyp.SMBuild

@@ -5,7 +5,7 @@ homepage="https://gyp.gsrc.io/"
 desc="Meta-Build system that generates other build systems"
 requires="python3"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version"_caa60026"
 
@@ -18,7 +18,9 @@ build() {
   applypatch $srcdir/gyp-python3.patch
   applypatch $srcdir/gyp-python38.patch
   applypatch $srcdir/gyp-python39.patch
+}
 
+build() {
   python3 setup.py install --prefix="" --root="$pkg"
 
   cp LICENSE $pkgdocs/

base/gzip/gzip.SMBuild

@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gzip/gzip-$version.tar.gz"
 desc="GNU file compression utility"
 requires="less"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" 
 
@@ -26,5 +28,5 @@ build() {
 }
 
 sha512sums="
-09b441299039479488700b7ef267ab7f71268af0d648d32cf6b1efcac58e59f1f352fa9d4f95278e96a76dc21239be1a5acab319bc85a7501cf5d8573c83d857  gzip-1.12.tar.gz
+9c3f061844413ee2d382608dd9019813f78edc72bd75ab53f58c757d60859f9139b3850ccf1ed191a739f80836e9a6bfe734ec59ddba991a3ff3b322ec7e356d  gzip-1.12.tar.lz
-"
+"

base/haveged/haveged.SMBuild

@@ -6,14 +6,16 @@ download="http://www.issihosts.com/haveged/haveged-$version.tar.gz"
 desc="Entropy daemon especially suited for low-powered devices"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \

base/hdparm/hdparm.SMBuild

@@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/hdparm/files/hdparm/hdparm-$version.t
 desc="Hard disk information utility"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make
   make install DESTDIR=$pkg mandir="/share/man" sbindir="/bin"
 

base/highlight/highlight.SMBuild

@@ -6,14 +6,16 @@ download="http://www.andre-simon.de/zip/highlight-$version.tar.bz2"
 desc="Universal syntax highlighter"
 requires="gcc-libs musl lua53 readline netbsd-curses"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make 
   make install PREFIX="/" DESTDIR=$pkg
 
@@ -24,4 +26,4 @@ build() {
 
 sha512sums="
 173f05bd89523a26f4e950c829b74b01128842e9dc92563a09a62d7d244dcf5b1787d127c0468512614588fa05b9a1bfa817c3a725946cf48a7661451a5a0dfe  highlight-4.0.tar.lz
-"
+"

base/htop/htop.SMBuild

@@ -1,23 +1,30 @@
 app=htop
 version=3.2.2
-build=1sml
+build=2sml
 homepage="https://htop.dev/"
 download="https://github.com/$app-dev/$app/archive/refs/tags/$version.tar.gz"
 desc="ncurses-based interactive process viewer written in C"
-requires="netbsd-curses"
+requires="netbsd-curses libcap lm-sensors"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
+
+# enabling unicode causes this error: 
+# Meter.c:415:54: error: 'cchar_t' {aka 'const struct <anonymous>'} has no member named 'attr'
   ./configure \
     --prefix="" \
     --bindir=/bin \
-    --disable-unicode
+    --disable-unicode \
+    --enable-sensors \
+    --enable-capabilities
 
   make
   make install DESTDIR=$pkg
@@ -28,5 +35,5 @@ build() {
 }
 
 sha512sums="
-59f3f06677076262e25a478552e4438ce37028e2f064d3fb78653d3213b48ae4d78c7e0d62ee785a4ed3c6c99b7faafd9afab94c4350a4e5c5843cef81aaf489  htop-3.2.2.tar.xz
+ffe7566c048d82d56e5cc57d96d8fd3fe78c8e7e04815690dfe8ebeb1197f3ebff31d76176c96b671b5d71c659dc305c2ac11137bf6c2013ce85dbdcdd7b53e8  htop-3.2.2.tar.lz
-"
+"

base/hunspell/hunspell.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/hunspell/hunspell/files/2573619/hunspell-$version.t
 desc="Spell checker based on OpenOffice.org myspell library"
 requires="gcc-libs"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static \

base/hyphen/hyphen.SMBuild

@@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/hunspell/files/Hyphen/2.8/hyphen-$ver
 desc="TeX hyphenation library"
 requires="perl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static 

base/i2c-tools/i2c-tools.SMBuild

@@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools/i2c-tools
 desc="Utilties to read and program data from I2C-protocol based sensors"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make
   make install PREFIX="/" mandir="/share/man" DESTDIR="$pkg" sbindir="/bin"
 

base/icu/icu.SMBuild

@@ -6,7 +6,7 @@ download="https://github.com/unicode-org/icu/releases/download/release-72-1/icu4
 desc="International Components for Unicode"
 requires="gcc-libs python3"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf "$app"
 
@@ -14,7 +14,9 @@ build() {
   tar xf $srcdir/icu4c-$sversion-src.tar.lz
   cd icu
   fixbuilddirpermissions
+}
 
+build() {
   cd source
   CFLAGS="$CFLAGS" \
   ./configure \
@@ -34,4 +36,4 @@ build() {
 
 sha512sums="
 2d4b77236520b97135d540da6a672795d45f3bf2b0b5cc924d178491761e1f16de6fa8ab5ab9726d2f81ba214c670f2ca2d2c44b59eccda6e9500f97b2b48b30  icu4c-72_1-src.tar.lz
-"
+"

base/id3lib/id3lib.SMBuild

@@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/id3lib/files/id3lib/$version/id3lib-$
 desc="ID3 tag manipulation library"
 requires="gcc-libs zlib"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -25,8 +25,9 @@ build() {
   aclocal
   autoconf
   automake --add-missing --copy
+}
 
-  # TODO: disable static libs generation
+build() {
   ./configure \
     --prefix="" \
     $builddist

base/ijs/ijs.SMBuild

@@ -6,14 +6,16 @@ download="https://www.openprinting.org/download/ijs/download/ijs-$version.tar.bz
 desc="print library for transmission of raster page images"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --mandir=/share/man \

base/iniparser/iniparser.SMBuild

@@ -6,14 +6,16 @@ download="https://github.com/ndevilla/iniparser/archive/refs/tags/v$version.tar.
 desc="Stand-alone ini file parsing library written in ANSI C"
 requires="musl"
    
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   make
   
   install -Dm 644 src/iniparser.h $pkg/include/iniparser.h
@@ -31,4 +33,4 @@ build() {
 
 sha512sums="
 19780c1bd520a867bf68cb2c156257fb45355b1677e3bc601fea64b5edb01f6b351ce9f6f68f0db56f962a7cc25a3c64008501d137c7c4fb2192ffacfeac595a  iniparser-4.1.tar.lz
-"
+"

base/initfs/initfs.SMBuild

@@ -7,10 +7,12 @@ desc="initfs - initial file system hierarchy creator"
 requires="musl"
 disablepkgsymlinks=1
 
-build() {
+prepbuilddir() {
   arch=noarch
   mkandenterbuilddir
+}
 
+build() {
   cd $pkg
   tar xf $srcdir/$app.tar.lz
 
@@ -26,4 +28,4 @@ build() {
 
 sha512sums="
 85da0195b5e58c2b01f6ab91ed7a15ebff783325b08c5ed10722e6576974c1cedf55767eb30ccf58f41fc6c88171810ee63a0d7c7d09eb925c0572802d7754de  initfs.tar.lz
-"
+"

base/initfs/initfs/etc/rc.d/rc.gtk.new

@@ -1,48 +1,64 @@
-#!/bin/sh
+#!/bin/bash
 # Thank you slackware
 
-if [ -x /bin/fc-cache ]; then
+waitfile="/tmp/updatinggtkfile"
- echo "Updating X font indexes..."
- /bin/fc-cache -f &
-fi
 
-if [ -x /bin/update-desktop-database ]; then
+if [[ -f $waitfile ]] ; then
-  echo "Updating .desktop files..."
-  /bin/update-desktop-database -q /share/applications >/dev/null 2>&1
-fi
 
-if find /share/icons -maxdepth 2 2> /dev/null | grep -q icon-theme.cache ; then
+  until [[ ! -f $waitfile ]] ; do
- for theme_dir in /share/icons/* ; do
+    echo "Waiting for previous GTK cache modules to finish updating"
-    echo "Updating icon-theme.cache in ${theme_dir}..."
+    sleep 2
-    /bin/gtk-update-icon-cache -t -f ${theme_dir} >/dev/null 2>&1
+  done
- done
-fi
 
-if [ -x /bin/update-mime-database ]; then
+else
- echo "Updating MIME database..."
- /bin/update-mime-database -n /share/mime >/dev/null 2>&1 &
-fi
 
-# Update immodules cache at /lib/gtk-2.0/2.10.0/immodules.cache
+  touch "$waitfile"
-if [ -x /bin/gtk-query-immodules-2.0 ]; then
- echo "Updating GTK2 Immodules..."
- /bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 &
-fi
 
-# Update immodules cache at /lib/gtk-3.0/3.0.0/immodules.cache
+  if [ -x /bin/fc-cache ]; then
-if [ -x /bin/gtk-query-immodules-3.0 ]; then
+    echo "Updating X font indexes..."
- echo "Updating GTK3 Immodules..."
+   /bin/fc-cache -f &
- /bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 &
+  fi
-fi
 
-if [ -x /bin/gdk-pixbuf-query-loaders ]; then
+  if [ -x /bin/update-desktop-database ]; then
- echo "Updating GDK Pixbuf loaders..."
+    echo "Updating .desktop files..."
- /bin/gdk-pixbuf-query-loaders --update-cache >/dev/null 2>&1 &
+    /bin/update-desktop-database -q /share/applications >/dev/null 2>&1
-fi
+  fi
 
-if [ -x /bin/glib-compile-schemas ]; then
+  if find /share/icons -maxdepth 2 2> /dev/null | grep -q icon-theme.cache ; then
- echo "Compiling GSettings XML scheme files..."
+    for theme_dir in /share/icons/* ; do
- /bin/glib-compile-schemas share/glib-2.0/schemas >/dev/null 2>&1 &
+      echo "Updating icon-theme.cache in ${theme_dir}..."
-fi
+      /bin/gtk-update-icon-cache -t -f ${theme_dir} >/dev/null 2>&1
+   done
+  fi
 
- exit 0
+  if [ -x /bin/update-mime-database ]; then
+    echo "Updating MIME database..."
+    /bin/update-mime-database -n /share/mime >/dev/null 2>&1 &
+  fi
+
+  # Update immodules cache at /lib/gtk-2.0/2.10.0/immodules.cache
+  if [ -x /bin/gtk-query-immodules-2.0 ]; then
+    echo "Updating GTK2 Immodules..."
+    /bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 &
+  fi
+
+  # Update immodules cache at /lib/gtk-3.0/3.0.0/immodules.cache
+  if [ -x /bin/gtk-query-immodules-3.0 ]; then
+    echo "Updating GTK3 Immodules..."
+    /bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 &
+  fi
+
+  if [ -x /bin/gdk-pixbuf-query-loaders ]; then
+    echo "Updating GDK Pixbuf loaders..."
+    /bin/gdk-pixbuf-query-loaders --update-cache >/dev/null 2>&1 &
+  fi
+
+  if [ -x /bin/glib-compile-schemas ]; then
+    echo "Compiling GSettings XML scheme files..."
+    /bin/glib-compile-schemas /share/glib-2.0/schemas >/dev/null 2>&1 &
+  fi
+  
+  rm -f "$waitfile"
+
+  exit 0
+fi

base/intltool/intltool.SMBuild

@@ -6,7 +6,7 @@ download="https://launchpad.net/intltool/trunk/$version/+download/intltool-$vers
 desc="Utilities for translation support"
 requires="perl-modules"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -15,7 +15,9 @@ build() {
   fixbuilddirpermissions
 
   applypatch $srcdir/intltool-regex-warning.patch
+}
 
+build() {
   ./configure \
     --prefix="" 
 
@@ -30,4 +32,4 @@ build() {
 sha512sums="
 508b0daa47fca109032336cf0211a6d2f38a867d7a9565d0b73fedb49090dbb0f92119a2c16499da63524fb29e454d6c7d2fab4fcef11417c7b139a0d1504cd0  intltool-0.51.0.tar.lz
 2ca20ba6ff0492cd7c816cca4c17bbf11281ae4c24bb4f70cfa92826ff2127036b8a07de5a61765becfd0ff506ca092e05ecd7a02b796ba92745459786e7ba03  intltool-regex-warning.patch
-"
+"