diff --git a/base/bash/bash.SMBuild b/base/bash/bash.SMBuild
index 46b2353..2d41a29 100755
--- a/base/bash/bash.SMBuild
+++ b/base/bash/bash.SMBuild
@@ -2,7 +2,7 @@ app=bash
 version=5.0
 build=1sml
 homepage="https://www.gnu.org/software/bash/bash.html"
-download="https://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz"
+download="https://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 requires="netbsd-curses"
 desc="GNU Bourne-Again SHell"
 
diff --git a/base/bison/bison.SMBuild b/base/bison/bison.SMBuild
index 1baec84..9c11cdf 100755
--- a/base/bison/bison.SMBuild
+++ b/base/bison/bison.SMBuild
@@ -25,5 +25,5 @@ build() {
 }
 
 sha512sums="
-cfc0fd081892dfde34f0f1d5530db02c6160fb9c9efdc7da774c9150848456b14877fcc5f67e384cb6b1a85d174dd9cfb55ce852739fd949304f880a854765fe  bison-3.1.tar.lz
-"
+dadc5e1ee532cfacb149c130131b66f36a0bcf724737870a0820bbf1508e1d2035c0e06dda94518a477c330ec7f56eb2fbde38f74155c741b23556eb0c3de42c  bison-3.1.tar.lz
+"
\ No newline at end of file
diff --git a/base/bubblewrap/bubblewrap.SMBuild b/base/bubblewrap/bubblewrap.SMBuild
index 5ee6f15..54c8556 100755
--- a/base/bubblewrap/bubblewrap.SMBuild
+++ b/base/bubblewrap/bubblewrap.SMBuild
@@ -18,8 +18,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --with-priv-mode=setuid \
     --disable-man
 
diff --git a/base/cpio/cpio.SMBuild b/base/cpio/cpio.SMBuild
index a53a5b3..110c89a 100755
--- a/base/cpio/cpio.SMBuild
+++ b/base/cpio/cpio.SMBuild
@@ -16,8 +16,7 @@ build() {
 
   CFLAGS="$CFLAGS -fcommon" \
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix="" 
 
   make
   make install DESTDIR=$pkg 
diff --git a/base/crda/crda.SMBuild b/base/crda/crda.SMBuild
index ff61661..8256cea 100755
--- a/base/crda/crda.SMBuild
+++ b/base/crda/crda.SMBuild
@@ -21,8 +21,8 @@ build() {
   # Disable -Werror, just in case
   sed -i 's@-Werror@@g' Makefile
 
-  make V=1 PREFIX="/" SBINDIR="/bin"
-  make install PREFIX="/" SBINDIR="/bin" DESTDIR=$pkg 
+  make PREFIX="/" SBINDIR="/bin"
+  make PREFIX="/" SBINDIR="/bin" install DESTDIR=$pkg 
 
   cp LICENSE $pkgdocs/
 
@@ -33,4 +33,4 @@ sha512sums="
 475eafeb4ae8e5320ae90bf84d17805b554ec108e2e3dc58630d61bd4fcfcd7ef0f5aea21358fdefdf220ce5360a622c8c05a8b98785c44141f8660747c494b7  crda-4.14.tar.lz
 c642976b193722c0050c13331a010b466cea8391bb5f945832604a556e274ea1a4b289c78f74ff5d502fae800f18219db3d10ff10c0528eefc5e9443a963640f  01-Makefile-dont-run-ldconfig.patch
 6ab136d1a8fe59a6e1d92d8e07d2074bad7c663162e03b00916bb26c382ef66876b61b0f11b86a5705cc493d666497fd96d94b9d3f469b4bdedc37acf391d5e1  crda-4.14-python-3.patch
-"
\ No newline at end of file
+"
diff --git a/base/db/db.SMBuild b/base/db/db.SMBuild
index c1636af..2a88638 100755
--- a/base/db/db.SMBuild
+++ b/base/db/db.SMBuild
@@ -1,6 +1,6 @@
 app=db
 version=6.2.23
-build=1sml
+build=2sml
 homepage="https://www.oracle.com/database/technologies/related/berkeleydb.html"
 download="http://download.oracle.com/berkeley-db/db-$version.tar.gz"
 desc="Berkeley embedded database library"
@@ -24,7 +24,6 @@ build() {
 
   cd build_unix
 
-  CFLAGS="$CFLAGS -D_GNU_SOURCE" \
   db_cv_clock_monotonic=yes \
   db_cv_build_sequence=yes \
   db_cv_mmap_extend=yes \
@@ -32,7 +31,6 @@ build() {
   ../dist/configure \
     --prefix="" \
     --libdir=/lib \
-    --sysconfdir=/etc \
     --enable-shared \
     --disable-static \
     --enable-dbm \
diff --git a/base/desktop-file-utils/desktop-file-utils.SMBuild b/base/desktop-file-utils/desktop-file-utils.SMBuild
index f427389..3348658 100755
--- a/base/desktop-file-utils/desktop-file-utils.SMBuild
+++ b/base/desktop-file-utils/desktop-file-utils.SMBuild
@@ -17,8 +17,7 @@ build() {
   applypatch $srcdir/desktop-file-utils.quiet.warnings.diff
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make 
   make install DESTDIR=$pkg
diff --git a/base/dialog/dialog.SMBuild b/base/dialog/dialog.SMBuild
index 16f27d1..a8c92ed 100755
--- a/base/dialog/dialog.SMBuild
+++ b/base/dialog/dialog.SMBuild
@@ -16,7 +16,6 @@ build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \
-    --sysconfdir=/etc \
     --disable-nls \
     --with-shared \
     --with-x 
diff --git a/base/dmidecode/dmidecode.SMBuild b/base/dmidecode/dmidecode.SMBuild
index d47d070..d0ec52f 100755
--- a/base/dmidecode/dmidecode.SMBuild
+++ b/base/dmidecode/dmidecode.SMBuild
@@ -15,7 +15,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  make V=s
+  make
   make install DESTDIR=$pkg prefix="" mandir="/share/man" sbindir="/bin"
 
   cp LICENSE $pkgdocs/
diff --git a/base/dosfstools/dosfstools.SMBuild b/base/dosfstools/dosfstools.SMBuild
index ad3217f..265b5f0 100755
--- a/base/dosfstools/dosfstools.SMBuild
+++ b/base/dosfstools/dosfstools.SMBuild
@@ -18,7 +18,7 @@ build() {
   ./configure \
     --prefix="" \
     --sbindir=/bin \
-    --enable-compat-symlinks 
+    --enable-compat-symlinks
 
   make
   make install DESTDIR=$pkg
diff --git a/base/enchant/enchant.SMBuild b/base/enchant/enchant.SMBuild
index b962754..38fc0f3 100755
--- a/base/enchant/enchant.SMBuild
+++ b/base/enchant/enchant.SMBuild
@@ -1,6 +1,6 @@
 app=enchant
 version=2.2.8
-build=1sml
+build=2sml
 homepage="https://abiword.github.io/enchant/"
 download="https://github.com/AbiWord/$version/releases/download/v$version/enchant-$version.tar.gz"
 desc="spell checking library"
@@ -18,8 +18,6 @@ build() {
     --prefix="" \
     --disable-static 
 
-  # Taken from arch linux's enchant PKGBUILD
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool 
   make
   make install DESTDIR=$pkg
 
diff --git a/base/eudev/eudev.SMBuild b/base/eudev/eudev.SMBuild
index c144b75..e13094c 100755
--- a/base/eudev/eudev.SMBuild
+++ b/base/eudev/eudev.SMBuild
@@ -5,6 +5,7 @@ homepage="https://wiki.gentoo.org/wiki/Eudev"
 download="http://sources.buildroot.net/eudev/eudev-$version.tar.gz"
 desc="Independent fork of udev dynamic device manager by Gentoo devs"
 requires="util-linux"
+preservestaticlibs=1
 
 build() {
   mkandenterbuilddir
@@ -34,4 +35,4 @@ build() {
 
 sha512sums="
 b54dac70e4a683b4fb0281f9147e1cc2faa8bd7b06ee0929a562db223b21da48ddd13889062595b19421bcdb54de23ee38aa8ff1e2d7fed9f673bc82434a3a8d  eudev-3.2.11.tar.lz
-"
\ No newline at end of file
+"
diff --git a/base/exiv2/exiv2.SMBuild b/base/exiv2/exiv2.SMBuild
index 21df7c9..279c37d 100755
--- a/base/exiv2/exiv2.SMBuild
+++ b/base/exiv2/exiv2.SMBuild
@@ -27,7 +27,7 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  cp COPYING* doc/{COPYING-XMPSDK,README-XMP} $pkgdocs/
+  cp COPYING* doc/COPYING-XMPSDK $pkgdocs/
 
   mkfinalpkg
 }
diff --git a/base/flex/flex.SMBuild b/base/flex/flex.SMBuild
index a172bf4..456204c 100755
--- a/base/flex/flex.SMBuild
+++ b/base/flex/flex.SMBuild
@@ -18,7 +18,7 @@ build() {
 
   printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in
 
-  CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" \
+  CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \
   ./configure \
     --prefix="" \
     --disable-nls \
diff --git a/base/gdb/001-gdb-pr14523-mips-signal-number.patch b/base/gdb/001-gdb-pr14523-mips-signal-number.patch
deleted file mode 100644
index f78c7ed..0000000
--- a/base/gdb/001-gdb-pr14523-mips-signal-number.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-See http://sourceware.org/bugzilla/show_bug.cgi?id=14523
-
---- a/gdb/common/signals.c
-+++ b/gdb/common/signals.c
-@@ -348,6 +348,11 @@ gdb_signal_from_host (int hostsig)
-       else if (64 <= hostsig && hostsig <= 127)
- 	return (enum gdb_signal)
- 	  (hostsig - 64 + (int) GDB_SIGNAL_REALTIME_64);
-+      else if (hostsig == 128)
-+	/* Some platforms, such as Linux MIPS, have NSIG == 128, in which case
-+	   signal 128 is the highest realtime signal. There is no constant for
-+	   that though. */
-+	return GDB_SIGNAL_UNKNOWN;
-       else
- 	error (_("GDB bug: target.c (gdb_signal_from_host): "
- 	       "unrecognized real-time signal"));
diff --git a/base/gdb/010-aarch64-headers.patch b/base/gdb/010-aarch64-headers.patch
deleted file mode 100644
index 8f05738..0000000
--- a/base/gdb/010-aarch64-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-The signal definitions of musl and gdb collide
-
-The kernel defines "struct sigcontext" in asm/sigcontext.h and musl libc 
-defines it in signal.h which collides. 
-Kernel 4.14 misses the definitions of struct user_sve_header so we still 
-have to use the aarch64-sve-linux-sigcontext.h header file which also 
-provides that and make sure aarch64-sve-linux-sigcontext.h does not 
-provide the same headers as the kernel or musl.
-
---- a/gdb/nat/aarch64-sve-linux-ptrace.h
-+++ b/gdb/nat/aarch64-sve-linux-ptrace.h
-@@ -25,7 +25,7 @@
- #include <sys/ptrace.h>
- #include <asm/ptrace.h>
- 
--#ifndef SVE_SIG_ZREGS_SIZE
-+#ifndef SVE_PT_REGS_SVE
- #include "aarch64-sve-linux-sigcontext.h"
- #endif
- 
---- a/gdb/nat/aarch64-sve-linux-sigcontext.h
-+++ b/gdb/nat/aarch64-sve-linux-sigcontext.h
-@@ -19,6 +19,7 @@
- #ifndef NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H
- #define NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H
- 
-+#ifndef SVE_MAGIC
- #define SVE_MAGIC	0x53564501
- 
- struct sve_context {
-@@ -128,6 +129,7 @@ struct sve_context {
- 	(SVE_SIG_FFR_OFFSET(vq) + SVE_SIG_FFR_SIZE(vq) - SVE_SIG_REGS_OFFSET)
- 
- #define SVE_SIG_CONTEXT_SIZE(vq) (SVE_SIG_REGS_OFFSET + SVE_SIG_REGS_SIZE(vq))
-+#endif
- 
- /* SVE/FP/SIMD state (NT_ARM_SVE) */
- 
diff --git a/base/gdb/100-musl_fix.patch b/base/gdb/100-musl_fix.patch
deleted file mode 100644
index 8ba6d46..0000000
--- a/base/gdb/100-musl_fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -17,6 +17,7 @@
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
-+#include "stopcode.h"
- #include "defs.h"
- #include "inferior.h"
- #include "infrun.h"
-@@ -72,6 +73,10 @@
- #define SPUFS_MAGIC 0x23c9b64e
- #endif
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
---- /dev/null
-+++ b/gdb/stopcode.h
-@@ -0,0 +1,4 @@
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
---- a/gdb/nat/ppc-linux.h
-+++ b/gdb/nat/ppc-linux.h
-@@ -18,7 +18,10 @@
- #ifndef NAT_PPC_LINUX_H
- #define NAT_PPC_LINUX_H
- 
-+#define pt_regs __pt_regs
- #include <asm/ptrace.h>
-+#undef pt_regs
-+
- #include <asm/cputable.h>
- 
- /* This sometimes isn't defined.  */
---- a/gdb/gdbserver/linux-ppc-low.c
-+++ b/gdb/gdbserver/linux-ppc-low.c
-@@ -23,7 +23,9 @@
- #include "elf/common.h"
- #include <sys/uio.h>
- #include <elf.h>
-+#define pt_regs __pt_regs
- #include <asm/ptrace.h>
-+#undef pt_regs
- 
- #include "arch/ppc-linux-common.h"
- #include "arch/ppc-linux-tdesc.h"
diff --git a/base/gdb/110-shared_libgcc.patch b/base/gdb/110-shared_libgcc.patch
deleted file mode 100644
index f07ac8c..0000000
--- a/base/gdb/110-shared_libgcc.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1283,13 +1283,13 @@ if test -z "$LD"; then
-   fi
- fi
- 
--# Check whether -static-libstdc++ -static-libgcc is supported.
-+# Check whether -static-libstdc++ is supported.
- have_static_libs=no
- if test "$GCC" = yes; then
-   saved_LDFLAGS="$LDFLAGS"
- 
--  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
--  AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
-+  LDFLAGS="$LDFLAGS -static-libstdc++"
-+  AC_MSG_CHECKING([whether g++ accepts -static-libstdc++])
-   AC_LANG_PUSH(C++)
-   AC_LINK_IFELSE([AC_LANG_SOURCE([
- #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
-@@ -1629,7 +1629,7 @@ AC_ARG_WITH(stage1-ldflags,
-  # trust that they are doing what they want.
-  if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
-      -a "$have_static_libs" = yes; then
--   stage1_ldflags="-static-libstdc++ -static-libgcc"
-+   stage1_ldflags="-static-libstdc++"
-  fi])
- AC_SUBST(stage1_ldflags)
- 
-@@ -1658,7 +1658,7 @@ AC_ARG_WITH(boot-ldflags,
-  # statically.  But if the user explicitly specified the libraries to
-  # use, trust that they are doing what they want.
-  if test "$poststage1_libs" = ""; then
--   poststage1_ldflags="-static-libstdc++ -static-libgcc"
-+   poststage1_ldflags="-static-libstdc++"
-  fi])
- AC_SUBST(poststage1_ldflags)
- 
---- a/configure
-+++ b/configure
-@@ -5053,14 +5053,14 @@ if test -z "$LD"; then
-   fi
- fi
- 
--# Check whether -static-libstdc++ -static-libgcc is supported.
-+# Check whether -static-libstdc++ is supported.
- have_static_libs=no
- if test "$GCC" = yes; then
-   saved_LDFLAGS="$LDFLAGS"
- 
--  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
--$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
-+  LDFLAGS="$LDFLAGS -static-libstdc++"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++" >&5
-+$as_echo_n "checking whether g++ accepts -static-libstdc++... " >&6; }
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5861,7 +5861,7 @@ else
-  # trust that they are doing what they want.
-  if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
-      -a "$have_static_libs" = yes; then
--   stage1_ldflags="-static-libstdc++ -static-libgcc"
-+   stage1_ldflags="-static-libstdc++"
-  fi
- fi
- 
-@@ -5897,7 +5897,7 @@ else
-  # statically.  But if the user explicitly specified the libraries to
-  # use, trust that they are doing what they want.
-  if test "$poststage1_libs" = ""; then
--   poststage1_ldflags="-static-libstdc++ -static-libgcc"
-+   poststage1_ldflags="-static-libstdc++"
-  fi
- fi
- 
diff --git a/base/gdb/120-sigprocmask-invalid-call.patch b/base/gdb/120-sigprocmask-invalid-call.patch
deleted file mode 100644
index 7cb050c..0000000
--- a/base/gdb/120-sigprocmask-invalid-call.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 56893a61aa4f0270fa8d1197b9848247f90fce0d Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Date: Fri, 24 Mar 2017 10:36:03 +0800
-Subject: [PATCH] Fix invalid sigprocmask call
-
-The POSIX document says
-
-    The pthread_sigmask() and sigprocmask() functions shall fail if:
-
-    [EINVAL]
-    The value of the how argument is not equal to one of the defined values.
-
-and this is how musl-libc is currently doing.  Fix the call to be safe
-and correct
-
- [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_sigmask.html
-
-gdb/ChangeLog:
-2017-03-24  Yousong Zhou  <yszhou4tech@gmail.com>
-
-    * common/signals-state-save-restore.c (save_original_signals_state):
-    Fix invalid sigprocmask call.
----
- gdb/ChangeLog                           | 5 +++++
- gdb/common/signals-state-save-restore.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
---- a/gdb/common/signals-state-save-restore.c
-+++ b/gdb/common/signals-state-save-restore.c
-@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet)
-   int i;
-   int res;
- 
--  res = sigprocmask (0,  NULL, &original_signal_mask);
-+  res = sigprocmask (SIG_BLOCK,  NULL, &original_signal_mask);
-   if (res == -1)
-     perror_with_name (("sigprocmask"));
- 
diff --git a/base/gdb/130-uclibc-fix.patch b/base/gdb/130-uclibc-fix.patch
deleted file mode 100644
index 4925e66..0000000
--- a/base/gdb/130-uclibc-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gdb/dwarf-index-write.c
-+++ b/gdb/dwarf-index-write.c
-@@ -701,7 +701,7 @@ public:
-     gdb_assert (m_abbrev_table.empty ());
-     const size_t name_count = m_name_to_value_set.size ();
-     m_bucket_table.resize
--      (std::pow (2, std::ceil (std::log2 (name_count * 4 / 3))));
-+      (std::pow (2, std::ceil (log2 (name_count * 4 / 3))));
-     m_hash_table.reserve (name_count);
-     m_name_table_string_offs.reserve (name_count);
-     m_name_table_entry_offs.reserve (name_count);
diff --git a/base/gdb/gdb.SMBuild b/base/gdb/gdb.SMBuild
index 94cea89..0604256 100755
--- a/base/gdb/gdb.SMBuild
+++ b/base/gdb/gdb.SMBuild
@@ -1,6 +1,6 @@
 app=gdb
-version=8.3.1
-build=2sml
+version=12.1
+build=1sml
 homepage="https://www.gnu.org/software/gdb/"
 download="https://ftp.gnu.org/gnu/gdb/gdb-$version.tar.xz"
 desc="GNU symbolic debugger"
@@ -15,15 +15,9 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  applypatch $srcdir/100-musl_fix.patch
-  applypatch $srcdir/110-shared_libgcc.patch
-  applypatch $srcdir/120-sigprocmask-invalid-call.patch
-  applypatch $srcdir/130-uclibc-fix.patch
-
   ./configure \
     --prefix="" \
     --disable-werror \
-    --with-system-readline \
     --with-system-zlib \
     --disable-sim 
 
@@ -36,11 +30,5 @@ build() {
 }
 
 sha512sums="
-a0043a519b6ba5e4cfd04cdeaf62f37e816c28c9b7772f8e3fd6896ea35aa69e67a3e5721c8bcf285a6388314fc024fb816de113c9321ad220c1a7168f747fa2  gdb-8.3.1.tar.lz
-8f266317da5ac6c0288d5254d836fb2166b78ba98714de011977a2546e1b695d28b1f5114c3faddedc113b729aac8ef0b5cafd651a5de53322be42f22e8b696f  001-gdb-pr14523-mips-signal-number.patch
-a47debfd5285d9d2cbea42be9ca856c0ee44fa14b1e8a6c590908d5939c932d0f1898888ac337a27f57a49e01a884d0258c155425c0c64d9483879bc35295eda  010-aarch64-headers.patch
-6b881ab5ba9807c967b74b5fc049412c1fa281926d433ee32ed04ccb205f41e94983af5242cbe04ba5a922aa38af23bd48fc4670cc2d6bf79c2cd89912d39967  100-musl_fix.patch
-394f215e929bc2ea936276f8084cfb686c8d3f67cfee76ba62857a1b909a0ddf2a722dcdee2c695da0bd43e09e508db08f8eaad040062dc37364170bcfe38c16  110-shared_libgcc.patch
-3aa7ff65e2d8440d2dff50fe3e8ffe7dc46f5f84c74104b99a0de52d081ecaccfaa2ffae41505103820e7da3618724fb4e9bd3a3030ab5dd406a726201f5dcaa  120-sigprocmask-invalid-call.patch
-ce5e845697618c9219b7461830e9a77c95130613199911eda14ee2ce0be3bbf1154b72a73807f3614041e5ee1e6570ffb33ffc71556059f45018267f2ab9476b  130-uclibc-fix.patch
+96aad47b58195812057959de5e09bc3e2d3321f4f1e2fe1495a06178223f2f85c55b4bad28d315bc859dee7cd54841f34b04d0a33fcf29835cbf75be75470f09  gdb-12.1.tar.lz
 "
diff --git a/base/gettext/gettext.SMBuild b/base/gettext/gettext.SMBuild
index aaee6b5..d1ec3a7 100755
--- a/base/gettext/gettext.SMBuild
+++ b/base/gettext/gettext.SMBuild
@@ -18,7 +18,7 @@ build() {
     --prefix="" \
     --disable-static
 
-  make $MAKEFLAGS
+  make
   make install DESTDIR=$pkg 
 
   cp COPYING $pkgdocs/
diff --git a/base/libxml2/libxml2.SMBuild b/base/libxml2/libxml2.SMBuild
index 4113326..d2b05a6 100755
--- a/base/libxml2/libxml2.SMBuild
+++ b/base/libxml2/libxml2.SMBuild
@@ -25,12 +25,10 @@ build() {
     --disable-silent-rules \
     --with-python=/bin/python3
 
-  #sed -i 's@-L -L@@g' python/Makefile
-
   make
   make install DESTDIR=$pkg
 
-  cp Copyright $pkgdocs/
+  cp Copyright $pkgdocs/LICENSE
 
   mkfinalpkg
 }
diff --git a/base/netbsd-curses/netbsd-curses.SMBuild b/base/netbsd-curses/netbsd-curses.SMBuild
index 1887f6c..c44bada 100755
--- a/base/netbsd-curses/netbsd-curses.SMBuild
+++ b/base/netbsd-curses/netbsd-curses.SMBuild
@@ -5,6 +5,7 @@ homepage="http://ftp.barfooze.de/pub/sabotage/tarballs/"
 download="https://ftp.barfooze.de/pub/sabotage/tarballs/netbsd-curses-$version.tar.xz"
 desc="drop-in replacement for the bloated ncurses library with wide character support"
 requires="gcc-libs"
+preservestaticlibs=1
 
 build() {
   mkandenterbuilddir
@@ -19,6 +20,7 @@ CC=gcc
 HOSTCC=gcc
 AR=ar
 RANLIB=ranlib
+CFLAGS=$CFLAGS
 PREFIX=""
 DESTDIR=$pkg
 EOF
diff --git a/base/tar/tar-1.13.bzip2.diff b/base/tar/tar-1.13.bzip2.diff
deleted file mode 100644
index 85c0336..0000000
--- a/base/tar/tar-1.13.bzip2.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./src/tar.c.orig	Wed Jul  7 00:49:50 1999
-+++ ./src/tar.c	Fri Jul 30 23:00:13 1999
-@@ -16,6 +16,8 @@
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
- 
-+/* Patched to integrate bzip2 as compression filter (option -j)  */
-+
- #include "system.h"
- 
- #include <getopt.h>
-@@ -164,6 +166,8 @@
-   {"block-number", no_argument, NULL, 'R'},
-   {"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR},
-   {"blocking-factor", required_argument, NULL, 'b'},
-+  {"bzip2", required_argument, NULL, 'j'},
-+  {"bunzip2", required_argument, NULL, 'j'},
-   {"catenate", no_argument, NULL, 'A'},
-   {"checkpoint", no_argument, &checkpoint_option, 1},
-   {"compare", no_argument, NULL, 'd'},
-@@ -340,6 +344,7 @@
-               PATTERN                at list/extract time, a globbing PATTERN\n\
-   -o, --old-archive, --portability   write a V7 format archive\n\
-       --posix                        write a POSIX conformant archive\n\
-+  -j, --bzip2, --bunzip2             filter the archive through bzip2\n\
-   -z, --gzip, --ungzip               filter the archive through gzip\n\
-   -Z, --compress, --uncompress       filter the archive through compress\n\
-       --use-compress-program=PROG    filter through PROG (must accept -d)\n"),
-@@ -416,7 +421,7 @@
-    Y  per-block gzip compression */
- 
- #define OPTION_STRING \
--  "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
-+  "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxz"
- 
- static void
- set_subcommand_option (enum subcommand subcommand)
-@@ -787,6 +792,10 @@
- 	if (add_exclude_file (excluded, optarg, '\n') != 0)
- 	  FATAL_ERROR ((0, errno, "%s", optarg));
- 	break;
-+
-+      case 'j':
-+        set_use_compress_program_option ("bzip2");
-+        break;
- 
-       case 'z':
- 	set_use_compress_program_option ("gzip");
diff --git a/base/tar/tar.SMBuild b/base/tar/tar.SMBuild
index ff61794..1366a29 100755
--- a/base/tar/tar.SMBuild
+++ b/base/tar/tar.SMBuild
@@ -1,33 +1,15 @@
 app=tar
-version=1.29
+version=1.34
 build=1sml
 homepage="https://www.gnu.org/software/tar/"
 download="https://ftp.gnu.org/gnu/tar/tar-$version.tar.xz"
 desc="GNU archiving utility"
-requires="bzip2 gzip xz attr acl"
+requires="bzip2 gzip xz attr acl lzip plzip"
 
 build() {
   mkandenterbuilddir
-
-  rm -rf tar-1.13
-  tar xf $srcdir/tar-1.13.tar.?z
-
-  cd tar-1.13
-  applypatch $srcdir/tar-1.13.bzip2.diff
-  cp -p --verbose /usr/share/libtool/build-aux/config.{guess,sub} .
-  fixbuilddirpermissions
-
-  CFLAGS="-static" \
-  ./configure \
-    --prefix="" \
-    --libexecdir=/lib \
-    --disable-nls
-
-  make CFLAGS="-static" V=s
-  install -Dm 755 src/tar $pkg/bin/tar-1.13
-  # that's it as far as 1.13 is concerned.
-
   tar xf $srcdir/$app-$version.tar.?z*
+
   cd $app-$version
   fixbuilddirpermissions
 
@@ -35,24 +17,21 @@ build() {
   applypatch $srcdir/tar.nolonezero.diff
 
   FORCE_UNSAFE_CONFIGURE=1 \
-  CFLAGS="-static" \
+  CFLAGS="$CFLAGS -static" \
   ./configure \
     --prefix="" \
     --sbindir=/bin \
     --libexecdir=/lib \
     --enable-backup-scripts 
 
-  make CFLAGS="-static"
+  make
   make install DESTDIR=$pkg
 
-  cp ABOUT-NLS AUTHORS COPYING README THANKS TODO $pkgdocs/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
 sha512sums="
-7c0f2dfb7708bd5fe7cc5b841f68cc4cc077b14200df337f1847ecc41dcafae3b8f3dd210b78bf0ebc3d3408444283f71705ba34b1c9153d93dc631e80da6f07  tar-1.13.tar.lz
-f14a0f20dc514dda887299b9ecad3fd8482f39e6abb9238a5dff819a5600a7e424df642e38a6d17b57e34c5655eb0d50137a6b0857c429e353fc72cbb3546beb  tar-1.29.tar.lz
-5e12ae7f99a3bc73cd9a57d5451b534cc02da98aee46a7d6073eac492070f94e55b266e2cadcfcff4f5e2048ead683dd796b92f689d8f8ee56bc5f34ff186cde  tar-1.13.bzip2.diff
 90b764cd2128d6c316a0cd9e24ae734ee94b1e2794e6cf724e60592d23ca6dac2d9a44552054610747cadd733263ee56971062f4201227bfda93966f287984bd  tar.nolonezero.diff
 "