diff --git a/gtk/cairomm/cairomm.SMBuild b/gtk/cairomm/cairomm.SMBuild
deleted file mode 100755
index 5888ce9..0000000
--- a/gtk/cairomm/cairomm.SMBuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=cairomm
-version=1.13.1
-build=1sml
-homepage="http://cairographics.org/cairomm/"
-download="https://cairographics.org/releases/cairomm-$version.tar.gz"
-desc="C++ bindings for Cairo"
-requires="cairo libsigcpp"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --disable-documentation
-
-  #for i in tests docs examples ; do
-  # printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile
-  #done
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-f3002d35e29bb06d04600127de42718eaa37e1352c97c6516efbec5d43b9f36767d61c4cd460e3926245d20f2071f604c46543662e68bf198c3de70e09c14c85  cairomm-1.13.1.tar.lz
-"
diff --git a/gtk/dconf-editor/dconf-editor.SMBuild b/gtk/dconf-editor/dconf-editor.SMBuild
deleted file mode 100755
index 5927424..0000000
--- a/gtk/dconf-editor/dconf-editor.SMBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=dconf-editor
-version=3.18.2
-build=1sml
-homepage="https://wiki.gnome.org/Projects/dconf"
-download="https://gitlab.gnome.org/GNOME/dconf-editor/-/archive/$version/dconf-editor-$version.tar.bz2"
-desc="Graphical editor for dconf written in GTK3"
-requires="graphite2 gtk3"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" 
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-c8a7c8f073bf1097dc6c74c4f8ee0371f40b8f241ed1faede521829c67f479f7636f80e0d46cd4155388da91bb4a9b57cd20532e8cfad92a7503fa2cdf21cbb0  dconf-editor-3.18.2.tar.lz
-"
diff --git a/gtk/dconf-editor/doinst.sh b/gtk/dconf-editor/doinst.sh
deleted file mode 100644
index b2fe964..0000000
--- a/gtk/dconf-editor/doinst.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Reload messagebus service
-if [ -x /etc/rc.d/rc.messagebus ]; then
-  sh /etc/rc.d/rc.messagebus reload
-fi
-
-[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk 
diff --git a/gtk/fltk/fltk.SMBuild b/gtk/fltk/fltk.SMBuild
deleted file mode 100755
index b65ebf3..0000000
--- a/gtk/fltk/fltk.SMBuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=fltk
-version=1.3.4
-build=1sml
-homepage="https://www.fltk.org/"
-download="https://www.fltk.org/pub/fltk/$version/fltk-$version-2-source.tar.bz2"
-desc="Graphical user interface toolkit for X"
-requires="gcc-libs desktop-file-utils libjpeg-turbo libxcursor libxext fontconfig libxinerama glu shared-mime-info cairo"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf "$app-$version-2"
-
-  tar xf $srcdir/$app-$version-2-source.tar.?z*
-  cd "$app-$version-2"
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --enable-shared \
-    --enable-gl \
-    --enable-largefile \
-    --enable-threads \
-    --enable-xinerama \
-    --enable-xft \
-    --enable-xdbe 
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-dabff7a1adea31a16b858f5d4360719099e70470b3acebd3e4b26f189bffae0d2f4ec910dab262deec3cef4dc652be435ebcb7ee9a9dca518780d9140a9f4ce6  fltk-1.3.4-2-source.tar.lz
-"
diff --git a/gtk/gcr/gcr.SMBuild b/gtk/gcr/gcr.SMBuild
deleted file mode 100755
index 2fe5fdf..0000000
--- a/gtk/gcr/gcr.SMBuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=gcr
-version=3.16.0
-build=1sml
-homepage="https://gitlab.gnome.org/GNOME/gcr"
-download="https://gitlab.gnome.org/GNOME/gcr/-/archive/$version/gcr-$version.tar.bz2"
-desc="A library for bits of crypto UI and parsing"
-requires="gtk3"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --disable-schemas-compile \
-    --disable-update-mime \
-    --disable-update-icon-cache \
-    --disable-vala \
-    --disable-debug 
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-ea8a31c641d2bac14fb923cc726b4d49ca969f58948a4c598b48e99fc5c1eeb17fc458c3d843bcdb3db3f8668ce2cdab760fec34551e00d50cfc02d9c5d43580  gcr-3.16.0.tar.lz
-"
diff --git a/gtk/glibmm/glibmm.SMBuild b/gtk/glibmm/glibmm.SMBuild
deleted file mode 100755
index f47bdca..0000000
--- a/gtk/glibmm/glibmm.SMBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=glibmm
-version=2.58.0
-build=1sml
-homepage="http://www.gtkmm.org"
-download="https://download.gnome.org/sources/glibmm/2.58/glibmm-$version.tar.xz"
-desc="C++ bindings for GLib"
-requires="perl-modules glib-networking libsigcpp"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" 
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING* $pkgdocs
-
-  mkfinalpkg
-}
-
-sha512sums="
-020da0a90668cc9145a0a546e5e0824c1a12881ff1dd0a53c83c035ce1788d1588e7592fb0fa24147c3afe88e07bb2e7b0ccd490fe224b58d66a9609bf8343b2  glibmm-2.58.0.tar.lz
-"
diff --git a/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild b/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild
deleted file mode 100755
index 2cd3dd6..0000000
--- a/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=gst-plugins-bad
-version=1.16.2
-build=1sml
-homepage="https://gstreamer.freedesktop.org/"
-download="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-$version.tar.xz"
-desc="Multimedia graph framework containing restricted plugins"
-requires="alsa-lib libpng libjpeg-turbo libtheora opus glu pango gtk3 gst-plugins-base"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  mkdir -p smbuild && cd smbuild
-  meson .. \
-    --prefix="/" \
-    -Dbuildtype=plain \
-    -Dintrospection=disabled
-
-  ninja
-  DESTDIR="$pkg" ninja install
-
-  cp ../COPYING* $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-9d3f0399c976d29a7ec07fd6a709db5d05aa05e562183db7aa9c6704880ecfecf0aa396e3ab0b5f0f0643cd1154d6c05c414694ee9dba811519f45a5f2baf0af  gst-plugins-bad-1.16.2.tar.lz
-"
diff --git a/gtk/gst-plugins-base/gst-plugins-base.SMBuild b/gtk/gst-plugins-base/gst-plugins-base.SMBuild
deleted file mode 100755
index 77023e1..0000000
--- a/gtk/gst-plugins-base/gst-plugins-base.SMBuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=gst-plugins-base
-version=1.16.2
-build=1sml
-homepage="https://gstreamer.freedesktop.org/"
-download="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$version.tar.xz"
-desc="Multimedia graph framework containing base plugins"
-requires="alsa-lib libpng libjpeg-turbo libtheora opus gstreamer glu pango gtk3"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  mkdir -p smbuild && cd smbuild
-  meson .. \
-    --prefix="/" \
-    --buildtype=plain \
-    -Dalsa=enabled \
-    -Dintrospection=disabled 
-
-  if [ "$arch" = "aarch64" ]; then
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/577
-    sed -i 's@GST_GL_HAVE_DMABUF 1@GST_GL_HAVE_DMABUF 0@g' gst-libs/gst/gl/gstglconfig.h
-    sed -i 's@GST_GL_HAVE_EGLUINT64KHR 1@GST_GL_HAVE_EGLUINT64KHR 0@g' gst-libs/gst/gl/gstglconfig.h
-  fi
-
-  ninja
-  DESTDIR="$pkg" ninja install
-
-  cp ../COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-144d42f2f8415645f19da23e0a2f6dc359569242d929463cb4fb982ad1f27c721391445815a99ed61a9ab0324b2e024c7c31492a955a210e4a0303711d496b7e  gst-plugins-base-1.16.2.tar.lz
-"
diff --git a/gtk/gst-plugins-good/gst-plugins-good.SMBuild b/gtk/gst-plugins-good/gst-plugins-good.SMBuild
deleted file mode 100755
index f330b17..0000000
--- a/gtk/gst-plugins-good/gst-plugins-good.SMBuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=gst-plugins-good
-version=1.16.2
-build=1sml
-homepage="https://gstreamer.freedesktop.org/"
-download="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$version.tar.xz"
-desc="Multimedia graph framework containing good plugins"
-requires="alsa-lib libpng libjpeg-turbo libtheora opus glu pango gtk3 gst-plugins-base"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  mkdir -p smbuild && cd smbuild
-  meson .. \
-    --prefix="/" \
-    -Dbuildtype=plain
-
-  ninja
-  DESTDIR="$pkg" ninja install
-
-  cp ../COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-70621b774e399405430ecba79734397161e5196f255f6d4a4abb3bdfc2e2aef9376e43d0fdc35316ee306ebb59e46c727d084a3a0f2bc0ad2e26a721463e46d5  gst-plugins-good-1.16.2.tar.lz
-"
diff --git a/gtk/gtkmm2/gtkmm2.SMBuild b/gtk/gtkmm2/gtkmm2.SMBuild
deleted file mode 100755
index 3ca25b9..0000000
--- a/gtk/gtkmm2/gtkmm2.SMBuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=gtkmm2
-version=2.24.5
-build=1sml
-homepage="http://www.gtkmm.org/"
-download="https://download.gnome.org/sources/gtkmm/2.24/gtkmm-$version.tar.xz"
-desc="C++ bindings for GTK+ 2"
-requires="gtk2 atkmm pangomm"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf gtkmm-$version
-
-  tar xf $srcdir/gtkmm-$version.tar.?z
-  cd gtkmm-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" 
-
-  for i in docs tests demos ; do
-   printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile
-  done
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING* $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-5609d8aad7d8728eff28368aa016b7284b0440509dafb580c54a4afbf72acbe4c1ccc6633b54c9fc3a20fafcdddadf58b3b2a6da14da8150d120311bc1f1d405  gtkmm-2.24.5.tar.lz
-"
diff --git a/gtk/gtkmm3/gtkmm3.SMBuild b/gtk/gtkmm3/gtkmm3.SMBuild
deleted file mode 100755
index fbe5fe7..0000000
--- a/gtk/gtkmm3/gtkmm3.SMBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=gtkmm3
-version=3.18.1
-build=1sml
-homepage="https://www.gtkmm.org"
-download="https://download.gnome.org/sources/gtkmm/3.18/gtkmm-$version.tar.xz"
-desc="C++ bindings for GTK+ 3"
-requires="gtk3 atkmm pangomm"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf gtkmm-$version
-
-  tar xf $srcdir/gtkmm-$version.tar.?z*
-  cd gtkmm-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" 
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-cc28863e2b8bb57216578db1f6721bef35c84f94d81a3132e71bf5b608a0d2ea745e32099dde7039676ab89508660f6edc1b798d9c776a7267b97e0e42463755  gtkmm-3.18.1.tar.lz
-"
diff --git a/gtk/gtksourceview/gtksourceview.SMBuild b/gtk/gtksourceview/gtksourceview.SMBuild
deleted file mode 100755
index 6fd8c18..0000000
--- a/gtk/gtksourceview/gtksourceview.SMBuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=gtksourceview
-version=3.24.11
-build=1sml
-homepage="http://projects.gnome.org/gtksourceview/"
-download="https://gitlab.gnome.org/GNOME/gtksourceview/-/archive/$version/gtksourceview-$version.tar.bz2"
-desc="A text widget adding syntax highlighting and more to GNOME"
-requires="libxml2 vala gobject-introspection gtk3"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --disable-gtk-doc \
-    --disable-gtk-doc-html \
-    --disable-gtk-doc-pdf 
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-f680e94d8f25356703706f2a7f63afdc9ccea374a137d18df4e9a16c0658431ce357a51311b8740f9263353dea4591b174dbb81532b667219abfad3e1c09efdb  gtksourceview-3.24.11.tar.lz
-"
diff --git a/gtk/libdazzle/libdazzle.SMBuild b/gtk/libdazzle/libdazzle.SMBuild
deleted file mode 100755
index 9c8748a..0000000
--- a/gtk/libdazzle/libdazzle.SMBuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=libdazzle
-version=3.42.0
-build=1sml
-homepage="https://gitlab.gnome.org/GNOME/libdazzle"
-download="https://gitlab.gnome.org/GNOME/libdazzle/-/archive/$version/libdazzle-$version.tar.bz2"
-desc="GNOME library for implementing fancy features in applications"
-requires="gtk3"
-   
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  mkdir -p smbuild && cd smbuild
-  meson .. \
-    --prefix="/" \
-    -Denable_tests=false
-
-  ninja
-  DESTDIR="$pkg" ninja install
-
-  cp ../COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-ffc846813d76f24eec15effce01a1b78598e41972e2c9ecf5fe1d182241766b35be07fb3df00e890026764aaf0433d454b9e6bdb739abfb9c91a625c7ca089e4  libdazzle-3.42.0.tar.lz
-"
diff --git a/gtk/libunique/libunique-1.1.6-G_CONST_RETURN.patch b/gtk/libunique/libunique-1.1.6-G_CONST_RETURN.patch
deleted file mode 100644
index 1cc5b6e..0000000
--- a/gtk/libunique/libunique-1.1.6-G_CONST_RETURN.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 557b0e5045c9eadb556ce11e16965cf0d0787438 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@collabora.co.uk>
-Date: Tue, 14 Jun 2011 12:33:45 +0100
-Subject: [PATCH] Remove G_CONST_RETURN usage, now that its gone in glib.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=652545
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: backported to unique-1.1]
----
- unique/uniqueapp.c       |    4 ++--
- unique/uniquebackend.c   |    4 ++--
- unique/uniquebackend.h   |    4 ++--
- unique/uniqueinternals.h |    4 ++--
- unique/uniquemessage.c   |    4 ++--
- unique/uniquemessage.h   |    4 ++--
- 6 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c
-index b40a86c..e8edc94 100644
---- a/unique/uniqueapp.c
-+++ b/unique/uniqueapp.c
-@@ -781,7 +781,7 @@ unique_app_watch_window (UniqueApp *app,
- }
- 
- 
--G_CONST_RETURN gchar *
-+const gchar *
- unique_command_to_string (UniqueApp *app,
-                           gint       command)
- {
-@@ -863,7 +863,7 @@ unique_command_from_string (UniqueApp   *app,
-   return retval;
- }
- 
--G_CONST_RETURN gchar *
-+const gchar *
- unique_response_to_string (UniqueResponse response)
- {
-   GEnumClass *enum_class;
-diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c
-index a76e42e..68e2735 100644
---- a/unique/uniquebackend.c
-+++ b/unique/uniquebackend.c
-@@ -111,7 +111,7 @@ unique_backend_set_name (UniqueBackend *backend,
-  *
-  * Return value: FIXME
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- unique_backend_get_name (UniqueBackend *backend)
- {
-   g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
-@@ -154,7 +154,7 @@ unique_backend_set_startup_id (UniqueBackend *backend,
-  *
-  * Return value: FIXME
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- unique_backend_get_startup_id (UniqueBackend *backend)
- {
-   g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
-diff --git a/unique/uniquebackend.h b/unique/uniquebackend.h
-index a50ce4e..b19ad3e 100644
---- a/unique/uniquebackend.h
-+++ b/unique/uniquebackend.h
-@@ -94,10 +94,10 @@ GType                 unique_backend_get_type       (void) G_GNUC_CONST;
- 
- UniqueBackend *       unique_backend_create         (void);
- 
--G_CONST_RETURN gchar *unique_backend_get_name       (UniqueBackend     *backend);
-+const gchar *         unique_backend_get_name       (UniqueBackend     *backend);
- void                  unique_backend_set_name       (UniqueBackend     *backend,
-                                                      const gchar       *name);
--G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend     *backend);
-+const gchar *         unique_backend_get_startup_id (UniqueBackend     *backend);
- void                  unique_backend_set_startup_id (UniqueBackend     *backend,
-                                                      const gchar       *startup_id);
- GdkScreen *           unique_backend_get_screen     (UniqueBackend     *backend);
-diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h
-index 3cec152..ccae0cd 100644
---- a/unique/uniqueinternals.h
-+++ b/unique/uniqueinternals.h
-@@ -44,11 +44,11 @@ UniqueResponse unique_app_emit_message_received (UniqueApp         *app,
-  * and then back into an id
-  */
- UniqueResponse        unique_response_from_string  (const gchar    *response);
--G_CONST_RETURN gchar *unique_response_to_string    (UniqueResponse  response);
-+const gchar *         unique_response_to_string    (UniqueResponse  response);
- 
- gint                  unique_command_from_string   (UniqueApp      *app,
-                                                     const gchar    *command);
--G_CONST_RETURN gchar *unique_command_to_string     (UniqueApp      *app,
-+const gchar *         unique_command_to_string     (UniqueApp      *app,
-                                                     gint            command);
- 
- G_END_DECLS
-diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c
-index c74392d..2b2a9fc 100644
---- a/unique/uniquemessage.c
-+++ b/unique/uniquemessage.c
-@@ -185,7 +185,7 @@ unique_message_data_set (UniqueMessageData *message_data,
-  *
-  * Since: 1.0.2
-  */
--G_CONST_RETURN guchar *
-+const guchar *
- unique_message_data_get (UniqueMessageData *message_data,
-                          gsize             *length)
- {
-@@ -525,7 +525,7 @@ unique_message_data_get_screen (UniqueMessageData *message_data)
-  *   owned by the #UniqueMessageData structure and should not be
-  *   modified or freed
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- unique_message_data_get_startup_id (UniqueMessageData *message_data)
- {
-   g_return_val_if_fail (message_data != NULL, NULL);
-diff --git a/unique/uniquemessage.h b/unique/uniquemessage.h
-index d3e9c3c..93eee21 100644
---- a/unique/uniquemessage.h
-+++ b/unique/uniquemessage.h
-@@ -48,7 +48,7 @@ void                   unique_message_data_free           (UniqueMessageData *me
- void                   unique_message_data_set            (UniqueMessageData *message_data,
-                                                            const guchar      *data,
-                                                            gsize              length);
--G_CONST_RETURN guchar *unique_message_data_get            (UniqueMessageData *message_data,
-+const guchar *         unique_message_data_get            (UniqueMessageData *message_data,
-                                                            gsize             *length);
- 
- gboolean               unique_message_data_set_text       (UniqueMessageData *message_data,
-@@ -63,7 +63,7 @@ void                   unique_message_data_set_filename   (UniqueMessageData *me
- gchar *                unique_message_data_get_filename   (UniqueMessageData *message_data);
- 
- GdkScreen *            unique_message_data_get_screen     (UniqueMessageData *message_data);
--G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
-+const gchar *          unique_message_data_get_startup_id (UniqueMessageData *message_data);
- guint                  unique_message_data_get_workspace  (UniqueMessageData *message_data);
- 
- G_END_DECLS
--- 
-1.7.6
-
diff --git a/gtk/libunique/libunique.SMBuild b/gtk/libunique/libunique.SMBuild
deleted file mode 100755
index db1e060..0000000
--- a/gtk/libunique/libunique.SMBuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=libunique
-version=1.1.6
-build=1sml
-homepage="https://wiki.gnome.org/Attic/LibUnique"
-download="https://download.gnome.org/sources/libunique/1.1/libunique-$version.tar.bz2"
-desc="Library for writing single instance applications"
-requires="gtk2 graphite2"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-
-  applypatch $srcdir/libunique-1.1.6-G_CONST_RETURN.patch
-}
-
-build() {
-  CFLAGS+=" -Wno-deprecated-declarations" \
-  CXXFLAGS="$CFLAGS" \
-  ./configure \
-    --prefix="" \
-    --enable-dbus=yes \
-    --with-x \
-    --enable-debug=no \
-    --disable-dependency-tracking \
-    --disable-maintainer-flags \
-    --enable-static=no \
-    $builddist
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-a675115244e9df0ea48add1f84b06ec33f3207773c91817e77b902a4dd8b01cdba1ad18ce00e4fa6a65adc2631b9cd1a33b4a426fb1b852a6d64c100e0b858f3  libunique-1.1.6.tar.lz
-b1df46be67911e2ddc8cb99f0dbf785121e1c4818f1327c03047d577a3ba2a845166c138873b4f5fde35682831cd099a88e28586db9b3db516facc851723bd7b  libunique-1.1.6-G_CONST_RETURN.patch
-"
diff --git a/gtk/pangomm/pangomm.SMBuild b/gtk/pangomm/pangomm.SMBuild
deleted file mode 100755
index ebff490..0000000
--- a/gtk/pangomm/pangomm.SMBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=pangomm
-version=2.46.3
-build=1sml
-homepage="https://gtkmm.org"
-download="https://gitlab.gnome.org/GNOME/pangomm/-/archive/$version/pangomm-$version.tar.bz2"
-desc="C++ API for pango"
-requires="pango glibmm cairomm"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  mkdir -p smbuild && cd smbuild
-  meson .. \
-    --prefix="/"
-
-  ninja
-  DESTDIR="$pkg" ninja install
-
-  cp ../COPYING* $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-2a817b125e32daaf2bede971ffb5718e344bc140c8f86c6f66a143132679a77640fa9182c78c24ddb3207c6cc1b21d75d838c131bcfcec96673a0e496ca3f8b7  pangomm-2.46.3.tar.lz
-"
diff --git a/gtk/rest/rest.SMBuild b/gtk/rest/rest.SMBuild
deleted file mode 100755
index f61e2a7..0000000
--- a/gtk/rest/rest.SMBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=rest
-version=0.8.1
-build=1sml
-homepage="https://gitlab.gnome.org/GNOME/librest"
-download="https://gitlab.gnome.org/GNOME/librest/-/archive/$version/librest-$version.tar.bz2"
-desc="Library for accessing RESTful web services"
-requires="glib libsoup libxml2 gobject-introspection"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" 
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-d24a506cff0c62c621267f74cbff3121c5c1bfdd141a3ad7656e3cd1e122d10f8ab3a46e8cf36717b0cadc1c83bf4c5f6735a98d655034a56260b45711ac1ed9  rest-0.8.1.tar.lz
-"
diff --git a/net/aircrack-ng/aircrack-ng.SMBuild b/net/aircrack-ng/aircrack-ng.SMBuild
deleted file mode 100755
index 907a521..0000000
--- a/net/aircrack-ng/aircrack-ng.SMBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=aircrack-ng
-version=1.6
-build=1sml
-homepage="https://www.aircrack-ng.org"
-download="https://download.aircrack-ng.org/aircrack-ng-$version.tar.gz"
-desc="Set of tools for auditing WiFi networks"
-requires="gcc-libs zlib openssl pcre sqlite libnl"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --sbindir=/bin 
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp LICENSE* $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-bc1121538968becf54bd076a998e8ac71e589967bf8fdbf2b1493fd0cea74a5c42673a358ead94ad92d4ca3652db354217f52677ea1b022095d5fef453236f78  aircrack-ng-1.6.tar.lz
-"
diff --git a/net/autossh/LICENSE b/net/autossh/LICENSE
deleted file mode 100644
index 43ca6d5..0000000
--- a/net/autossh/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
- Copyright (c) Carson Harding, 2002-2018.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are freely permitted.
- 
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, 
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
- THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/net/autossh/autossh.SMBuild b/net/autossh/autossh.SMBuild
deleted file mode 100755
index dd55739..0000000
--- a/net/autossh/autossh.SMBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=autossh
-version=1.4g
-build=2sml
-homepage="http://www.harding.motd.ca/autossh/"
-download="https://www.harding.motd.ca/autossh/autossh-$version.tgz"
-desc="Utility to automatically restart SSH sessions and tunnels"
-requires="musl"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tgz
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix=""
-
-  make
-  install -Dm 755 autossh $pkg/bin/autossh
-  install -Dm 644 autossh.1 $pkg/share/man/man1/autossh.1
-
-  cp $srcdir/LICENSE autossh.host rscreen $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-499b560d978736f4e764d5d828282fdaba1cbf94811ae6be0be5434d9c1cdc6ca5513d728b6372aa243843cb1b91e61cfc5fdeb77ddb0b6a7ce027218ba67466  autossh-1.4g.tgz
-"
diff --git a/net/geocode-glib/geocode-glib.SMBuild b/net/geocode-glib/geocode-glib.SMBuild
deleted file mode 100755
index 311a52a..0000000
--- a/net/geocode-glib/geocode-glib.SMBuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=geocode-glib
-version=3.26.2
-build=1sml
-homepage="https://gitlab.gnome.org/GNOME/geocode-glib"
-download="https://gitlab.gnome.org/GNOME/geocode-glib/-/archive/$version/geocode-glib-$version.tar.bz2"
-desc="Library for geocoding aka finding latitude and longitude from address and reverse"
-requires="json-glib libsoup"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  mkdir -p smbuild && cd smbuild
-  meson .. \
-    --prefix="/" \
-    -Denable-gtk-doc=false \
-    -Denable-introspection=false
-
-  ninja
-  DESTDIR="$pkg" ninja install
-
-  cp ../COPYING* $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-611afcfe4d424fc2e2436158f5dd5b357d9ccb78a71340a8d37499dc1d7e517a689f0373689783affc1e15e6f724df06b7d5d361a29ef5551226bcbe72307826  geocode-glib-3.26.2.tar.lz
-"
diff --git a/net/iproute2/fix-install-errors.patch b/net/iproute2/fix-install-errors.patch
deleted file mode 100644
index d514032..0000000
--- a/net/iproute2/fix-install-errors.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Without this patch the following error message shows up three times
-during `make install:`
-
-	install -m 0755  /home/travis/build/alpinelinux/aports/main/iproute2/pkg/iproute2/sbin
-	BusyBox v1.28.4 (2018-05-30 10:45:57 UTC) multi-call binary.
-	Usage: install [-cdDsp] [-o USER] [-g GRP] [-m MODE] [-t DIR] [SOURCE]... DEST
-	Copy files and set attributes
-		-c	Just copy (default)
-		-d	Create directories
-		-D	Create leading target directories
-		-s	Strip symbol table
-		-p	Preserve date
-		-o USER	Set ownership
-		-g GRP	Set group ownership
-		-m MODE	Set permissions
-		-t DIR	Install to DIR
-	make[1]: *** [Makefile:25: install] Error 1
-
-diff -upr iproute2-4.17.0.orig/Makefile iproute2-4.17.0/Makefile
---- iproute2-4.17.0.orig/Makefile	2018-06-27 22:58:35.818077991 +0200
-+++ iproute2-4.17.0/Makefile	2018-06-27 23:00:33.118560603 +0200
-@@ -61,7 +61,17 @@ WFLAGS += -Wmissing-declarations -Wold-s
- CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
- YACCFLAGS = -d -t -v
- 
--SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
-+SUBDIRS=lib ip tc bridge misc netem genl man
-+
-+# The following subdirs require libmnl. If libmnl isn't installed
-+# install(1) is called with invalid arguments when the install
-+# target is invoked in those subdirs because $(TARGETS) is empty.
-+#
-+# To prevent these errors we only include the subdirs if libmnl is
-+# actually available.
-+ifeq ($(HAVE_MNL),y)
-+SUBDIRS += tipc devlink rdma
-+endif
- 
- LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
- LDLIBS += $(LIBNETLINK)
diff --git a/net/iproute2/iproute2.SMBuild b/net/iproute2/iproute2.SMBuild
index 9bd0c29..9857287 100755
--- a/net/iproute2/iproute2.SMBuild
+++ b/net/iproute2/iproute2.SMBuild
@@ -1,6 +1,6 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=iproute2
-version=4.20.0
+version=6.3.0
 build=1sml
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 download="https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/iproute2-$version.tar.xz"
@@ -15,17 +15,16 @@ prepbuilddir() {
   cd $app-$version
   fixbuilddirpermissions
 
-  applypatch $srcdir/fix-install-errors.patch
-  applypatch $srcdir/musl-fixes.patch
+  #applypatch $srcdir/fix-install-errors.patch
+  #applypatch $srcdir/musl-fixes.patch
 }
 
 build() {
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc \
+    --prefix=/
 
   make
-  make install DESTDIR=$pkg PREFIX="" SBINDIR="/bin" MANDIR="/share/man" LIBDIR="/lib" KERNEL_INCLUDE="/include"
+  make install DESTDIR=$pkg PREFIX= SBINDIR="/bin" MANDIR="/share/man" LIBDIR="/lib" KERNEL_INCLUDE="/include"
 
   cp COPYING $pkgdocs/
 
@@ -33,7 +32,5 @@ build() {
 }
 
 sha512sums="
-0de26018541004f9386ce454a684fb3c18248f477a8bd41f27788b2a3834bfbbec84ea09e0af884099ac2b09444bf0c46743e8f4d2f7eaa0902da8bee5e87db4  iproute2-4.20.0.tar.lz
-24fc2a901650e11f80bcaa82c839e70c21aafdf3c5b8a357d932d066a0b98ae2ec8379fc17a0a16a1b5b4fa5edc131179c10fc02e55d6101701df5a09966912c  fix-install-errors.patch
-2e3558caddf814da8c4d78c74eddb7a659d6f94b93de5396bdd995e2333e3cd656f9c936ac7a5a86d0477abc27a92550582575ab4ed19fc2ec0d9b6699cd612c  musl-fixes.patch
+aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf  iproute2-6.3.0.tar.xz
 "
diff --git a/net/iproute2/musl-fixes.patch b/net/iproute2/musl-fixes.patch
deleted file mode 100644
index 6c29904..0000000
--- a/net/iproute2/musl-fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Include linux/limits.h to fix the following compilation error:
-
-	f_flower.c: In function 'flower_parse_enc_opts':
-	f_flower.c:702:11: error: 'XATTR_SIZE_MAX' undeclared (first use in this function); did you mean 'SSIZE_MAX
-	  char key[XATTR_SIZE_MAX], mask[XATTR_SIZE_MAX];
-		   ^~~~~~~~~~~~~~
-		   SSIZE_MAX
-
-diff -upr iproute2-4.20.0.orig/tc/f_flower.c iproute2-4.20.0/tc/f_flower.c
---- iproute2-4.20.0.orig/tc/f_flower.c	2019-03-16 16:49:46.328056814 +0100
-+++ iproute2-4.20.0/tc/f_flower.c	2019-03-16 16:50:13.658058776 +0100
-@@ -19,6 +19,7 @@
- #include <linux/ip.h>
- #include <linux/tc_act/tc_vlan.h>
- #include <linux/mpls.h>
-+#include <linux/limits.h>
- 
- #include "utils.h"
- #include "tc_util.h"
diff --git a/net/lftp/lftp.SMBuild b/net/lftp/lftp.SMBuild
deleted file mode 100755
index 0d23cf0..0000000
--- a/net/lftp/lftp.SMBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=lftp
-version=4.9.1
-build=1sml
-homepage="https://lftp.yar.ru/"
-download="https://lftp.yar.ru/ftp/lftp-$version.tar.xz"
-desc="Text-mode network utility with support for FTP, HTTP, SFTP, FISH and torrent protocols"
-requires="gcc-libs netbsd-curses readline expat gmp gnutls libtasn1 libidn nettle"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --disable-static
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-3fd08dbffd293164441b0b153dd78c2b3c09c3c8307586fc7bdb864843f13c3685beabd0c74abf59e2892942ef2eba2dcc5c89e2df1daef551685eea805df036  lftp-4.9.1.tar.lz
-"
diff --git a/net/nfs-utils/doinst.sh b/net/nfs-utils/doinst.sh
deleted file mode 100644
index ca1d882..0000000
--- a/net/nfs-utils/doinst.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-config var/lib/nfs/etab.new
-config var/lib/nfs/rmtab.new
-config var/lib/nfs/state.new
-rm -f var/lib/nfs/*.new
-# No, no, no.
-#chown -R rpc:rpc var/lib/nfs
-if [ -x etc/rc.d/rc.nfsd ]; then
-  chmod 755 etc/rc.d/rc.nfsd.new
-else
-  chmod 644 etc/rc.d/rc.nfsd.new
-fi
-config etc/default/nfs.new
-config etc/rc.d/rc.nfsd.new
-config etc/nfsmount.conf.new
-config etc/exports.new
-# If you already had your own /etc/exports, this one is probably useless...
-rm -f etc/exports.new
-( cd bin ; rm -rf umount.nfs )
-( cd bin ; ln -sf mount.nfs umount.nfs )
-( cd share/man/man8 ; rm -rf rpc.mountd.8.gz )
-( cd share/man/man8 ; ln -sf mountd.8.gz rpc.mountd.8.gz )
-( cd share/man/man8 ; rm -rf rpc.nfsd.8.gz )
-( cd share/man/man8 ; ln -sf nfsd.8.gz rpc.nfsd.8.gz )
-( cd share/man/man8 ; rm -rf rpc.statd.8.gz )
-( cd share/man/man8 ; ln -sf statd.8.gz rpc.statd.8.gz )
-( cd share/man/man8 ; rm -rf rpc.sm-notify.8.gz )
-( cd share/man/man8 ; ln -sf sm-notify.8.gz rpc.sm-notify.8.gz )
diff --git a/net/nfs-utils/exports b/net/nfs-utils/exports
deleted file mode 100644
index 418ac6b..0000000
--- a/net/nfs-utils/exports
+++ /dev/null
@@ -1,4 +0,0 @@
-# See exports(5) for a description.
-# This file contains a list of all directories exported to other computers.
-# It is used by rpc.nfsd and rpc.mountd.
-
diff --git a/net/nfs-utils/musl-configure_ac.patch b/net/nfs-utils/musl-configure_ac.patch
deleted file mode 100644
index a96c7bd..0000000
--- a/net/nfs-utils/musl-configure_ac.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -578,10 +578,10 @@
-  -Wall \
-  -Wextra \
-  $rpcgen_cflags \
-- -Werror=missing-prototypes \
-- -Werror=missing-declarations \
-+ -Wmissing-prototypes \
-+ -Wmissing-declarations \
-  -Werror=format=2 \
-- -Werror=undef \
-+ -Wundef \
-  -Werror=missing-include-dirs \
-  -Werror=strict-aliasing=2 \
-  -Werror=init-self \
-@@ -617,11 +617,11 @@
- 
- CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
- CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
--CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
-+#CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
- CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
- AX_GCC_FUNC_ATTRIBUTE([format])
- 
--AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
-+AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"])
- 
- # Make sure that $ACLOCAL_FLAGS are used during a rebuild
- AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
diff --git a/net/nfs-utils/musl-getservbyport.patch b/net/nfs-utils/musl-getservbyport.patch
deleted file mode 100644
index 6fa589c..0000000
--- a/net/nfs-utils/musl-getservbyport.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Musl will always return something with getservbyport so we cannot skip
-ports that returns non-null.
-
-diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
-index fd576d9..d72a0bf 100644
---- a/utils/statd/rmtcall.c
-+++ b/utils/statd/rmtcall.c
-@@ -93,8 +93,10 @@
- 					__func__);
- 			break;
- 		}
-+#if 0
- 		se = getservbyport(sin.sin_port, "udp");
- 		if (se == NULL)
-+#endif
- 			break;
- 
- 		if (retries == MAX_BRP_RETRIES) {
diff --git a/net/nfs-utils/musl-svcgssd-sysconf.patch b/net/nfs-utils/musl-svcgssd-sysconf.patch
deleted file mode 100644
index ec280cc..0000000
--- a/net/nfs-utils/musl-svcgssd-sysconf.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/support/nfsidmap/libnfsidmap.c
-+++ b/support/nfsidmap/libnfsidmap.c
-@@ -432,11 +432,17 @@ int nfs4_init_name_mapping(char *conffil
- 
- 	nobody_user = conf_get_str("Mapping", "Nobody-User");
- 	if (nobody_user) {
--		size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+		long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+		size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETPW_R_SIZE_MAX*/
- 		struct passwd *buf;
- 		struct passwd *pw = NULL;
- 		int err;
- 
-+		/*sysconf can return -1 when _SC_GETPW_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead
-+		  to an integer overflow, which leads to a buffer overflow and crashes svcgssd */
-+		if (scbuflen > 0)
-+			buflen = (size_t)scbuflen;
-+
- 		buf = malloc(sizeof(*buf) + buflen);
- 		if (buf) {
- 			err = getpwnam_r(nobody_user, buf, ((char *)buf) + sizeof(*buf), buflen, &pw);
-@@ -453,11 +459,17 @@ int nfs4_init_name_mapping(char *conffil
- 
- 	nobody_group = conf_get_str("Mapping", "Nobody-Group");
- 	if (nobody_group) {
--		size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+		long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+		size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETGR_R_SIZE_MAX*/
- 		struct group *buf;
- 		struct group *gr = NULL;
- 		int err;
- 
-+		/*sysconf can return -1 when _SC_GETGR_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead
-+		  to an integer overflow, which leads to a buffer overflow and crashes svcgssd */
-+		if (scbuflen > 0)
-+			buflen = (size_t)scbuflen;
-+
- 		buf = malloc(sizeof(*buf) + buflen);
- 		if (buf) {
- 			err = getgrnam_r(nobody_group, buf, ((char *)buf) + sizeof(*buf), buflen, &gr);
---- a/support/nfsidmap/static.c
-+++ b/support/nfsidmap/static.c
-@@ -98,10 +98,14 @@ static struct passwd *static_getpwnam(co
- {
- 	struct passwd *pw;
- 	struct pwbuf *buf;
--	size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	char *localname;
- 	int err;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	buf = malloc(sizeof(*buf) + buflen);
- 	if (!buf) {
- 		err = ENOMEM;
-@@ -149,10 +153,14 @@ static struct group *static_getgrnam(con
- {
- 	struct group *gr;
- 	struct grbuf *buf;
--	size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	char *localgroup;
- 	int err;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	buf = malloc(sizeof(*buf) + buflen);
- 	if (!buf) {
- 		err = ENOMEM;
---- a/support/nfsidmap/nss.c
-+++ b/support/nfsidmap/nss.c
-@@ -91,9 +91,13 @@ static int nss_uid_to_name(uid_t uid, ch
- 	struct passwd *pw = NULL;
- 	struct passwd pwbuf;
- 	char *buf;
--	size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	int err = -ENOMEM;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	buf = malloc(buflen);
- 	if (!buf)
- 		goto out;
-@@ -119,9 +123,13 @@ static int nss_gid_to_name(gid_t gid, ch
- 	struct group *gr = NULL;
- 	struct group grbuf;
- 	char *buf;
--	size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	int err;
- 
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
-+
- 	if (domain == NULL)
- 		domain = get_default_domain();
- 
-@@ -192,12 +200,13 @@ static struct passwd *nss_getpwnam(const
- {
- 	struct passwd *pw;
- 	struct pwbuf *buf;
--	size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	char *localname;
- 	int err = ENOMEM;
- 
--	if (buflen > UINT_MAX)
--		goto err;
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
- 
- 	buf = malloc(sizeof(*buf) + buflen);
- 	if (buf == NULL)
-@@ -301,7 +310,8 @@ static int _nss_name_to_gid(char *name,
- 	struct group *gr = NULL;
- 	struct group grbuf;
- 	char *buf, *domain;
--	size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	size_t buflen = 1024;
- 	int err = -EINVAL;
- 	char *localname = NULL;
- 	char *ref_name = NULL;
-@@ -327,8 +337,8 @@ static int _nss_name_to_gid(char *name,
- 	}
- 
- 	err = -ENOMEM;
--	if (buflen > UINT_MAX)
--		goto out_name;
-+	if (scbuflen > 0)
-+		buflen = (size_t)scbuflen;
- 
- 	do {
- 		buf = malloc(buflen);
diff --git a/net/nfs-utils/musl-time64.patch b/net/nfs-utils/musl-time64.patch
deleted file mode 100644
index 62a1d1e..0000000
--- a/net/nfs-utils/musl-time64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
-index b45a904..6b1049f 100644
---- a/utils/nfsdcltrack/nfsdcltrack.c
-+++ b/utils/nfsdcltrack/nfsdcltrack.c
-@@ -25,9 +25,11 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <ctype.h>
- #include <errno.h>
- #include <stdbool.h>
-+#include <stdint.h>
-+#include <inttypes.h>
-+#include <ctype.h>
- #include <getopt.h>
- #include <string.h>
- #include <sys/stat.h>
-@@ -525,7 +527,8 @@ cltrack_gracedone(const char *timestr)
- 	if (*tail)
- 		return -EINVAL;
- 
--	xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
-+	xlog(D_GENERAL, "%s: grace done. gracetime=%" PRId64, __func__,
-+		(int64_t)gracetime);
- 
- 	ret = sqlite_remove_unreclaimed(gracetime);
- 
-diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
-index 2801201..c4e0cdf 100644
---- a/utils/nfsdcltrack/sqlite.c
-+++ b/utils/nfsdcltrack/sqlite.c
-@@ -42,6 +42,8 @@
- #include <errno.h>
- #include <event.h>
- #include <stdbool.h>
-+#include <stdint.h>
-+#include <inttypes.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -544,8 +546,8 @@ sqlite_remove_unreclaimed(time_t grace_start)
- 	int ret;
- 	char *err = NULL;
- 
--	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
--			grace_start);
-+	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %" PRId64,
-+			(int64_t)grace_start);
- 	if (ret < 0) {
- 		return ret;
- 	} else if ((size_t)ret >= sizeof(buf)) {
diff --git a/net/nfs-utils/nfs-utils.SMBuild b/net/nfs-utils/nfs-utils.SMBuild
deleted file mode 100755
index 88600af..0000000
--- a/net/nfs-utils/nfs-utils.SMBuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=nfs-utils
-version=2.5.1
-build=1sml
-homepage="https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/"
-download="https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/$version/nfs-utils-$version.tar.xz"
-desc="Network File System daemons and utilities"
-requires="libtirpc keyutils"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-
-  applypatch $srcdir/musl-configure_ac.patch
-  applypatch $srcdir/musl-getservbyport.patch
-  applypatch $srcdir/musl-svcgssd-sysconf.patch
-  applypatch $srcdir/musl-time64.patch
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --sysconfdir=/etc \
-    --bindir=/bin \
-    --sbindir=/bin \
-    --enable-static=no \
-    --enable-ipv6 \
-    --enable-nfsv4 \
-    --enable-uuid \
-    --enable-libmount-mount \
-    --disable-gss \
-    --with-rpcgen=internal \
-    --without-tcp-wrappers 
-
-  make
-  make -j1 install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  ( 
-   if [ -d $pkg/sbin ] ; then 
-     cd $pkg ; mv sbin/* bin/ ; rmdir sbin 
-   fi
-  )
-
-  mkdir -p $pkg/var/log/nfsd
-  install -Dm 644 $srcdir/exports $pkg/etc/exports.new
-  install -Dm 644 $srcdir/rc.nfsd $pkg/etc/rc.d/rc.nfsd.new
-  install -Dm 644 $srcdir/nfs.default $pkg/etc/default/nfs.new
-
-  # These might be in use:
-  ( 
-    cd $pkg/var/lib/nfs
-    for config_file in etab rmtab state ; do
-        mv ${config_file} ${config_file}.new
-    done
-  )
-
-  mkfinalpkg
-}
-
-sha512sums="
-b332bb20461a90262855b8860e3e018a375a8d982ef9caed6359eb069b8332a15c6404fea1817c7bec10366d0c3dc30b2e10a9253fadf3768a19ab1554c549c0  nfs-utils-2.5.1.tar.lz
-3f245b1870a47998d90cee191dba528dede7d2e18abad3f045864f95039057cda5a22708d89fcc086eeed452729c397a0284c73c1c7037277943a9890504e250  musl-configure_ac.patch
-94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748  musl-getservbyport.patch
-52eeade44753f2002bf99d58ad4982086aab74ef8b14de46be547f23508197f58a6ff529145f96de7f031ac0bb7779b648d05fd981cdd91556dd13d068dfe57b  musl-svcgssd-sysconf.patch
-8efc48cdc6f8cfafe476241f95ca8dc89ac7b3402d4230d20ef1e066990c542b8350f9b11f495cc261f25f1a705e35445fa89ca729f0d162e0ed44b0d8a47344  musl-time64.patch
-"
diff --git a/net/nfs-utils/nfs.default b/net/nfs-utils/nfs.default
deleted file mode 100644
index 94e5740..0000000
--- a/net/nfs-utils/nfs.default
+++ /dev/null
@@ -1,10 +0,0 @@
-# See also /etc/default/rpc
-
-# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
-# Turn off v2 and v3 protocol support:
-#RPC_NFSD_OPTS="-N 2 -N 3"
-# Turn off v4 protocol support:
-#RPC_NFSD_OPTS="-N 4"
-# Number of nfs server processes to be started.
-# The default is 8.
-#RPC_NFSD_COUNT=8
diff --git a/net/nfs-utils/rc.nfsd b/net/nfs-utils/rc.nfsd
deleted file mode 100644
index b119008..0000000
--- a/net/nfs-utils/rc.nfsd
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-# Start/stop/restart the NFS server.
-#
-# This is an init script for the knfsd NFS daemons.
-# To use NFS, you must first set up /etc/exports.
-# See exports(5) for information on /etc/exports format.
-#
-# Written for Slackware Linux by Patrick J. Volkerding <volkerdi@slackware.com>.
-
-# Source default settings:
-if [ -r /etc/default/rpc ]; then
-  . /etc/default/rpc
-fi
-if [ -r /etc/default/nfs ]; then
-  . /etc/default/nfs
-fi
-
-nfsd_start() {
-  # There used to be "sanity checks" here to exit without starting if various
-  # config files didn't exist, or didn't contain certain expected content.
-  # This behavior led to some bugs and has been removed. It's not our business
-  # to check your config files - that's for the binaries that use them.
-
-  # If we do not detect nfsd support built into the kernel (or previously
-  # loaded as a module), we will try to load the nfsd.ko kernel module:
-  if [ ! -r /proc/1/net/rpc/nfsd ]; then
-    /bin/modprobe nfsd
-  fi
-
-  # Mount the nfsd filesystem:
-  if awk '$NF == "nfsd"' /proc/filesystems | grep -q . ; then
-    if ! awk '$3 == "nfsd" && $2 == "/proc/fs/nfs"' /proc/mounts | grep -q . ; then
-      /bin/mount -t nfsd nfsd /proc/fs/nfs 2> /dev/null
-    fi
-  fi
-
-  # If basic RPC services are not running, start them:
-  if ! ps axc | grep -q rpc.statd ; then
-    if [ -r /etc/rc.d/rc.rpc ]; then
-      sh /etc/rc.d/rc.rpc start
-    else
-      # Sure, we tested for rpc.statd, but this is the probable cause:
-      echo "FATAL:  Can't start NFS server without rpcbind package."
-      sleep 5
-      exit 1
-    fi
-  fi
-
-  echo "Starting NFS server daemons:"
-
-  if [ -x /bin/exportfs ]; then
-    echo "  /bin/exportfs -r"
-    /bin/exportfs -r
-  fi
-
-  if [ -x /bin/rpc.rquotad ]; then
-    if [ -n "$RPC_RQUOTAD_PORT" ]; then
-      RPC_RQUOTAD_OPTS="$RPC_RQUOTAD_OPTS -p $RPC_RQUOTAD_PORT"
-    fi
-    echo "  /bin/rpc.rquotad $RPC_RQUOTAD_OPTS"
-    /bin/rpc.rquotad $RPC_RQUOTAD_OPTS
-  fi
-
-  # Start nfsd servers - 8 if not set otherwise (an old Sun standard):
-  if [ -x /bin/rpc.nfsd ]; then
-    if [ -z "$RPC_NFSD_COUNT" ]; then
-      RPC_NFSD_COUNT=8
-    fi
-    echo "  /bin/rpc.nfsd $RPC_NFSD_OPTS $RPC_NFSD_COUNT"
-    /bin/rpc.nfsd $RPC_NFSD_OPTS $RPC_NFSD_COUNT
-  fi
-
-  if [ -x /bin/rpc.mountd ]; then
-    if [ -n "$RPC_MOUNTD_PORT" ]; then
-      RPC_MOUNTD_OPTS="$RPC_MOUNTD_OPTS -p $RPC_MOUNTD_PORT"
-    fi
-    echo "  /bin/rpc.mountd $RPC_MOUNTD_OPTS"
-    /bin/rpc.mountd $RPC_MOUNTD_OPTS
-  fi
-
-}
-
-nfsd_stop() {
-  killall rpc.mountd 2> /dev/null
-  killall nfsd 2> /dev/null
-  sleep 1
-  killall -9 nfsd 2> /dev/null # make sure :)
-  killall rpc.rquotad 2> /dev/null
-  /bin/exportfs -au 2> /dev/null
-}
-
-nfsd_restart() {
-  nfsd_stop
-  sleep 1
-  nfsd_start
-}
-
-case "$1" in
-'start')
-  nfsd_start
-  ;;
-'stop')
-  nfsd_stop
-  ;;
-'restart')
-  nfsd_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/net/openntpd/openntpd.SMBuild b/net/openntpd/openntpd.SMBuild
deleted file mode 100755
index de2a104..0000000
--- a/net/openntpd/openntpd.SMBuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=openntpd
-version=6.2p3
-build=1sml
-homepage="https://www.openntpd.org/"
-download="https://cdn.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-$version.tar.gz"
-desc="Secure NTPD implementation from OpenBSD developers"
-requires="openssl"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --bindir=/bin \
-    --sbindir=/bin \
-    --sysconfdir=/etc \
-    --with-privsep-user=nobody \
-    --with-adjtimex
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING $pkgdocs/
-
-  preprunitservice -s openntpd -d
-
-  mkfinalpkg
-}
-
-sha512sums="
-727689597c031d1a0872b63ca0e83edc7c8e65aa7fa90a5546dd029445f9e40c268d71f9e054c40799a8a591fa0c618be8683dd42d9c872a2ab6413309ac4669  openntpd-6.2p3.tar.lz
-"
diff --git a/net/openntpd/openntpd.run b/net/openntpd/openntpd.run
deleted file mode 100644
index 87c8115..0000000
--- a/net/openntpd/openntpd.run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH="/bin"
-exec ntpd -d 2>&1
diff --git a/net/poppler/poppler-segfault.patch b/net/poppler/poppler-segfault.patch
deleted file mode 100644
index 145859a..0000000
--- a/net/poppler/poppler-segfault.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- poppler-0.22.0.org/poppler/GlobalParams.cc	2013-01-09 15:10:49.947000004 +0000
-+++ poppler-0.22.0/poppler/GlobalParams.cc	2013-01-09 16:54:48.168000002 +0000
-@@ -1088,10 +1088,10 @@
-   
-   const char *lang = getFontLang(font);
-   
--  p = FcPatternBuild(NULL,
-+  p = FcPatternBuild(0,
-                     FC_FAMILY, FcTypeString, family,
-                     FC_LANG, FcTypeString, lang,
--                    NULL);
-+                    (void*) 0);
-   if (slant != -1) FcPatternAddInteger(p, FC_SLANT, slant);
-   if (weight != -1) FcPatternAddInteger(p, FC_WEIGHT, weight);
-   if (width != -1) FcPatternAddInteger(p, FC_WIDTH, width);
diff --git a/net/poppler/poppler.SMBuild b/net/poppler/poppler.SMBuild
index 57d7749..c45ef76 100755
--- a/net/poppler/poppler.SMBuild
+++ b/net/poppler/poppler.SMBuild
@@ -1,6 +1,6 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=poppler
-version=0.57.0
+version=23.05.0
 build=1sml
 homepage="https://poppler.freedesktop.org/"
 download="https://poppler.freedesktop.org/poppler-$version.tar.xz"
@@ -17,29 +17,20 @@ prepbuilddir() {
 }
 
 build() {
+  mkdir -p smbuild && cd smbuild
 
-  applypatch $srcdir/poppler-segfault.patch
-
-  ./configure \
-    --prefix="" \
-    --sysconfdir=/etc \
-    --enable-introspection=no \
-    --disable-gtk-test \
-    --disable-poppler-qt4 \
-    --disable-poppler-qt5 \
-    --enable-xpdf-headers \
-    --enable-zlib \
-    --disable-static
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_LIBDIR=lib
 
   make
   make install DESTDIR=$pkg
 
-  cp COPYING $pkgdocs/
+  cp ../COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
 sha512sums="
-0d8c0fffe97809f20bb34f2139b2a7e28a16b05ba4d73904a8dcc0d351b9acc087d695d29e73bfb3b166840ee004e5497140b1299aa722ba3d460930f0a9019a  poppler-0.57.0.tar.lz
-1f42a769becbf4873efa27c970e57b44bb46efc1029e6deecf0a8bfba047f189ec65ae4346ea79ce15eebd10771c74ece408fe1956e4b3d27a578a045aa2451f  poppler-segfault.patch
-"
\ No newline at end of file
+796d36af987d22c010d68a14d092341d42c9207500bb7e76711e157c3c395af67db835b074e09bf09788b6f5f439eac6d34fc4eea3dd288153ad8b8cfbc4ec75  poppler-23.05.0.tar.lz
+"
diff --git a/net/redshift/doinst.sh b/net/redshift/doinst.sh
deleted file mode 100644
index dbe0651..0000000
--- a/net/redshift/doinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk
diff --git a/net/redshift/redshift.SMBuild b/net/redshift/redshift.SMBuild
deleted file mode 100755
index ebdb91d..0000000
--- a/net/redshift/redshift.SMBuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=redshift
-version=1.12
-build=2sml
-homepage="http://jonls.dk/redshift/"
-download="https://github.com/jonls/redshift/releases/download/v$version/redshift-$version.tar.xz"
-desc="Tool to adjust colour temperature of computer screen based on users surroundings"
-requires="geoclue gtk3 libxcb libdrm libxxf86vm python3"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --enable-drm \
-    --enable-randr \
-    --enable-vidmode \
-    --enable-geoclue2
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-5da3be7ccf4c43af0fa6da42e4f0972e46901a3ab7366a1412e7bcb573eefcf85a684b63068e6f54df04ab1427d6f58fff92091110b99ae848bc3769d703125b  redshift-1.12.tar.lz
-"
diff --git a/net/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch b/net/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch
deleted file mode 100644
index 77937b7..0000000
--- a/net/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0bc1c0ae7ce61a7ac8a8e9a9b2086268f011abf0 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Tue, 9 Oct 2018 09:19:50 -0400
-Subject: [PATCH] rpcinfo: Fix stack buffer overflow
-
-*** buffer overflow detected ***: rpcinfo terminated
-======= Backtrace: =========
-/lib64/libc.so.6(+0x721af)[0x7ff24c4451af]
-/lib64/libc.so.6(__fortify_fail+0x37)[0x7ff24c4ccdc7]
-/lib64/libc.so.6(+0xf8050)[0x7ff24c4cb050]
-rpcinfo(+0x435f)[0xef3be2635f]
-rpcinfo(+0x1c62)[0xef3be23c62]
-/lib64/libc.so.6(__libc_start_main+0xf5)[0x7ff24c3f36e5]
-rpcinfo(+0x2739)[0xef3be24739]
-======= Memory map: ========
-...
-The patch below fixes it.
-
-Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Thomas Blume <thomas.blume@suse.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- src/rpcinfo.c | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/src/rpcinfo.c b/src/rpcinfo.c
-index 9b46864..cfdba88 100644
---- a/src/rpcinfo.c
-+++ b/src/rpcinfo.c
-@@ -973,6 +973,7 @@ rpcbdump (dumptype, netid, argc, argv)
- 	("   program version(s) netid(s)                         service     owner\n");
-       for (rs = rs_head; rs; rs = rs->next)
- 	{
-+	  size_t netidmax = sizeof(buf) - 1;
- 	  char *p = buf;
- 
- 	  printf ("%10ld  ", rs->prog);
-@@ -985,12 +986,22 @@ rpcbdump (dumptype, netid, argc, argv)
- 	    }
- 	  printf ("%-10s", buf);
- 	  buf[0] = '\0';
--	  for (nl = rs->nlist; nl; nl = nl->next)
--	    {
--	      strcat (buf, nl->netid);
--	      if (nl->next)
--		strcat (buf, ",");
--	    }
-+
-+          for (nl = rs->nlist; nl; nl = nl->next)
-+            {
-+              strncat (buf, nl->netid, netidmax);
-+              if (strlen (nl->netid) < netidmax)
-+                netidmax -= strlen(nl->netid);
-+              else
-+                break;
-+
-+              if (nl->next && netidmax > 1)
-+                {
-+                  strncat (buf, ",", netidmax);
-+                  netidmax --;
-+                }
-+            }
-+
- 	  printf ("%-32s", buf);
- 	  rpc = getrpcbynumber (rs->prog);
- 	  if (rpc)
--- 
-2.21.0
-
diff --git a/net/rpcbind/doinst.sh b/net/rpcbind/doinst.sh
deleted file mode 100644
index 6702794..0000000
--- a/net/rpcbind/doinst.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-config etc/default/rpc.new
-preserve_perms etc/rc.d/rc.rpc.new
diff --git a/net/rpcbind/rc.rpc b/net/rpcbind/rc.rpc
deleted file mode 100644
index b085003..0000000
--- a/net/rpcbind/rc.rpc
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-# rc.rpc:  start/stop/restart RPC daemons needed to use NFS.
-#
-# You must run these daemons in order to mount NFS partitions
-# (unless you use the mount option '-o nolock', which can
-# corrupt files and is not generally recommended unless you
-# are mounting the partition(s) as read-only).
-#
-# To run an NFS server, starting these is mandatory.
-#
-
-# Source default settings:
-if [ -r /etc/default/rpc ]; then
-  . /etc/default/rpc
-fi
-
-rpc_start() {
-  if [ -x /bin/rpcbind -a -x /bin/rpc.statd ]; then
-    # Set up port for lockd:
-    if [ -n "$LOCKD_TCP_PORT" ]; then
-      /bin/sysctl -w "fs.nfs.nlm_tcpport=$LOCKD_TCP_PORT" >/dev/null 2>&1
-    fi
-    if [ -n "$LOCKD_UDP_PORT" ]; then
-      /bin/sysctl -w "fs.nfs.nlm_udpport=$LOCKD_UDP_PORT" >/dev/null 2>&1
-    fi
-    if ! ps axc | grep -q rpcbind ; then
-      echo "Starting RPC portmapper:  /bin/rpcbind -l $* $RPCBIND_OPTS"
-      /bin/rpcbind -l "$@" $RPCBIND_OPTS
-    fi
-    if ! ps axc | grep -q rpc.statd ; then
-      if [ -n "$RPC_STATD_HOSTNAME" ]; then
-        RPC_STATD_OPTS="$RPC_STATD_OPTS -n $RPC_STATD_HOSTNAME"
-      fi
-      if [ -n "$RPC_STATD_PORT" ]; then
-        RPC_STATD_OPTS="$RPC_STATD_OPTS -p $RPC_STATD_PORT"
-      fi
-      if [ -n "$RPC_STATD_OUTGOING_PORT" ]; then
-        RPC_STATD_OPTS="$RPC_STATD_OPTS -o $RPC_STATD_OUTGOING_PORT"
-      fi
-      echo "Starting RPC NSM (Network Status Monitor):  /bin/rpc.statd $RPC_STATD_OPTS"
-      /bin/rpc.statd $RPC_STATD_OPTS
-    fi
-  else
-    echo "WARNING:  Cannot start RPC daemons needed for NFS.  One or more of"
-    echo "          these required daemons is not executable or is not present"
-    echo "          on your system:"
-    echo
-    echo "          /bin/rpcbind or /bin/rpc.statd"
-    echo
-  fi
-}
-
-rpc_stop() {
-  killall rpc.statd 2> /dev/null
-  sleep 1
-  killall rpcbind 2> /dev/null
-  sleep 1
-  killall -9 rpc.statd 2> /dev/null # make sure :)
-  sleep 1
-  killall -9 rpcbind 2> /dev/null # make sure :)
-  sleep 1
-}
-
-rpc_restart() {
-  rpc_stop
-  rpc_start
-}
-
-case "$1" in
-'start')
-  # Warm restart by default (see "man rpcbind" for details about the -w option)
-  rpc_start -w
-  ;;
-'cold_start') # Start without -w option
-  rpc_start
-  ;;
-'stop')
-  rpc_stop
-  ;;
-'restart')
-  rpc_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/net/rpcbind/rpc.default b/net/rpcbind/rpc.default
deleted file mode 100644
index e820fae..0000000
--- a/net/rpcbind/rpc.default
+++ /dev/null
@@ -1,29 +0,0 @@
-# See also /etc/default/nfs
-
-# Optional arguments passed to rpcbind. See rpcbind(8)
-#RPCBIND_OPTS=""
-#
-# Optional arguments passed to rpc.statd. See rpc.statd(8)
-#RPC_STATD_OPTS=""
-# Optional hostname to start rpc.statd with.
-#RPC_STATD_HOSTNAME="darkstar"
-# Port rpc.statd should listen on.
-#RPC_STATD_PORT=32766
-# Outgoing port rpc.statd should use.
-#RPC_STATD_OUTGOING_PORT=32765
-#
-# Optional options passed to rquotad. See rquotad(8)
-#RPC_RQUOTAD_OPTS=""
-# Optional port rquotad should listen on:
-#RPC_RQUOTAD_PORT=32769
-#
-# TCP port rpc.lockd should listen on:
-#LOCKD_TCP_PORT=32768
-# UDP port rpc.lockd should listen on:
-#LOCKD_UDP_PORT=32768
-#
-# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
-#RPC_MOUNTD_OPTS=""
-# Port rpc.mountd should listen on:
-#RPC_MOUNTD_PORT=32767
-#
diff --git a/net/rpcbind/rpcbind.SMBuild b/net/rpcbind/rpcbind.SMBuild
deleted file mode 100755
index fec6168..0000000
--- a/net/rpcbind/rpcbind.SMBuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=rpcbind
-version=1.2.5
-build=1sml
-homepage="http://sourceforge.net/projects/rpcbind/"
-download="https://sourceforge.net/projects/rpcbind/files/rpcbind/$version/rpcbind-$version.tar.bz2"
-desc="Daemon to manage NFS and RPC connections"
-requires="bash libtirpc"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version 
-  fixbuilddirpermissions
-
-  applypatch $srcdir/0001-rpcinfo-Fix-stack-buffer-overflow.patch
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --bindir=/bin \
-    --sbindir=/bin \
-    --enable-warmstarts \
-    --with-statedir=/var/run/rpcbind \
-    --with-rpcuser=rpc \
-    --without-systemdsystemunitdir
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
-
-  install -Dm 644 $srcdir/rc.rpc $pkg/etc/rc.d/rc.rpc.new
-  install -Dm 644 $srcdir/rpc.default $pkg/etc/default/rpc.new
-
-  mkfinalpkg
-}
-
-sha512sums="
-e4f9ee36bd5b1b45ba65056fe57571ca5aa895f682bd8220b0fbc5f7d783fa125c40d67b90f934ee50bc11e16ca58fc74fe9b83dab3933dcc9067f60022a8735  rpcbind-1.2.5.tar.lz
-84289e99b918fd138e6327a39481e74c80581746087d2e7e55d0c0bdbe068875b6136a6296c0d24a1be01d54b38a9d446794a3d08b53e7d884804a2b375519a2  0001-rpcinfo-Fix-stack-buffer-overflow.patch
-"
diff --git a/net/x11vnc/x11vnc.SMBuild b/net/x11vnc/x11vnc.SMBuild
deleted file mode 100755
index bb42b6c..0000000
--- a/net/x11vnc/x11vnc.SMBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=x11vnc
-version=0.9.16
-build=1sml
-homepage="https://github.com/LibVNC/x11vnc"
-download="https://github.com/LibVNC/x11vnc/archive/refs/tags/$version.tar.gz"
-desc="VNC server for real X displays"
-requires="expat nettle openssl libgcrypt libgpg-error libjpeg-turbo libvncserver libxdamage libxinerama libxrandr libxtst avahi"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix=""
-
-  make
-  make install DESTDIR=$pkg
-
-  cp COPYING $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-b375149ef368c7e48abf8d854e38d94c8775624457addef418d7337df0651ae2a4070ff5002dad8fcefee165426a43983482c63b5c4594e91da71bbd1087b6e8  x11vnc-0.9.16.tar.lz
-"
diff --git a/net/x2x/x2x.SMBuild b/net/x2x/x2x.SMBuild
deleted file mode 100755
index a28f4d0..0000000
--- a/net/x2x/x2x.SMBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=x2x
-version=1.32
-build=2sml
-homepage="https://github.com/dottedmag/x2x"
-download=""
-desc="Utility that enables input devices on one X display to control another X display"
-requires="libx11 libxext libxi libxcb libxau libxdmcp libxtst"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-
-  ./bootstrap.sh
-}
-
-build() {
-  ./configure \
-    --prefix="" \
-    --docdir="/share/doc/$app-$version"
-
-  make 
-  make install DESTDIR=$pkg
-
-  mkfinalpkg
-}
-
-sha512sums="
-62da3a1ba19cef2349b97f1dd51af854b6447f1ca1d3e9ffb96ec185885f27bf1b65719222b73db8f5cf4b78f90e0cd0937d3d0c0d11ea151ccd05157cc70c07  x2x-1.32.tar.lz
-"
diff --git a/net/xdg-utils/doinst.sh b/net/xdg-utils/doinst.sh
deleted file mode 100644
index 4d72a96..0000000
--- a/net/xdg-utils/doinst.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-# Regarding xdg-open in /etc/mailcap:
-#
-# It turns out that xdg-open is not very smart about what it
-# passes off control to, leading to security problems where (for
-# example) a file could be provided on a web site as a PDF, but
-# rather than send it to a PDF viewer, xdg-open sends it to kfmclient
-# which uses a whole different set of criteria to determine what sort
-# of file it is.  It's trivial to make something that's detected as
-# a PDF at first, but then is executed as a .desktop file later,
-# resulting in the execution of arbitrary code as the user.
-#
-# This is not acceptable, and we see no way to fix it as long as
-# xdg-open passes off the resolution of the file type (again) to
-# something else.  In light of the potential security risks, we
-# will turn off the use of xdg-open if it appears to have been
-# added by a previous version of the xdg-utils package.
-#
-# Vulnerability code:  CVE-2009-0068
-
-# First, we will detect an automatically modified mailcap by
-# looking for the comment "# Sample xdg-open entries:"
-
-if [ -r etc/mailcap ]; then
-  if grep -q "^# Sample xdg-open entries:$" etc/mailcap ; then
-
-    COOKIE=$(usr/bin/mcookie)
-    if [ -z $COOKIE ]; then
-      exit 1
-    fi
-
-    # First, add a space to the end of the comment used to detect this
-    # junk so that we won't detect it again (in case the user decides
-    # to enable this themselves later on -- their call).  Add a warning
-    # about this type of xdg-open use being insecure.  Finally, comment
-    # out any lines like this.
-
-    echo "# Sample xdg-open entries: " > tmp/mailcap-$COOKIE
-    cat << EOF >> tmp/mailcap-$COOKIE
-#
-# NOTE:  Using xdg-open in /etc/mailcap in this way has been
-# shown to be insecure and is not recommended (CVE-2009-0068)!
-# A remote attacker can easily make a filetype such as a
-# .desktop script appear to xdg-open as a PDF file causing its
-# arbitrary contents to be executed.  Consider these to be
-# examples of what NOT to do.  The xdg-utils package no longer
-# adds any lines such as these to /etc/mailcap.
-#
-EOF
-    cat etc/mailcap \
-    | grep -v "# Sample xdg-open entries:" \
-    | sed -e 's/^audio\/\*; \/usr\/bin\/xdg-open %s/#audio\/\*; \/usr\/bin\/xdg-open %s/g' \
-    | sed -e 's/^image\/\*; \/usr\/bin\/xdg-open %s/#image\/\*; \/usr\/bin\/xdg-open %s/g' \
-    | sed -e 's/^application\/msword; \/usr\/bin\/xdg-open %s/#application\/msword; \/usr\/bin\/xdg-open %s/g' \
-    | sed -e 's/^application\/pdf; \/usr\/bin\/xdg-open %s/#application\/pdf; \/usr\/bin\/xdg-open %s/g' \
-    | sed -e 's/^application\/postscript ; \/usr\/bin\/xdg-open %s/#application\/postscript ; \/usr\/bin\/xdg-open %s/g' \
-    | sed -e 's/^text\/html; \/usr\/bin\/xdg-open %s ; copiousoutput/#text\/html; \/usr\/bin\/xdg-open %s ; copiousoutput/g' >> tmp/mailcap-$COOKIE
-
-    cat tmp/mailcap-$COOKIE > etc/mailcap
-    rm -f tmp/mailcap-$COOKIE
-
-  fi
-fi
-
-## BEGIN (HERE IS WHAT CAUSED THIS MESS):
-
-## Add some reasonable default values for xdg-open to /etc/mailcap,
-## since this is where many programs look for this information:
-#
-#if ! grep -q '# Sample xdg-open entries:' etc/mailcap 1> /dev/null 2> /dev/null ; then
-#  echo "# Sample xdg-open entries:" >> etc/mailcap
-#  echo >> etc/mailcap
-#fi
-#if ! grep -q 'audio/' etc/mailcap ; then
-#  echo 'audio/*; /usr/bin/xdg-open %s' >> etc/mailcap
-#  echo >> etc/mailcap
-#fi
-#if ! grep -q 'image/' etc/mailcap ; then
-#  echo 'image/*; /usr/bin/xdg-open %s' >> etc/mailcap
-#  echo >> etc/mailcap
-#fi
-#if ! grep -q 'application/msword' etc/mailcap ; then
-#  echo 'application/msword; /usr/bin/xdg-open %s' >> etc/mailcap
-#  echo >> etc/mailcap
-#fi
-#if ! grep -q 'application/pdf' etc/mailcap ; then
-#  echo 'application/pdf; /usr/bin/xdg-open %s' >> etc/mailcap
-#  echo >> etc/mailcap
-#fi
-#if ! grep -q 'application/postscript' etc/mailcap ; then
-#  echo 'application/postscript ; /usr/bin/xdg-open %s' >> etc/mailcap
-#  echo >> etc/mailcap
-#fi
-#if ! grep -q '#text/html' etc/mailcap ; then
-#  echo '#text/html; /usr/bin/xdg-open %s ; copiousoutput' >> etc/mailcap
-#  echo >> etc/mailcap
-#fi
-
-## END
-
diff --git a/net/xdg-utils/xdg-utils.SMBuild b/net/xdg-utils/xdg-utils.SMBuild
deleted file mode 100755
index 74661ac..0000000
--- a/net/xdg-utils/xdg-utils.SMBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: PktSurf <smlinux@pktsurf.in>
-app=xdg-utils
-version=1.1.3
-build=1sml
-homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-download="https://portland.freedesktop.org/download/xdg-utils-$version.tar.gz"
-desc="Command line tools that assist applications in desktop integration"
-requires="xmlto file docbook xset"
-
-prepbuilddir() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-}
-
-build() {
-  ./configure \
-    --prefix="" 
-
-  make
-  make install DESTDIR=$pkg 
-
-  cp LICENSE $pkgdocs/
-
-  mkfinalpkg
-}
-
-sha512sums="
-8b4bcb4167b094ee5cc59d9f2f61062f6d69e4d1d3ec38b199eaa2f83e4e96b7f9b126e7a67054e929f7edb31f1c0778f59c7e113b7a766e3327bc6d894582c8  xdg-utils-1.1.3.tar.lz
-"