diff --git a/net/aircrack-ng/aircrack-ng.SMBuild b/net/aircrack-ng/aircrack-ng.SMBuild
index d35d832..b5fbc54 100755
--- a/net/aircrack-ng/aircrack-ng.SMBuild
+++ b/net/aircrack-ng/aircrack-ng.SMBuild
@@ -2,7 +2,7 @@ app=aircrack-ng
 version=1.6
 build=1sml
 homepage="https://www.aircrack-ng.org"
-download="https://download.aircrack-ng.org/aircrack-ng-1.6.tar.gz"
+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"
 
diff --git a/net/autossh/autossh.SMBuild b/net/autossh/autossh.SMBuild
index be6953a..fa7ce01 100755
--- a/net/autossh/autossh.SMBuild
+++ b/net/autossh/autossh.SMBuild
@@ -2,7 +2,7 @@ app=autossh
 version=1.4g
 build=1sml
 homepage="http://www.harding.motd.ca/autossh/"
-download="https://www.harding.motd.ca/autossh/autossh-1.4g.tgz"
+download="https://www.harding.motd.ca/autossh/autossh-$version.tgz"
 desc="Utility to automatically restart SSH sessions and tunnels"
 requires="musl"
 
@@ -15,8 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make
   install -Dm 755 autossh $pkg/bin/autossh
diff --git a/net/avahi/avahi.SMBuild b/net/avahi/avahi.SMBuild
index 0ffb7aa..9eea0ca 100755
--- a/net/avahi/avahi.SMBuild
+++ b/net/avahi/avahi.SMBuild
@@ -1,8 +1,8 @@
 app=avahi
 version=0.8
-build=1sml
+build=2sml
 homepage="https://www.avahi.org/"
-download="http://avahi.org/download/avahi-0.8.tar.gz"
+download="http://avahi.org/download/avahi-$version.tar.gz"
 desc="Implementation of service discovery aka zeroconf"
 requires="glib dbus expat gdbm libcap libdaemon libevent"
 
@@ -38,7 +38,6 @@ build() {
     --with-autoipd-group=avahi \
     --enable-compat-libdns_sd
 
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make || true
   cd avahi-ui && make LDFLAGS="-L../avahi-glib" LIBS="-lavahi-glib" && cd ..
   make install DESTDIR=$pkg 
@@ -50,4 +49,4 @@ build() {
 
 sha512sums="
 ca04bfa9d493432d8e8f3bc074b7c10ad871941d14ccffe1cc8a0db70b73dce0741456a45ae64e13d2df2a7381654388db3c67d479404902b3df05f3a05d56b1  avahi-0.8.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/balsa/balsa.SMBuild b/net/balsa/balsa.SMBuild
index e529c8c..15e14c6 100755
--- a/net/balsa/balsa.SMBuild
+++ b/net/balsa/balsa.SMBuild
@@ -2,7 +2,7 @@ app=balsa
 version=2.5.11
 build=1sml
 homepage="https://pawsa.fedorapeople.org/balsa/"
-download="https://pawsa.fedorapeople.org/balsa/balsa-2.5.11.tar.bz2"
+download="https://pawsa.fedorapeople.org/balsa/balsa-$version.tar.bz2"
 desc="GTK+3 mail client with support for GPG"
 requires="gcc-libs pcre netbsd-curses libpng libical libnotify gnutls libgpg-error sqlite icu libogg libvorbis gtk3 graphite2 webkitgtk"
 
diff --git a/net/bindutils/bindutils.SMBuild b/net/bindutils/bindutils.SMBuild
index 8537c24..f095dc4 100755
--- a/net/bindutils/bindutils.SMBuild
+++ b/net/bindutils/bindutils.SMBuild
@@ -2,7 +2,7 @@ app=bindutils
 version=9.16.2
 build=1sml
 homepage="https://www.isc.org/bind/"
-download="https://ftp.isc.org/isc/bind9/9.16.2/bind-9.16.2.tar.xz"
+download="https://ftp.isc.org/isc/bind9/$version/bind-$version.tar.xz"
 desc="domain utility collection packaged separately from BIND source"
 requires="libxml2 openssl libuv"
 
diff --git a/net/bwm-ng/bwm-ng.SMBuild b/net/bwm-ng/bwm-ng.SMBuild
index 5f09027..eee03b1 100755
--- a/net/bwm-ng/bwm-ng.SMBuild
+++ b/net/bwm-ng/bwm-ng.SMBuild
@@ -2,7 +2,7 @@ app=bwm-ng
 version=0.6.1
 build=1sml
 homepage="https://github.com/vgropp/bwm-ng"
-download="https://github.com/vgropp/bwm-ng/archive/refs/tags/v0.6.1.tar.gz"
+download="https://github.com/vgropp/bwm-ng/archive/refs/tags/v$version.tar.gz"
 desc="Console-based live network and disk io bandwidth monitor for Linux" 
 requires="netbsd-curses"
 
diff --git a/net/cgit/cgit.SMBuild b/net/cgit/cgit.SMBuild
index 092a339..f2babc0 100755
--- a/net/cgit/cgit.SMBuild
+++ b/net/cgit/cgit.SMBuild
@@ -1,9 +1,9 @@
 app=cgit
 version=1.2.3
-GITV=2.28.1
+gitv=2.28.1
 build=1sml
 homepage="https://git.zx2c4.com/cgit/about/"
-download="https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz"
+download="https://git.zx2c4.com/cgit/snapshot/cgit-$version.tar.xz"
 desc="CGI web frontend for git repositories written in C"
 requires="zlib git"
 
@@ -18,7 +18,7 @@ build() {
   export NO_LUA=1
   export NO_REGEX=NeedsStartEnd
   [ -d git ] && rm -rf git
-  tar -xf "$srcdir/git-$GITV.tar.lz" && mv git-$GITV git
+  tar -xf "$srcdir/git-$gitv.tar.lz" && mv git-$gitv git
 
   make
   make install prefix="/" DESTDIR="$pkg"
diff --git a/net/cifs-utils/cifs-utils.SMBuild b/net/cifs-utils/cifs-utils.SMBuild
index 85c1d0f..23624f6 100755
--- a/net/cifs-utils/cifs-utils.SMBuild
+++ b/net/cifs-utils/cifs-utils.SMBuild
@@ -2,7 +2,7 @@ app=cifs-utils
 version=6.8
 build=1sml
 homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
-download="https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.8.tar.bz2"
+download="https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-$version.tar.bz2"
 desc="Utilities for managing CIFS filesystems"
 requires="libcap"
 
diff --git a/net/comgt/comgt.SMBuild b/net/comgt/comgt.SMBuild
index e4a5fe6..91b8a7c 100755
--- a/net/comgt/comgt.SMBuild
+++ b/net/comgt/comgt.SMBuild
@@ -2,7 +2,7 @@ app=comgt
 version=0.32
 build=1sml
 homepage="https://sourceforge.net/projects/comgt"
-download="https://sourceforge.net/projects/comgt/files/comgt/0.32/comgt.0.32.tgz"
+download="https://sourceforge.net/projects/comgt/files/comgt/$version/comgt.$version.tgz"
 desc="Utility to interact with 2G, 3G and LTE modems via standard AT command set"
 requires="musl"
 
diff --git a/net/conky/conky.SMBuild b/net/conky/conky.SMBuild
index 88d2628..1a8d476 100755
--- a/net/conky/conky.SMBuild
+++ b/net/conky/conky.SMBuild
@@ -2,7 +2,7 @@ app=conky
 version=1.11.6
 build=1sml
 homepage="https://github.com/brndnmtthws/conky"
-download="https://github.com/brndnmtthws/conky/archive/refs/tags/v1.11.6.tar.gz"
+download="https://github.com/brndnmtthws/conky/archive/refs/tags/v$version.tar.gz"
 desc="Light-weight system monitor for X"
 requires="curl lua toluapp imlib2 xorg-server"
 
diff --git a/net/cups-filters/cups-filters.SMBuild b/net/cups-filters/cups-filters.SMBuild
index f119e56..8fc2b8e 100755
--- a/net/cups-filters/cups-filters.SMBuild
+++ b/net/cups-filters/cups-filters.SMBuild
@@ -2,7 +2,7 @@ app=cups-filters
 version=1.9.0
 build=1sml
 homepage="https://www.openprinting.org"
-download="https://www.openprinting.org/download/cups-filters/cups-filters-1.9.0.tar.xz"
+download="https://www.openprinting.org/download/cups-filters/cups-filters-$version.tar.xz"
 desc="Backends and filters for CUPS"
 requires="dejavu-fonts-ttf libwebp libidn libtasn1 nettle libjpeg-turbo gobject-introspection pcre netbsd-curses glib gmp gnutls zlib imagemagick lcms2 cups poppler qpdf python3"
 
diff --git a/net/cups/cups.SMBuild b/net/cups/cups.SMBuild
index 409563f..4bad139 100755
--- a/net/cups/cups.SMBuild
+++ b/net/cups/cups.SMBuild
@@ -2,7 +2,7 @@ app=cups
 version=2.1.4
 build=1sml
 homepage="http://www.cups.org/"
-download="https://github.com/apple/cups/releases/download/release-2.1.4/cups-2.1.4-source.tar.gz"
+download="https://github.com/apple/cups/releases/download/release-$version/cups-$version-source.tar.gz"
 desc="Common UNIX Printing System"
 requires="perl openssl gnutls dbus"
 
diff --git a/net/dnsmasq/dnsmasq.SMBuild b/net/dnsmasq/dnsmasq.SMBuild
index f9036b3..67b2601 100755
--- a/net/dnsmasq/dnsmasq.SMBuild
+++ b/net/dnsmasq/dnsmasq.SMBuild
@@ -2,7 +2,7 @@ app=dnsmasq
 version=2.85
 build=1sml
 homepage="https://thekelleys.org.uk/dnsmasq/doc.html"
-download="https://thekelleys.org.uk/dnsmasq/dnsmasq-2.85.tar.xz"
+download="https://thekelleys.org.uk/dnsmasq/dnsmasq-$version.tar.xz"
 desc="Lightweight DNS and DHCP server suitable for a small network"
 requires="musl"
 
diff --git a/net/dovecot/dovecot.SMBuild b/net/dovecot/dovecot.SMBuild
index a9fc85e..5bb96e7 100755
--- a/net/dovecot/dovecot.SMBuild
+++ b/net/dovecot/dovecot.SMBuild
@@ -2,7 +2,7 @@ app=dovecot
 version=2.2.36
 build=1sml
 homepage="https://www.dovecot.org/"
-download="https://dovecot.org/releases/2.2/dovecot-2.2.36.tar.gz"
+download="https://dovecot.org/releases/2.2/dovecot-$version.tar.gz"
 desc="Open-source IMAP and POP3 server written in C"
 requires="expat libcap"
 
diff --git a/net/dump1090/dump1090.SMBuild b/net/dump1090/dump1090.SMBuild
index b580b49..1ed1228 100755
--- a/net/dump1090/dump1090.SMBuild
+++ b/net/dump1090/dump1090.SMBuild
@@ -14,9 +14,7 @@ build() {
   fixbuilddirpermissions
 
   make
-
-  mkdir -p $pkg/bin
-  cp dump1090 view1090 $pkg/bin/
+  install -Dm 755 dump1090 $pkg/bin/dump1090
 
   cp README.md $srcdir/LICENSE $pkgdocs/
 
diff --git a/net/elinks/elinks.SMBuild b/net/elinks/elinks.SMBuild
index ce91aa4..c153dda 100755
--- a/net/elinks/elinks.SMBuild
+++ b/net/elinks/elinks.SMBuild
@@ -2,7 +2,7 @@ app=elinks
 version=0.15.0
 build=1sml
 homepage="https://github.com/rkd77/elinks"
-download="https://github.com/rkd77/elinks/archive/refs/tags/v0.15.0.tar.gz"
+download="https://github.com/rkd77/elinks/archive/refs/tags/v$version.tar.gz"
 desc="Full-featured text-mode web browser"
 requires="libidn expat zstd openssl lua53"
    
@@ -18,7 +18,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --enable-cgi \
     --disable-smb \
     --without-x \
@@ -36,5 +35,5 @@ build() {
 }
 
 sha512sums="
-e54f8ffe20577d7b82498ddeeb1fe3b10c3e4c88e01a84ea70fbf0f4689e0b44b7c7f17fe8a439ec2bb1fba817acfef9a47f2c93a55bf90af4018ac81f674c17  elinks-0.15.0.tar.gz
-"
+cb928671c922efed55ef2cc9e05c22dfb8d0a6787757d8f4d1373290c1c07670ba2cbbdad1092d6853fa9f4cee35eacbd901d9a8eac3d2e7b5a34baaa6b1105d  elinks-0.15.0.tar.lz
+"
\ No newline at end of file
diff --git a/net/ethtool/ethtool.SMBuild b/net/ethtool/ethtool.SMBuild
index 6eec1a4..07e623e 100755
--- a/net/ethtool/ethtool.SMBuild
+++ b/net/ethtool/ethtool.SMBuild
@@ -2,7 +2,7 @@ app=ethtool
 version=4.18
 build=1sml
 homepage="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
-download="https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-4.18.tar.xz"
+download="https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-$version.tar.xz"
 desc="Tool for examining and tuning a network interface"
 requires="musl"
 
@@ -14,7 +14,6 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-
   ./configure \
     --prefix="" \
     --sbindir=/bin 
diff --git a/net/evince/evince.SMBuild b/net/evince/evince.SMBuild
index e387fbf..41475ba 100755
--- a/net/evince/evince.SMBuild
+++ b/net/evince/evince.SMBuild
@@ -2,7 +2,7 @@ app=evince
 version=3.35.92
 build=1sml
 homepage="http://projects.gnome.org/evince/"
-download="https://download.gnome.org/sources/evince/3.35/evince-3.35.92.tar.xz"
+download="https://download.gnome.org/sources/evince/3.35/evince-$version.tar.xz"
 desc="Gtk-based document viewer with support for multiple formats"
 requires="libarchive python3 gtk3 libsecret gspell gst-plugins-base"
 
@@ -16,9 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --libdir=/lib \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-nautilus \
     --disable-static
 
diff --git a/net/fail2ban/fail2ban.SMBuild b/net/fail2ban/fail2ban.SMBuild
index d4c770d..6200a0e 100755
--- a/net/fail2ban/fail2ban.SMBuild
+++ b/net/fail2ban/fail2ban.SMBuild
@@ -2,7 +2,7 @@ app=fail2ban
 version=0.10.4
 build=1sml
 homepage="http://www.fail2ban.org/wiki/index.php/Main_Page"
-download="https://github.com/fail2ban/fail2ban/archive/refs/tags/0.10.4.tar.gz"
+download="https://github.com/fail2ban/fail2ban/archive/refs/tags/$version.tar.gz"
 desc="Log-based intrusion detection and prevention system written in Python"
 requires="python3"
 
@@ -18,7 +18,8 @@ build() {
   python setup.py install --prefix="" --root=$pkg
 
   # move config files to .new
-  ( cd $pkg/etc/fail2ban 
+  ( 
+    cd $pkg/etc/fail2ban 
     for file in $(find . -type f); do
      mv $file "$file.new"
     done
@@ -40,4 +41,4 @@ build() {
 sha512sums="
 7f07659c3d694cc5fa52a17aca20447f021766520e5234d3775edc0d51e5ff00507da3c76591b741d46b2452b3b9f14933802b9965fd6a9c7050cbacaa64cebb  fail2ban-0.10.4.tar.lz
 89c6e4bbb1a01f3f7601372bbd49d72dd6a17a58503cce30f754110cdc8b55fc80dfa21b5e97a16525bd80c7cae961af5024e5cca45d922245eeefa83cb54ef2  jail.conf.patch
-"
\ No newline at end of file
+"
diff --git a/net/fcgi/fcgi.SMBuild b/net/fcgi/fcgi.SMBuild
index 45cce5e..2ea3263 100755
--- a/net/fcgi/fcgi.SMBuild
+++ b/net/fcgi/fcgi.SMBuild
@@ -2,7 +2,7 @@ app=fcgi
 version=2.4.0
 build=1sml
 homepage="https://web-beta.archive.org/web/20160306034010/http://www.fastcgi.com:80/drupal/"
-download="https://sourceforge.net/projects/slackbuildsdirectlinks/files/fcgi/fcgi-2.4.0.tar.gz"
+download="https://sourceforge.net/projects/slackbuildsdirectlinks/files/fcgi/fcgi-$version.tar.gz"
 desc="Simple server and library implementin Fast CGI"
 requires="gcc-libs"
 
diff --git a/net/fcgiwrap/fcgiwrap.SMBuild b/net/fcgiwrap/fcgiwrap.SMBuild
index 624712a..5f39182 100755
--- a/net/fcgiwrap/fcgiwrap.SMBuild
+++ b/net/fcgiwrap/fcgiwrap.SMBuild
@@ -2,7 +2,7 @@ app=fcgiwrap
 version=1.1.0
 build=1sml
 homepage="https://github.com/gnosek/fcgiwrap"
-download="https://github.com/gnosek/fcgiwrap/archive/refs/tags/1.1.0.tar.gz"
+download="https://github.com/gnosek/fcgiwrap/archive/refs/tags/$version.tar.gz"
 desc="Simple FastCGI wrapper for CGI scripts"
 requires="fcgi"
 
diff --git a/net/foxtrotgps/foxtrotgps.SMBuild b/net/foxtrotgps/foxtrotgps.SMBuild
index f00867e..6db6d6e 100755
--- a/net/foxtrotgps/foxtrotgps.SMBuild
+++ b/net/foxtrotgps/foxtrotgps.SMBuild
@@ -2,7 +2,7 @@ app=foxtrotgps
 version=1.2.2
 build=1sml
 homepage="https://www.foxtrotgps.org/"
-download="https://www.foxtrotgps.org/releases/foxtrotgps-1.2.2.tar.xz"
+download="https://www.foxtrotgps.org/releases/foxtrotgps-$version.tar.xz"
 desc="Lightweight mapping application in GTK+"
 requires="gpsd"
 
@@ -18,8 +18,7 @@ build() {
   applypatch $srcdir/fix-timespec.patch
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix="" 
 
   make
   make install DESTDIR=$pkg 
diff --git a/net/fping/fping.SMBuild b/net/fping/fping.SMBuild
index a78e83b..82963b9 100755
--- a/net/fping/fping.SMBuild
+++ b/net/fping/fping.SMBuild
@@ -2,7 +2,7 @@ app=fping
 version=4.2
 build=1sml
 homepage="https://fping.org/"
-download="https://fping.org/dist/fping-4.2.tar.gz"
+download="https://fping.org/dist/fping-$version.tar.gz"
 desc="Network ping utility with better performance than traditional ping"
 requires="musl"
 
diff --git a/net/geoclue/geoclue.SMBuild b/net/geoclue/geoclue.SMBuild
index 082b722..0763fac 100755
--- a/net/geoclue/geoclue.SMBuild
+++ b/net/geoclue/geoclue.SMBuild
@@ -2,7 +2,7 @@ app=geoclue
 version=2.5.7
 build=1sml
 homepage="https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home"
-download="https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.5.7/geoclue-2.5.7.tar.bz2"
+download="https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/$version/geoclue-$version.tar.bz2"
 desc="D-Bus service for providing location information"
 requires="glib gobject-introspection"
 
diff --git a/net/geocode-glib/geocode-glib.SMBuild b/net/geocode-glib/geocode-glib.SMBuild
index 419f807..6762bb0 100755
--- a/net/geocode-glib/geocode-glib.SMBuild
+++ b/net/geocode-glib/geocode-glib.SMBuild
@@ -2,7 +2,7 @@ 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/3.26.2/geocode-glib-3.26.2.tar.bz2"
+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"
 
@@ -30,4 +30,4 @@ build() {
 
 sha512sums="
 ed2c8ad4bdb3851db64ec748ed66906f3cb13a0158176029ff856caba3ebbad4258228f2f53292d68b9929ba66d4e0656c21817c24f62d21fa78b523c3ecbcc3  geocode-glib-3.26.2.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/gpsd/gpsd.SMBuild b/net/gpsd/gpsd.SMBuild
index 5351813..e277591 100755
--- a/net/gpsd/gpsd.SMBuild
+++ b/net/gpsd/gpsd.SMBuild
@@ -2,7 +2,7 @@ app=gpsd
 version=3.21
 build=1sml
 homepage="https://gpsd.gitlab.io/gpsd/"
-download="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.21.tar.xz"
+download="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-$version.tar.xz"
 desc="GPS daemon for serving navigational software"
 requires="libusb eudev bluez"
 
@@ -17,8 +17,12 @@ build() {
   applypatch $srcdir/gpsd-use-local-timepps-header.patch
   cp $srcdir/timepps.h . 
 
-  CPPFLAGS="-I. -DHAVE_SYS_TIMEPPS_H" 
-  scons prefix="/" sbindir="/bin" qt=no systemd=no 
+  CPPFLAGS="-I. -DHAVE_SYS_TIMEPPS_H" \
+  scons prefix="/" \
+    sbindir="/bin" \
+    qt=no \
+    systemd=no 
+
   DESTDIR=$pkg scons install
 
   mkfinalpkg
diff --git a/net/gtk-vnc/gtk-vnc.SMBuild b/net/gtk-vnc/gtk-vnc.SMBuild
index 88ae54c..3250aad 100755
--- a/net/gtk-vnc/gtk-vnc.SMBuild
+++ b/net/gtk-vnc/gtk-vnc.SMBuild
@@ -2,7 +2,7 @@ app=gtk-vnc
 version=1.0.0
 build=1sml
 homepage="https://wiki.gnome.org/Projects/gtk-vnc"
-download="https://download.gnome.org/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz"
+download="https://download.gnome.org/sources/gtk-vnc/1.0/gtk-vnc-$version.tar.xz"
 desc="VNC viewer widget for GTK"
 requires="gtk3 gnutls libgcrypt"
 
diff --git a/net/hexchat/hexchat.SMBuild b/net/hexchat/hexchat.SMBuild
index a76548b..780c585 100755
--- a/net/hexchat/hexchat.SMBuild
+++ b/net/hexchat/hexchat.SMBuild
@@ -2,7 +2,7 @@ app=hexchat
 version=2.12.4
 build=2sml
 homepage="https://hexchat.github.io/"
-download="https://dl.hexchat.net/hexchat/hexchat-2.12.4.tar.xz"
+download="https://dl.hexchat.net/hexchat/hexchat-$version.tar.xz"
 desc="Modern GTK+ IRC client"
 requires="intltool iso-codes netbsd-curses perl glib desktop-file-utils enchant openssl libnotify libcanberra gtk2 dbus-glib python3 pango"
 
@@ -21,7 +21,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --enable-openssl \
     --enable-textfe \
     --disable-lua \
diff --git a/net/hostapd/hostapd.SMBuild b/net/hostapd/hostapd.SMBuild
index c84767d..35c597a 100755
--- a/net/hostapd/hostapd.SMBuild
+++ b/net/hostapd/hostapd.SMBuild
@@ -2,7 +2,7 @@ app=hostapd
 version=2.9
 build=1sml
 homepage="https://w1.fi/hostapd/"
-download="https://w1.fi/releases/hostapd-2.9.tar.gz"
+download="https://w1.fi/releases/hostapd-$version.tar.gz"
 desc="User space daemon for wifi authentication"
 requires="libnl openssl"
 
diff --git a/net/hostname/hostname.SMBuild b/net/hostname/hostname.SMBuild
index 88f7146..ed3debc 100755
--- a/net/hostname/hostname.SMBuild
+++ b/net/hostname/hostname.SMBuild
@@ -14,10 +14,16 @@ build() {
   fixbuilddirpermissions
 
   make
-  make install BINDIR="$pkg"/bin/ 
-
+  install -Dm 755 hostname $pkg/bin/hostname
   install -Dm 644 hostname.1 $pkg/share/man/man1/hostname.1
 
+  (
+    cd $pkg/bin
+    for name in dnsdomainname domainname ypdomainname nisdomainname ; do
+      ln -sf hostname $name
+    done
+  )
+
   cp COPYRIGHT $pkgdocs/
 
   mkfinalpkg
diff --git a/net/ifstat/ifstat.SMBuild b/net/ifstat/ifstat.SMBuild
index 477c88e..13fbe14 100755
--- a/net/ifstat/ifstat.SMBuild
+++ b/net/ifstat/ifstat.SMBuild
@@ -2,7 +2,7 @@ app=ifstat
 version=1.1
 build=1sml
 homepage="http://gael.roualland.free.fr/ifstat/"
-download="http://gael.roualland.free.fr/ifstat/ifstat-1.1.tar.gz"
+download="http://gael.roualland.free.fr/ifstat/ifstat-$version.tar.gz"
 desc="tiny real-time interface monitoring application"
 requires="musl"
 
diff --git a/net/iftop/iftop.SMBuild b/net/iftop/iftop.SMBuild
index a8618eb..e0a4688 100755
--- a/net/iftop/iftop.SMBuild
+++ b/net/iftop/iftop.SMBuild
@@ -2,7 +2,7 @@ app=iftop
 version=0.17
 build=1sml
 homepage="https://www.ex-parrot.com/pdw/iftop/"
-download="https://www.ex-parrot.com/pdw/iftop/download/iftop-0.17.tar.gz"
+download="https://www.ex-parrot.com/pdw/iftop/download/iftop-$version.tar.gz"
 desc="Curses-based network interface monitoring application"
 requires="netbsd-curses libpcap"
 
@@ -30,4 +30,4 @@ build() {
 
 sha512sums="
 9bf6d32ad9e977a01f5e39e6bf2f7710a5d2c867959da67c734506edf152320de00d6dae0954a9b479862aaf2c83599566325e300f7db27180acbbdbf096f29e  iftop-0.17.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/iperf/iperf.SMBuild b/net/iperf/iperf.SMBuild
index cd73a3b..827e5f8 100755
--- a/net/iperf/iperf.SMBuild
+++ b/net/iperf/iperf.SMBuild
@@ -2,7 +2,7 @@ app=iperf
 version=3.7
 build=1sml
 homepage="https://github.com/esnet/iperf"
-download="https://github.com/esnet/iperf/archive/refs/tags/3.7.tar.gz"
+download="https://github.com/esnet/iperf/archive/refs/tags/$version.tar.gz"
 desc="Network utility for measuring TCP and UDP bandwidth performance"
 requires="openssl"
 
diff --git a/net/iproute2/iproute2.SMBuild b/net/iproute2/iproute2.SMBuild
index ea97c10..63740b1 100755
--- a/net/iproute2/iproute2.SMBuild
+++ b/net/iproute2/iproute2.SMBuild
@@ -2,7 +2,7 @@ app=iproute2
 version=4.20.0
 build=1sml
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
-download="https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.20.0.tar.xz"
+download="https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/iproute2-$version.tar.xz"
 desc="Advanced IP routing utilities for the linux kernel"
 requires="musl"
 
diff --git a/net/ipset/ipset.SMBuild b/net/ipset/ipset.SMBuild
index 6ad32e9..a1ac42d 100755
--- a/net/ipset/ipset.SMBuild
+++ b/net/ipset/ipset.SMBuild
@@ -2,7 +2,7 @@ app=ipset
 version=7.11
 build=1sml
 homepage="http://ipset.netfilter.org/"
-download="https://ipset.netfilter.org/ipset-7.11.tar.bz2"
+download="https://ipset.netfilter.org/ipset-$version.tar.bz2"
 desc="High-performance IP hashing and administration tool for kernel IP sets"
 requires="musl kernel-source"
 
diff --git a/net/iputils/iputils.SMBuild b/net/iputils/iputils.SMBuild
index 90c0bcb..c13a962 100755
--- a/net/iputils/iputils.SMBuild
+++ b/net/iputils/iputils.SMBuild
@@ -2,7 +2,7 @@ app=iputils
 version=s20180629
 build=1sml
 homepage="https://github.com/iputils/iputils"
-download="https://github.com/iputils/iputils/archive/refs/tags/s20180629.tar.gz"
+download="https://github.com/iputils/iputils/archive/refs/tags/$version.tar.gz"
 desc="Collection of common network tools"
 requires="libcap iptables"
 
diff --git a/net/irssi/irssi.SMBuild b/net/irssi/irssi.SMBuild
index 222ca65..dafb1b0 100755
--- a/net/irssi/irssi.SMBuild
+++ b/net/irssi/irssi.SMBuild
@@ -2,7 +2,7 @@ app=irssi
 version=1.2.2
 build=1sml
 homepage="https://irssi.org"
-download="https://github.com/irssi/irssi/archive/refs/tags/1.2.2.tar.gz"
+download="https://github.com/irssi/irssi/archive/refs/tags/$version.tar.gz"
 desc="Modular, expandable text-mode IRC client" 
 requires="netbsd-curses glib openssl perl"
 
@@ -17,8 +17,7 @@ build() {
 
   LDFLAGS="-lcurses -lterminfo" \
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make
   make install DESTDIR=$pkg
diff --git a/net/iw/iw.SMBuild b/net/iw/iw.SMBuild
index 530a8f5..f038a3e 100755
--- a/net/iw/iw.SMBuild
+++ b/net/iw/iw.SMBuild
@@ -2,7 +2,7 @@ app=iw
 version=4.14
 build=1sml
 homepage="http://wireless.kernel.org/en/users/Documentation/iw"
-download="https://mirrors.edge.kernel.org/pub/software/network/iw/iw-4.14.tar.xz"
+download="https://mirrors.edge.kernel.org/pub/software/network/iw/$version.tar.xz"
 desc="Tool for configuring Linux wireless devices"
 requires="libnl"
 
diff --git a/net/lftp/lftp.SMBuild b/net/lftp/lftp.SMBuild
index 183889d..68cf5ce 100755
--- a/net/lftp/lftp.SMBuild
+++ b/net/lftp/lftp.SMBuild
@@ -2,7 +2,7 @@ app=lftp
 version=4.9.1
 build=1sml
 homepage="https://lftp.yar.ru/"
-download="https://lftp.yar.ru/ftp/lftp-4.9.1.tar.xz"
+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"
 
diff --git a/net/libhandy/libhandy.SMBuild b/net/libhandy/libhandy.SMBuild
index 03c435b..edfa7ef 100755
--- a/net/libhandy/libhandy.SMBuild
+++ b/net/libhandy/libhandy.SMBuild
@@ -2,7 +2,7 @@ app=libhandy
 version=1.4.0
 build=1sml
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
-download="https://gitlab.gnome.org/GNOME/libhandy/-/archive/1.4.0/libhandy-1.4.0.tar.bz2"
+download="https://gitlab.gnome.org/GNOME/libhandy/-/archive/$version/libhandy-$version.tar.bz2"
 desc="Collection of GTK+ widgets for mobile phones"
 requires="webkitgtk libdazzle"
    
@@ -29,4 +29,4 @@ build() {
 
 sha512sums="
 d610524a88d49fb18c006fde812ee5b639914aae73638cd9ec6462f80ff26e791defb365b60afb63e86696d01d495f302e41f499e402da114efc262e94a3be78  libhandy-1.4.0.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/libmicrohttpd/libmicrohttpd.SMBuild b/net/libmicrohttpd/libmicrohttpd.SMBuild
index 3da793e..4e66027 100755
--- a/net/libmicrohttpd/libmicrohttpd.SMBuild
+++ b/net/libmicrohttpd/libmicrohttpd.SMBuild
@@ -2,7 +2,7 @@ app=libmicrohttpd
 version=0.9.66
 build=1sml
 homepage="https://www.gnu.org/software/libmicrohttpd/"
-download="https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.66.tar.gz"
+download="https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$version.tar.gz"
 desc="Compact C library providing implementation of the HTTP 1.0 and 1.1 web server"
 requires="curl"
 
@@ -14,7 +14,6 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  CPPFLAGS="$CFLAGS -D_GNU_SOURCE" \
   ./configure \
     --prefix="" \
     --disable-static \
@@ -30,5 +29,5 @@ build() {
 }
 
 sha512sums="
-59cc56a9511d9d1c05647a57d920a16d0aaa0d0523d0241ceb88641d18bd95fdb3bb5a60fd648ac54a6f4323a673a3145e520a2fe9e124e78973ff6dac3ad89a  libmicrohttpd-0.9.66.tar.gz
+29d6de85d6b3c446962756d337084cc80258ad6f715621047a3d1c4939997d4c0a661d7e403096a6ffdc54b7c94ad699128339cb97a04d73666373ff133ce65d  libmicrohttpd-0.9.66.tar.lz
 "
diff --git a/net/macchanger/macchanger.SMBuild b/net/macchanger/macchanger.SMBuild
index 5843575..688f7c6 100755
--- a/net/macchanger/macchanger.SMBuild
+++ b/net/macchanger/macchanger.SMBuild
@@ -2,7 +2,7 @@ app=macchanger
 version=1.7.0
 build=1sml
 homepage="https://github.com/alobbs/macchanger"
-download="https://github.com/alobbs/macchanger/archive/refs/tags/1.7.0.tar.gz"
+download="https://github.com/alobbs/macchanger/archive/refs/tags/$version.tar.gz"
 desc="Utility for viewing and manipulating MAC addresses of network interfaces"
 requires="musl"
 
diff --git a/net/mailcheck/mailcheck.SMBuild b/net/mailcheck/mailcheck.SMBuild
index a0a04f3..bf7ccc9 100755
--- a/net/mailcheck/mailcheck.SMBuild
+++ b/net/mailcheck/mailcheck.SMBuild
@@ -2,7 +2,7 @@ app=mailcheck
 version=1.91.2
 build=1sml
 homepage="http://mailcheck.sourceforge.net/"
-download="https://sourceforge.net/projects/mailcheck/files/mailcheck/1.91.2/mailcheck_1.91.2.tar.gz"
+download="https://sourceforge.net/projects/mailcheck/files/mailcheck/$version/mailcheck_$version.tar.gz"
 desc="Utility to show read and unread emails inside user directories"
 requires="musl"
 
@@ -26,4 +26,4 @@ build() {
 
 sha512sums="
 e80980993dd430eb5f04b330906e764b163a60c353baf0d4ee92009be6014667cbc93124049e39ecdb45b0980bd4c5bf3b8310ab30d8bc93331c94569acbe6a4  mailcheck-1.91.2.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/mariadb/mariadb.SMBuild b/net/mariadb/mariadb.SMBuild
index d7f4c8a..362bcec 100755
--- a/net/mariadb/mariadb.SMBuild
+++ b/net/mariadb/mariadb.SMBuild
@@ -2,7 +2,7 @@ app=mariadb
 version=10.6.7
 build=1sml
 homepage="http://mariadb.org/"
-download="https://archive.mariadb.org/mariadb-10.6.7/source/mariadb-10.6.7.tar.gz"
+download="https://archive.mariadb.org/mariadb-$version/source/mariadb-$version.tar.gz"
 desc="Drop-in replacement for the MySQL Database Server"
 requires="libxml2 zstd bzip2 cmake openssl zlib libaio netbsd-curses gcc-libs"
 
@@ -98,4 +98,4 @@ build() {
 
 sha512sums="
 fee9a8ce06266c7c27f937755c3ebba3b4926874d7040d45b9f692c008e518cb473bbe8f8ded4e6cb756ca0564d19b676d72e3e0a8c5ed95728cde901d8d2c20  mariadb-10.6.7.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/minicom/minicom.SMBuild b/net/minicom/minicom.SMBuild
index 71d5454..3b8b6be 100755
--- a/net/minicom/minicom.SMBuild
+++ b/net/minicom/minicom.SMBuild
@@ -2,7 +2,7 @@ app=minicom
 version=2.7.1
 build=1sml
 homepage="https://salsa.debian.org/minicom-team/minicom"
-download="https://salsa.debian.org/minicom-team/minicom/-/archive/v2.7.1/minicom-v2.7.1.tar.bz2"
+download="https://salsa.debian.org/minicom-team/minicom/-/archive/v$version/minicom-v$version.tar.bz2"
 desc="Text-mode utility for communicating with serial devices"
 requires="netbsd-curses"
 
@@ -17,8 +17,7 @@ build() {
   applypatch $srcdir/fix-includes.patch
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make
   make install DESTDIR=$pkg
diff --git a/net/minidlna/minidlna.SMBuild b/net/minidlna/minidlna.SMBuild
index db15ba0..7e4f2f6 100755
--- a/net/minidlna/minidlna.SMBuild
+++ b/net/minidlna/minidlna.SMBuild
@@ -2,7 +2,7 @@ app=minidlna
 version=1.2.1
 build=1sml
 homepage="https://sourceforge.net/projects/minidlna/"
-download="https://sourceforge.net/projects/minidlna/files/minidlna/1.2.1/minidlna-1.2.1.tar.gz"
+download="https://sourceforge.net/projects/minidlna/files/minidlna/$version/minidlna-$version.tar.gz"
 desc="DLNA and UPnP server"
 requires="flac libexif libid3tag libjpeg-turbo libvorbis sqlite ffmpeg"
 
@@ -40,4 +40,4 @@ build() {
 sha512sums="
 6a6613d7d92b13a5aa73fe19f218c73b4552ff062d9868efbd2d16b83d02b4a2f9dd8dea0d4ed4d6d9045845b63c1a6ddf2808e61586d53a1affb51fcb2077cb  minidlna-1.2.1.tar.lz
 59a97ef0a36d3ae44dd2e182a0b106f84ce5c17e7dc14ee0459b17430b57ddc59a74e8e67fc0a90326fa451a505b97a0b719b438475efac144028dd012b44af1  10-minidlna-nfo.patch
-"
\ No newline at end of file
+"
diff --git a/net/mktorrent/mktorrent.SMBuild b/net/mktorrent/mktorrent.SMBuild
index affbf7f..84050e1 100755
--- a/net/mktorrent/mktorrent.SMBuild
+++ b/net/mktorrent/mktorrent.SMBuild
@@ -2,7 +2,7 @@ app=mktorrent
 version=1.1
 build=1sml
 homepage="https://github.com/pobrn/mktorrent"
-download="https://github.com/pobrn/mktorrent/archive/refs/tags/v1.1.tar.gz"
+download="https://github.com/pobrn/mktorrent/archive/refs/tags/v$version.tar.gz"
 desc="Utility for creating torrent files used in bittorrent protocol"
 requires="openssl"
 
@@ -15,10 +15,11 @@ build() {
   fixbuilddirpermissions
   
   applypatch $srcdir/makefile.patch
+
   make 
+  install -Dm 755 mktorrent $pkg/bin/mktorrent
   
   cp COPYING $pkgdocs/
-  install -Dm 755 mktorrent $pkg/bin/mktorrent
 
   mkfinalpkg
 }
@@ -26,4 +27,4 @@ build() {
 sha512sums="
 d82e3bc32c256a1f204a97f9852d989f1812706fe90fb5a705db5bdf571dd6b1a315a75836d39965f67cad479aa7ef2e2c7b19e48a79411d6268edf22e40f57e  mktorrent-1.1.tar.lz
 3387b71fa334def8f8005629fe3509f8012da16e542bde679176fe5c8e7f71e3393e412ce637b234dac4071e899947d9fe6f2b6f79ed055a72f1af3791693030  makefile.patch
-"
\ No newline at end of file
+"
diff --git a/net/motion/motion.SMBuild b/net/motion/motion.SMBuild
index 1f2c4c8..0764f6d 100755
--- a/net/motion/motion.SMBuild
+++ b/net/motion/motion.SMBuild
@@ -2,7 +2,7 @@ app=motion
 version=4.2.2
 build=1sml
 homepage="https://motion-project.github.io/"
-download="https://github.com/Motion-Project/motion/archive/refs/tags/release-4.2.2.tar.gz"
+download="https://github.com/Motion-Project/motion/archive/refs/tags/release-$version.tar.gz"
 desc="Software-based camera motion detection utility"
 requires="bzip2 zlib gnutls sqlite libidn libtasn1 nettle libmicrohttpd libxext dbus sdl2 libwebp ffmpeg"
 
diff --git a/net/mtr/mtr.SMBuild b/net/mtr/mtr.SMBuild
index e91e906..9b14af6 100755
--- a/net/mtr/mtr.SMBuild
+++ b/net/mtr/mtr.SMBuild
@@ -2,7 +2,7 @@ app=mtr
 version=0.93
 build=1sml
 homepage="https://www.bitwizard.nl/mtr/"
-download="https://github.com/traviscross/mtr/archive/refs/tags/v0.93.tar.gz"
+download="https://github.com/traviscross/mtr/archive/refs/tags/v$version.tar.gz"
 desc="Combined traceroute and ping utility for diagnosing networks problems"
 requires="netbsd-curses gtk2"
 
diff --git a/net/mutt/mutt.SMBuild b/net/mutt/mutt.SMBuild
index 61f372c..aec065a 100755
--- a/net/mutt/mutt.SMBuild
+++ b/net/mutt/mutt.SMBuild
@@ -2,9 +2,9 @@ app=mutt
 version=1.10.1
 build=1sml
 homepage="https://www.mutt.org"
-download="http://ftp.mutt.org/pub/mutt/mutt-1.10.1.tar.gz"
+download="http://ftp.mutt.org/pub/mutt/mutt-$version.tar.gz"
 desc="Advanced text-mode mail client"
-requires="netbsd-curses zlib libidn openssl cyrus-sasl "
+requires="netbsd-curses zlib libidn openssl cyrus-sasl"
 
 build() {
   mkandenterbuilddir
@@ -14,7 +14,6 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  CPPFLAGS="$CFLAGS -D_GNU_SOURCE" \
   LDFLAGS="-lterminfo" \
   ./configure \
     --prefix="" \
diff --git a/net/net-snmp/net-snmp.SMBuild b/net/net-snmp/net-snmp.SMBuild
index f3f3e42..be21d99 100755
--- a/net/net-snmp/net-snmp.SMBuild
+++ b/net/net-snmp/net-snmp.SMBuild
@@ -2,7 +2,7 @@ app=net-snmp
 version=5.8
 build=2sml
 homepage="http://www.net-snmp.org/"
-download="https://sourceforge.net/projects/net-snmp/files/net-snmp/5.8/net-snmp-5.8.tar.gz"
+download="https://sourceforge.net/projects/net-snmp/files/net-snmp/$version/net-snmp-$version.tar.gz"
 desc="Collection of tools for implementing SNMP version 1 and up"
 requires="libpcap pcre python3"
 # net-snmp does not like our custom config.cache
diff --git a/net/netcat/netcat.SMBuild b/net/netcat/netcat.SMBuild
index 8116715..56801da 100755
--- a/net/netcat/netcat.SMBuild
+++ b/net/netcat/netcat.SMBuild
@@ -1,6 +1,10 @@
 app=netcat
 version=1.10
 build=1sml
+homepage="https://salsa.debian.org/debian/netcat"
+download="https://salsa.debian.org/debian/netcat/-/archive/upstream/$version/netcat-upstream-$version.tar.bz2"
+desc="Utility to read and write data across network connections"
+requires="openssl libpcap"
 
 build() {
   mkandenterbuilddir
@@ -24,10 +28,6 @@ build() {
   mkfinalpkg
 }
 
-homepage="https://salsa.debian.org/debian/netcat"
-download="https://salsa.debian.org/debian/netcat/-/archive/upstream/1.10/netcat-upstream-1.10.tar.bz2"
-desc="Utility to read and write data across network connections"
-requires="openssl libpcap"
 sha512sums="
 80359fc233f1f5dd450cb15a496f733fd4d7b65087f4f54474d2307b316282b8faf3e54f80caad847bbfd703d6197e5053dd7b8b4ef28fe0c34ed6b81c294733  nc-110.tar.xz
 457b3e91d0daffd22c22dc0a7b7289d8cfc896d7356efce5a97fc7c09633b8a647a5515bf0881af0626bf512750735fb8f7baf0ca04c609ae51fd94bb8ab6874  nc-110-21.diff
diff --git a/net/nfs-utils/nfs-utils.SMBuild b/net/nfs-utils/nfs-utils.SMBuild
index 99e0018..7a2a0f2 100755
--- a/net/nfs-utils/nfs-utils.SMBuild
+++ b/net/nfs-utils/nfs-utils.SMBuild
@@ -2,7 +2,7 @@ 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/2.5.1/nfs-utils-2.5.1.tar.xz"
+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"
 
diff --git a/net/nginx/nginx.SMBuild b/net/nginx/nginx.SMBuild
index c427b61..5010c74 100755
--- a/net/nginx/nginx.SMBuild
+++ b/net/nginx/nginx.SMBuild
@@ -2,7 +2,7 @@ app=nginx
 version=1.17.3
 build=2sml
 homepage="http://nginx.org"
-download="http://nginx.org/download/nginx-1.17.3.tar.gz"
+download="http://nginx.org/download/nginx-$version.tar.gz"
 desc="High-performance HTTP server with support for IMAP3 and POP3 proxies"
 requires="zlib pcre openssl"
 
@@ -53,4 +53,4 @@ build() {
 
 sha512sums="
 e2121f346bda491adb16b4120d93f95ab260ceb35376a204769490aee0dfeeaf44eca0f5ab652a6aeecc4a95e1081a3364bcf60992aa97e2fb082b9ba1a5316b  nginx-1.17.3.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/nload/nload.SMBuild b/net/nload/nload.SMBuild
index 9a5c799..50095b0 100755
--- a/net/nload/nload.SMBuild
+++ b/net/nload/nload.SMBuild
@@ -2,7 +2,7 @@ app=nload
 version=0.7.4
 build=1sml
 homepage="https://sourceforge.net/projects/nload/"
-download="https://sourceforge.net/projects/nload/files/nload/0.7.4/nload-0.7.4.tar.gz"
+download="https://sourceforge.net/projects/nload/files/nload/$version/nload-$version.tar.gz"
 desc="Text-mode network traffic and bandwidth monitor"
 requires="gcc-libs netbsd-curses"
 
diff --git a/net/nmap/nmap.SMBuild b/net/nmap/nmap.SMBuild
index 39c8df0..e06a788 100755
--- a/net/nmap/nmap.SMBuild
+++ b/net/nmap/nmap.SMBuild
@@ -2,7 +2,7 @@ app=nmap
 version=7.40
 build=1sml
 homepage="https://nmap.org/"
-download="https://nmap.org/dist/nmap-7.40.tar.bz2"
+download="https://nmap.org/dist/nmap-$version.tar.bz2"
 desc="Advanced network exploration and security auditing tool"
 requires="gcc-libs pcre libpcap openssl python3"
 
diff --git a/net/openntpd/openntpd.SMBuild b/net/openntpd/openntpd.SMBuild
index f81344c..da951b0 100755
--- a/net/openntpd/openntpd.SMBuild
+++ b/net/openntpd/openntpd.SMBuild
@@ -2,7 +2,7 @@ app=openntpd
 version=6.2p3
 build=1sml
 homepage="https://www.openntpd.org/"
-download="https://cdn.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-6.2p3.tar.gz"
+download="https://cdn.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-$version.tar.gz"
 desc="Secure NTPD implementation from OpenBSD developers"
 requires="openssl"
 
diff --git a/net/openssh/openssh.SMBuild b/net/openssh/openssh.SMBuild
index a82f361..b83a5aa 100755
--- a/net/openssh/openssh.SMBuild
+++ b/net/openssh/openssh.SMBuild
@@ -2,7 +2,7 @@ app=openssh
 version=8.1p1
 build=1sml
 homepage="https://www.openssh.com/"
-download="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.1p1.tar.gz"
+download="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$version.tar.gz"
 desc="Client-server implementation of the SSH protocol suite"
 requires="zlib openssl"
 
@@ -56,4 +56,4 @@ build() {
 sha512sums="
 f1069dbef01e86d671d4a6d78955995dcc3956d067d08b44a6b2f86b5805ef8304fa54ac36cf7a92365a1d919e99475c460615fe3ef678ff183015961e77366a  openssh-8.1p1.tar.lz
 c5a3b4382c0f63c1246e2113ee28cb18906fefef7ddffaf98552bb14f3348e42b4e18c14e21919dddfab274a5645947b0aaad190fde514ec12410c74ffeac568  openssh-sys_param.patch
-"
\ No newline at end of file
+"
diff --git a/net/openvpn/openvpn.SMBuild b/net/openvpn/openvpn.SMBuild
index cd0eb77..dc10f0c 100755
--- a/net/openvpn/openvpn.SMBuild
+++ b/net/openvpn/openvpn.SMBuild
@@ -2,7 +2,7 @@ app=openvpn
 version=2.4.9
 build=1sml
 homepage="https://openvpn.net/"
-download="https://github.com/OpenVPN/openvpn/archive/refs/tags/v2.4.9.tar.gz"
+download="https://github.com/OpenVPN/openvpn/archive/refs/tags/v$version.tar.gz"
 desc="Full-featured SSL-based VPN suite"
 requires="lzo lz4 openssl"
 
diff --git a/net/php/php.SMBuild b/net/php/php.SMBuild
index 842448d..67498ab 100755
--- a/net/php/php.SMBuild
+++ b/net/php/php.SMBuild
@@ -3,7 +3,7 @@ version=7.4.30
 rrdversion=2.0.3
 build=2sml
 homepage="https://www.php.net/"
-download="https://www.php.net/distributions/php-7.4.30.tar.xz"
+download="https://www.php.net/distributions/php-$version.tar.xz"
 desc="Scripting language suited for creating dynamic websites"
 requires="enchant libgd db gmp icu libsodium libxslt sqlite curl libtool pcre2 postfix aspell openssl oniguruma libffi bzip2 zlib libexif intltool readline libsodium mariadb libwebp"
 
@@ -16,10 +16,11 @@ build() {
   fixbuilddirpermissions
 
   # Add the rrd graph module
-  cd ext
-  tar xf $srcdir/rrd-$rrdversion.tgz
+  (
+    cd ext
+    tar xf $srcdir/rrd-$rrdversion.tgz
+  )
 
-  cd ..
   ./buildconf -f
 
   ./configure \
@@ -74,9 +75,6 @@ build() {
   install -Dm 644 sapi/fpm/init.d.php-fpm $pkg/etc/rc.d/rc.php-fpm.new
   install -Dm 644 $srcdir/php.ini $pkg/etc/php/php.ini.new
 
-  # We do not package static extension libraries:
-  rm -fv $pkg/lib/php/extensions/*.a  $pkg/lib/php/extensions/*/*.a
-
   (
    cd $pkg/etc/php
    mv php-fpm.conf.default php-fpm.conf.default.new
@@ -89,7 +87,8 @@ build() {
   chown root:www-data $pkg/var/lib/php
 
   # PHP sometimes puts junk in the root directory:
-  ( cd $pkg/lib/php
+  ( 
+    cd $pkg/lib/php
     rm -rfv .channels .depdb .depdblock .filemap .lock .registry
     cd $pkg
     rm -rfv .channels .depdb .depdblock .filemap .lock .registry
@@ -102,4 +101,4 @@ build() {
 sha512sums="
 e4a0233b1c72560adc16d259b3e7e09e6acd569ee854ec8d3abfdd838575ff3909978a4fb8bae5b7d4111f7fa497441ad0957042911e37f407a8e98e6c381e0f  php-7.4.30.tar.lz
 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4  rrd-2.0.3.tgz
-"
\ No newline at end of file
+"
diff --git a/net/poppler-data/poppler-data.SMBuild b/net/poppler-data/poppler-data.SMBuild
index e563883..cacd245 100755
--- a/net/poppler-data/poppler-data.SMBuild
+++ b/net/poppler-data/poppler-data.SMBuild
@@ -2,7 +2,7 @@ app=poppler-data
 version=0.4.8
 build=1sml
 homepage="https://poppler.freedesktop.org/"
-download="https://poppler.freedesktop.org/poppler-data-0.4.8.tar.gz"
+download="https://poppler.freedesktop.org/poppler-data-$version.tar.gz"
 desc="Add-ons for the poppler PDF rendering library"
 requires="poppler"
 
diff --git a/net/poppler/poppler.SMBuild b/net/poppler/poppler.SMBuild
index f5d9f7f..506483d 100755
--- a/net/poppler/poppler.SMBuild
+++ b/net/poppler/poppler.SMBuild
@@ -2,7 +2,7 @@ app=poppler
 version=0.57.0
 build=1sml
 homepage="https://poppler.freedesktop.org/"
-download="https://poppler.freedesktop.org/poppler-0.57.0.tar.xz"
+download="https://poppler.freedesktop.org/poppler-$version.tar.xz"
 desc="PDF rendering library aimed at centralised code maintenance"
 requires="pkgconf gcc-libs libjpeg-turbo python3 curl lcms2 openjpeg icu cairo gtk2 gobject-introspection gtk3"
 
@@ -38,4 +38,4 @@ build() {
 sha512sums="
 0d8c0fffe97809f20bb34f2139b2a7e28a16b05ba4d73904a8dcc0d351b9acc087d695d29e73bfb3b166840ee004e5497140b1299aa722ba3d460930f0a9019a  poppler-0.57.0.tar.lz
 1f42a769becbf4873efa27c970e57b44bb46efc1029e6deecf0a8bfba047f189ec65ae4346ea79ce15eebd10771c74ece408fe1956e4b3d27a578a045aa2451f  poppler-segfault.patch
-"
\ No newline at end of file
+"
diff --git a/net/postfix/postfix.SMBuild b/net/postfix/postfix.SMBuild
index a8d8b6f..1778b8d 100755
--- a/net/postfix/postfix.SMBuild
+++ b/net/postfix/postfix.SMBuild
@@ -2,7 +2,7 @@ app=postfix
 version=3.4.9
 build=1sml
 homepage="http://www.postfix.org/"
-download="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.4.9.tar.gz"
+download="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-$version.tar.gz"
 desc="Fast, secure and easy-to-administer mail server"
 requires="pcre openssl sqlite db icu"
 
diff --git a/net/ppp/ppp.SMBuild b/net/ppp/ppp.SMBuild
index 8484c10..08441f8 100755
--- a/net/ppp/ppp.SMBuild
+++ b/net/ppp/ppp.SMBuild
@@ -2,7 +2,7 @@ app=ppp
 version=2.4.8
 build=1sml
 homepage="https://github.com/ppp-project/ppp"
-download="https://github.com/ppp-project/ppp/archive/refs/tags/ppp-2.4.8.tar.gz"
+download="https://github.com/ppp-project/ppp/archive/refs/tags/ppp-$version.tar.gz"
 desc="PPP daemon for establishing connectivity over a network"
 requires="libpcap openssl"
 
diff --git a/net/privoxy/privoxy.SMBuild b/net/privoxy/privoxy.SMBuild
index f41cf72..fff50a8 100755
--- a/net/privoxy/privoxy.SMBuild
+++ b/net/privoxy/privoxy.SMBuild
@@ -2,7 +2,7 @@ app=privoxy
 version=3.0.33
 build=1sml
 homepage="https://www.privoxy.org/"
-download="https://www.privoxy.org/sf-download-mirror/Sources/3.0.33%20%28stable%29/privoxy-3.0.33-stable-src.tar.gz"
+download="https://www.privoxy.org/sf-download-mirror/Sources/$version%20%28stable%29/privoxy-$version-stable-src.tar.gz"
 desc="Web proxy with advanced filtering capabilities"
 requires="zlib pcre"
 
diff --git a/net/proftpd/proftpd.SMBuild b/net/proftpd/proftpd.SMBuild
index 3bcc5a8..ddac086 100755
--- a/net/proftpd/proftpd.SMBuild
+++ b/net/proftpd/proftpd.SMBuild
@@ -2,7 +2,7 @@ app=proftpd
 version=1.3.6
 build=1sml
 homepage="http://www.proftpd.org/"
-download="https://github.com/proftpd/proftpd/archive/refs/tags/v1.3.6.tar.gz"
+download="https://github.com/proftpd/proftpd/archive/refs/tags/v$version.tar.gz"
 desc="Secure and configurable FTP server"
 requires="attr netbsd-curses libcap"
 
diff --git a/net/redshift/redshift.SMBuild b/net/redshift/redshift.SMBuild
index fc8a014..6d9aea6 100755
--- a/net/redshift/redshift.SMBuild
+++ b/net/redshift/redshift.SMBuild
@@ -2,7 +2,7 @@ app=redshift
 version=1.12
 build=1sml
 homepage="http://jonls.dk/redshift/"
-download="https://github.com/jonls/redshift/releases/download/v1.12/redshift-1.12.tar.xz"
+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"
 
@@ -32,4 +32,4 @@ build() {
 
 sha512sums="
 5da3be7ccf4c43af0fa6da42e4f0972e46901a3ab7366a1412e7bcb573eefcf85a684b63068e6f54df04ab1427d6f58fff92091110b99ae848bc3769d703125b  redshift-1.12.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/rpcbind/rpcbind.SMBuild b/net/rpcbind/rpcbind.SMBuild
index bc82693..1fee8c5 100755
--- a/net/rpcbind/rpcbind.SMBuild
+++ b/net/rpcbind/rpcbind.SMBuild
@@ -2,7 +2,7 @@ app=rpcbind
 version=1.2.5
 build=1sml
 homepage="http://sourceforge.net/projects/rpcbind/"
-download="https://sourceforge.net/projects/rpcbind/files/rpcbind/1.2.5/rpcbind-1.2.5.tar.bz2"
+download="https://sourceforge.net/projects/rpcbind/files/rpcbind/$version/rpcbind-$version.tar.bz2"
 desc="Daemon to manage NFS and RPC connections"
 requires="bash libtirpc"
 
diff --git a/net/rrdtool/rrdtool.SMBuild b/net/rrdtool/rrdtool.SMBuild
index e0c1a79..d272b2d 100755
--- a/net/rrdtool/rrdtool.SMBuild
+++ b/net/rrdtool/rrdtool.SMBuild
@@ -2,7 +2,7 @@ app=rrdtool
 version=1.7.2
 build=1sml
 homepage="https://www.rrdtool.org"
-download="https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz"
+download="https://oss.oetiker.ch/rrdtool/pub/rrdtool-$version.tar.gz"
 desc="Data logging and graphing application"
 requires="perl python3 lua"
 
@@ -35,4 +35,4 @@ build() {
 
 sha512sums="
 ed7331f68f4a53e0409237826bbb9747ba81ac99466d15e33cae267137918180f6db31586d19c4e892d9b62eac06a190e6e7ffceb0052ff47616f77afb2cb709  rrdtool-1.7.2.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/rsync/rsync.SMBuild b/net/rsync/rsync.SMBuild
index 5351f36..a7ef39e 100755
--- a/net/rsync/rsync.SMBuild
+++ b/net/rsync/rsync.SMBuild
@@ -3,7 +3,7 @@ version=3.1.2
 build=1sml
 sm_noautoconfsite=1
 homepage="https://rsync.samba.org/"
-download="https://download.samba.org/pub/rsync/src/rsync-3.1.2.tar.gz"
+download="https://download.samba.org/pub/rsync/src/rsync-$version.tar.gz"
 desc="Tool to backup and synchronise files over a network"
 requires="acl attr popt"
 
diff --git a/net/rtorrent/rtorrent.SMBuild b/net/rtorrent/rtorrent.SMBuild
index 601c49d..a416b82 100755
--- a/net/rtorrent/rtorrent.SMBuild
+++ b/net/rtorrent/rtorrent.SMBuild
@@ -2,7 +2,7 @@ app=rtorrent
 version=0.9.8
 build=1sml
 homepage="https://github.com/rakshasa/rtorrent"
-download="https://github.com/rakshasa/rtorrent/archive/refs/tags/v0.9.8.tar.gz"
+download="https://github.com/rakshasa/rtorrent/archive/refs/tags/v$version.tar.gz"
 desc="command-line bittorrent client"
 requires="gcc-libs netbsd-curses zlib openssl curl libtorrent"
 
diff --git a/net/samba/samba.SMBuild b/net/samba/samba.SMBuild
index d7f65a6..8124134 100755
--- a/net/samba/samba.SMBuild
+++ b/net/samba/samba.SMBuild
@@ -2,7 +2,7 @@ app=samba
 version=4.15.5
 build=2sml
 homepage="https://www.samba.org"
-download="https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.gz"
+download="https://download.samba.org/pub/samba/stable/samba-$version.tar.gz"
 desc="CIFS file and print server, version 4"
 requires="acl attr netbsd-curses readline libcap tar db popt libaio perl-modules"
 
@@ -86,4 +86,4 @@ b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e
 c0bbe1186b150a9bb2a0b741a8cfbd7a5109e5fed1eaa07aaa38cf026ebe054d38cc01e2496f0cab7b40f743e1b7ecfbf8a4d5820810226c4152021df65f36dc  pidl.patch
 e98fd19f65d954f04f7e3b5be86e9c4bcc9ac090c40037de77bfeb266617747c514aeb42f3daf84113b2f3374480d25e368bc1fdebc1870458eda12329d2062e  samba-bgqd-include-signal-h.patch
 e7441d4692c354ff265ec5b5666ebd8c02762cffd805b4af6fdcb405e9b7641e195d068b60bb0ed1ffada4db4db84492db598efd37d0a27d66b5b4c923891891  tevent.patch
-"
\ No newline at end of file
+"
diff --git a/net/sane-backends/sane-backends.SMBuild b/net/sane-backends/sane-backends.SMBuild
index cc9a470..191f0df 100755
--- a/net/sane-backends/sane-backends.SMBuild
+++ b/net/sane-backends/sane-backends.SMBuild
@@ -2,7 +2,7 @@ app=sane-backends
 version=1.0.31
 build=1sml
 homepage="http://www.sane-project.org/"
-download="https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/sane-backends-1.0.31.tar.gz"
+download="https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/sane-backends-$version.tar.gz"
 desc="Tools and libraries to access data from image-scanning devices"
 requires="cairo curl glib libxml2 libpng libnl libjpeg-turbo openssl python3"
 
@@ -55,4 +55,4 @@ build() {
 sha512sums="
 c700cce538cbc953ceebf64264506ee56fff7d090d74a2fa8b9f47d22596ea10a70dc4084644c979b908d46426c2034a4c28f8af034179fcbcb776ed31302436  sane-backends-1.0.31.tar.lz
 4fc80e093c312b8c0ee020cdddb12667a383dbefd445fac41f9a34be25e9c4f5f8d1e35fe60b621f717fd7eb46ccff31dd2fa06c02f77bdc67ece5820bdad09f  sane-frontends-1.0.14-sane_cap_always_settable.diff
-"
\ No newline at end of file
+"
diff --git a/net/sane-frontends/sane-frontends.SMBuild b/net/sane-frontends/sane-frontends.SMBuild
index d475e30..4d64205 100755
--- a/net/sane-frontends/sane-frontends.SMBuild
+++ b/net/sane-frontends/sane-frontends.SMBuild
@@ -2,7 +2,7 @@ app=sane-frontends
 version=1.0.14
 build=1sml
 homepage="http://www.sane-project.org"
-download="https://gitlab.com/sane-project/frontends/uploads/14e5c5a9205b10bd3df04501852eab28/sane-frontends-1.0.14.tar.gz"
+download="https://gitlab.com/sane-project/frontends/uploads/14e5c5a9205b10bd3df04501852eab28/sane-frontends-$version.tar.gz"
 desc="Frontend for the SANE image scanning library"
 requires="sane-backends"
 
@@ -30,4 +30,4 @@ build() {
 
 sha512sums="
 07aefc5339ea4b069ba9966b59f9338007502cf0990912faa6d61eea6ac1fb9126e7274cff1eff936c0d6695f142bf2a86df56adc7008af38a07adcc45f433b5  sane-frontends-1.0.14.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/smstools/smstools.SMBuild b/net/smstools/smstools.SMBuild
index abe5a8f..5bca798 100755
--- a/net/smstools/smstools.SMBuild
+++ b/net/smstools/smstools.SMBuild
@@ -2,7 +2,7 @@ app=smstools
 version=3.1.21
 build=1sml
 homepage="http://smstools3.kekekasvi.com"
-download="http://smstools3.kekekasvi.com/packages/smstools3-3.1.21.tar.gz"
+download="http://smstools3.kekekasvi.com/packages/smstools3-$version.tar.gz"
 desc="SMS gateway software for sending and receiving SMSs from GSM modems and mobile phones"
 requires="musl"
 
@@ -16,7 +16,9 @@ build() {
 
   applypatch $srcdir/fixups2.diff
 
-  ( cd src && make CC="$CC -static" )
+  cd src 
+  make CC="$CC -static" 
+
   cp LICENSE $pkgdocs
 
   # Add sample config files
diff --git a/net/sshfs/sshfs.SMBuild b/net/sshfs/sshfs.SMBuild
index a61bf6b..8f7588c 100755
--- a/net/sshfs/sshfs.SMBuild
+++ b/net/sshfs/sshfs.SMBuild
@@ -2,7 +2,7 @@ app=sshfs
 version=2.8
 build=1sml
 homepage="https://github.com/libfuse/sshfs"
-download="https://github.com/libfuse/sshfs/archive/refs/tags/sshfs_2.8.tar.gz"
+download="https://github.com/libfuse/sshfs/archive/refs/tags/sshfs_$version.tar.gz"
 desc="Network file system client to connect to SSH servers"
 requires="glib fuse pcre"
 
diff --git a/net/sylpheed/sylpheed.SMBuild b/net/sylpheed/sylpheed.SMBuild
index d0bad5c..7252afa 100755
--- a/net/sylpheed/sylpheed.SMBuild
+++ b/net/sylpheed/sylpheed.SMBuild
@@ -2,7 +2,7 @@ app=sylpheed
 version=3.7.0
 build=1sml
 homepage="https://sylpheed.sraoss.jp/en/"
-download="https://osdn.net/dl/sylpheed/sylpheed-3.7.0.tar.xz"
+download="https://osdn.net/dl/sylpheed/sylpheed-$version.tar.xz"
 desc="Simple, lightweight email client based on GTK+"
 requires="openssl dbus-glib gtkspell"
 
@@ -17,10 +17,8 @@ build() {
   applypatch $srcdir/sylpheed-pop3-cram-md5.patch
   applypatch $srcdir/sylpheed-trayicon.patch
 
-  CPPFLAGS="$CFLAGS -D_GNU_SOURCE" \
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-nls 
 
   make
diff --git a/net/tcpdump/tcpdump.SMBuild b/net/tcpdump/tcpdump.SMBuild
index 9042728..72f76d2 100755
--- a/net/tcpdump/tcpdump.SMBuild
+++ b/net/tcpdump/tcpdump.SMBuild
@@ -2,7 +2,7 @@ app=tcpdump
 version=4.9.2
 build=1sml
 homepage="https://www.tcpdump.org/"
-download="https://www.tcpdump.org/release/tcpdump-4.9.2.tar.gz"
+download="https://www.tcpdump.org/release/tcpdump-$version.tar.gz"
 desc="Text-mode network monitoring and packet data acquisition tool"
 requires="libpcap openssl"
 
diff --git a/net/tor/tor.SMBuild b/net/tor/tor.SMBuild
index 6a22317..ba114db 100755
--- a/net/tor/tor.SMBuild
+++ b/net/tor/tor.SMBuild
@@ -2,7 +2,7 @@ app=tor
 version=0.4.1.6
 build=1sml
 homepage="https://www.torproject.org/"
-download="https://archive.torproject.org/tor-package-archive/tor-0.4.1.6.tar.gz"
+download="https://archive.torproject.org/tor-package-archive/tor-$version.tar.gz"
 desc="The second-generation onion router"
 requires="gcc-libs zlib libcap openssl libevent ca-certificates"
 
@@ -25,7 +25,6 @@ build() {
 
   cp LICENSE $pkgdocs/
 
-  mkdir -p $pkg/etc/tor
   rm $pkg/etc/tor/torrc.sample
   cp $srcdir/torrc.sample $pkg/etc/tor/torrc
 
diff --git a/net/traceroute/traceroute.SMBuild b/net/traceroute/traceroute.SMBuild
index 4c2d6e7..233d9bb 100755
--- a/net/traceroute/traceroute.SMBuild
+++ b/net/traceroute/traceroute.SMBuild
@@ -2,7 +2,7 @@ app=traceroute
 version=2.1.0
 build=1sml
 homepage="http://traceroute.sourceforge.net/"
-download="https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz"
+download="https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-$version/traceroute-$version.tar.gz"
 desc="Utility to track route packets going through a network to a target host"
 requires="musl"
 
@@ -24,4 +24,4 @@ build() {
 
 sha512sums="
 6683a3d5cd9cdef69f72c0c30ee4d1e8629207f0921a656cd0e8fbb17d809efc4c43b0f75f7c119899ae99b922dcdb4f7ee0bb864b54f8df5c56bdc0586956ca  traceroute-2.1.0.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/transmission/transmission.SMBuild b/net/transmission/transmission.SMBuild
index 841d61a..06f00cc 100755
--- a/net/transmission/transmission.SMBuild
+++ b/net/transmission/transmission.SMBuild
@@ -1,6 +1,10 @@
 app=transmission
 version=2.94
 build=1sml
+homepage="https://transmissionbt.com/"
+download="https://github.com/transmission/transmission-releases/raw/master/transmission-$version.tar.xz"
+desc="Torrent client with text-mode, remote, daemon and GTK+3"
+requires="intltool curl desktop-file-utils libevent miniupnpc libnotify hicolor-icon-theme gtk3"
 
 build() {
   mkandenterbuilddir
@@ -11,8 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc \
+    --prefix=""
 
   make
   make install DESTDIR=$pkg
@@ -22,10 +25,6 @@ build() {
   mkfinalpkg
 }
 
-homepage="https://transmissionbt.com/"
-download="https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"
-desc="Torrent client with text-mode, remote, daemon and GTK+3"
-requires="intltool curl desktop-file-utils libevent miniupnpc libnotify hicolor-icon-theme gtk3"
 sha512sums="
 ded4533415be4f8db35a195215a40e556447bc428422509c21a8f7ecefe3050c93f05b0d0a4af891002e4610ed09511c85e0df0e2526b9318788db009ca3db37  transmission-2.94.tar.lz
 "
diff --git a/net/uget/uget.SMBuild b/net/uget/uget.SMBuild
index df53f0e..091c5b6 100755
--- a/net/uget/uget.SMBuild
+++ b/net/uget/uget.SMBuild
@@ -2,7 +2,7 @@ app=uget
 version=2.2.3
 build=1sml
 homepage="https://ugetdm.com/"
-download="https://sourceforge.net/projects/urlget/files/uget%20%28stable%29/2.2.3/uget-2.2.3-1.tar.gz"
+download="https://sourceforge.net/projects/urlget/files/uget%20%28stable%29/$version/uget-$version-1.tar.gz"
 desc="Download manager written in GTK+3"
 requires="intltool curl gstreamer gtk3 libnotify"
 
@@ -15,8 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make
   make install DESTDIR=$pkg
diff --git a/net/unbound/unbound.SMBuild b/net/unbound/unbound.SMBuild
index 7b54419..aca4f38 100755
--- a/net/unbound/unbound.SMBuild
+++ b/net/unbound/unbound.SMBuild
@@ -2,7 +2,7 @@ app=unbound
 version=1.9.2
 build=1sml
 homepage="https://www.nlnetlabs.nl/projects/unbound/about/"
-download="https://www.nlnetlabs.nl/downloads/unbound/unbound-1.9.2.tar.gz"
+download="https://www.nlnetlabs.nl/downloads/unbound/unbound-$version.tar.gz"
 desc="Validating, recursive, and caching DNSSEC resolver written in C"
 requires="expat openssl"
 
diff --git a/net/vinagre/vinagre.SMBuild b/net/vinagre/vinagre.SMBuild
index c215e48..6e80b9c 100755
--- a/net/vinagre/vinagre.SMBuild
+++ b/net/vinagre/vinagre.SMBuild
@@ -2,7 +2,7 @@ app=vinagre
 version=3.22.0
 build=1sml
 homepage="https://wiki.gnome.org/Apps/Vinagre"
-download="https://gitlab.gnome.org/GNOME/vinagre/-/archive/3.22.0/vinagre-3.22.0.tar.bz2"
+download="https://gitlab.gnome.org/GNOME/vinagre/-/archive/$version/vinagre-$version.tar.bz2"
 desc="Remote desktop viewer written in GTK+3"
 requires="gcc-libs glib pango gdk-pixbuf gobject-introspection gnutls libxml2 pcre gtk-vnc libgcrypt libgpg-error wayland wayland-protocols libpng libidn libtasn1 mesa ffmpeg dbus libdrm libcroco libvorbis gtk3 freerdp"
 
diff --git a/net/vnstat/vnstat.SMBuild b/net/vnstat/vnstat.SMBuild
index 0859892..33ca592 100755
--- a/net/vnstat/vnstat.SMBuild
+++ b/net/vnstat/vnstat.SMBuild
@@ -2,7 +2,7 @@ app=vnstat
 version=2.4
 build=1sml
 homepage="https://humdi.net/vnstat/"
-download="https://humdi.net/vnstat/vnstat-2.4.tar.gz"
+download="https://humdi.net/vnstat/vnstat-$version.tar.gz"
 desc="Text-mode network traffic monitor and logger"
 requires="bash sqlite libgd"
 
diff --git a/net/wavemon/wavemon.SMBuild b/net/wavemon/wavemon.SMBuild
index a916622..822144e 100755
--- a/net/wavemon/wavemon.SMBuild
+++ b/net/wavemon/wavemon.SMBuild
@@ -2,7 +2,7 @@ app=wavemon
 version=0.9.4
 build=1sml
 homepage="https://github.com/uoaerg/wavemon"
-download="https://github.com/uoaerg/wavemon/archive/refs/tags/v0.9.4.tar.gz"
+download="https://github.com/uoaerg/wavemon/archive/refs/tags/v$version.tar.gz"
 desc="Text-mode 802.11 wireless network monitor"
 requires="netbsd-curses libcap libnl"
 
@@ -18,15 +18,19 @@ build() {
   unset CFLAGS
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make 
   make install DESTDIR=$pkg 
 
+  ( 
+    mv $pkg/share/wavemon/* $pkgdocs/ 
+    rmdir $pkg/share/wavemon
+  )
+
   mkfinalpkg
 }
 
 sha512sums="
 9868d060bc30bdc1ac456cd4d411a1a48d4649146124e6d993dde6bc72c77436b2cf3f3f5648df1266e0ad8a413f152586285b38059256a9104f6e23764aea4b  wavemon-0.9.4.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/webkitgtk/webkitgtk.SMBuild b/net/webkitgtk/webkitgtk.SMBuild
index 951f842..2990486 100755
--- a/net/webkitgtk/webkitgtk.SMBuild
+++ b/net/webkitgtk/webkitgtk.SMBuild
@@ -2,7 +2,7 @@ app=webkitgtk
 version=2.34.6
 build=1sml
 homepage="https://webkitgtk.org/"
-download="https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz"
+download="https://webkitgtk.org/releases/webkitgtk-$version.tar.xz"
 desc="GTK+ port of the WebKit"
 requires="libwebp libtasn1 gtk3 bubblewrap gst-plugins-base libmanette ruby"
 
@@ -48,4 +48,4 @@ sha512sums="
 afc5019e0f72724f3d8da8a31060a83c42295d749165cbe652aee165a0f70719aa3074f2ffda465837a8fcb918b92eefb4b96127fdb51d5a8c2141e0ff559b01  webkitgtk-2.34.6.tar.lz
 a1304879072c2fcfa5b664faf7f57353e1eca007aa0f5723f2020d9f1ed10c7f3281ec3b0f359467843a7ea7014e7994b2b85ca97de96cd78cfedcc7839fdc0f  shapeoutsideinfo.patch
 dd2b9a6ac0afdc3a79c6b7c904cd5a5d1dbbae7a5c002dbbdf50bf93dbeba44a31f957cab199262ff83fe3e5e2970670353eed927392b2443684b214695b8473  symboltable.patch
-"
\ No newline at end of file
+"
diff --git a/net/weechat/weechat.SMBuild b/net/weechat/weechat.SMBuild
index 0907af5..4618bdc 100755
--- a/net/weechat/weechat.SMBuild
+++ b/net/weechat/weechat.SMBuild
@@ -2,7 +2,7 @@ app=weechat
 version=2.5
 build=1sml
 homepage="http://www.weechat.org"
-download="https://weechat.org/files/src/weechat-2.5.tar.xz"
+download="https://weechat.org/files/src/weechat-$version.tar.xz"
 desc="Fast, modular text-mode IRC client"
 requires="netbsd-curses openssl curl libidn libtasn1 nettle gmp gnutls libgcrypt aspell perl python3"
 
diff --git a/net/wget/wget.SMBuild b/net/wget/wget.SMBuild
index b3deff2..f862bca 100755
--- a/net/wget/wget.SMBuild
+++ b/net/wget/wget.SMBuild
@@ -2,7 +2,7 @@ app=wget
 version=1.19
 build=1sml
 homepage="https://www.gnu.org/software/wget/"
-download="https://ftp.gnu.org/gnu/wget/wget-1.19.tar.gz"
+download="https://ftp.gnu.org/gnu/wget/wget-$version.tar.gz"
 desc="Non-interactive network resource retriever"
 requires="zlib netbsd-curses openssl e2fsprogs pcre"
 
diff --git a/net/whois/whois.SMBuild b/net/whois/whois.SMBuild
index 9ec6a6c..512767e 100755
--- a/net/whois/whois.SMBuild
+++ b/net/whois/whois.SMBuild
@@ -2,9 +2,9 @@ app=whois
 version=5.4.2
 build=1sml
 homepage="https://github.com/rfc1036/whois"
-download="https://github.com/rfc1036/whois/archive/refs/tags/v5.4.2.tar.gz"
+download="https://github.com/rfc1036/whois/archive/refs/tags/v$version.tar.gz"
 desc="Improved whois directory client derived from BSD and RIPE whois programs"
-requires="perl libidn "
+requires="perl libidn"
 
 build() {
   mkandenterbuilddir
diff --git a/net/wireless-tools/wireless-tools.SMBuild b/net/wireless-tools/wireless-tools.SMBuild
index 1e74599..c013d41 100755
--- a/net/wireless-tools/wireless-tools.SMBuild
+++ b/net/wireless-tools/wireless-tools.SMBuild
@@ -3,7 +3,7 @@ version=29
 build=1sml
 altname="$(echo $app | sed 's/-/_/')"
 homepage="https://hewlettpackard.github.io/wireless-tools/"
-download="https://hewlettpackard.github.io/wireless-tools/wireless_tools.29.tar.gz"
+download="https://hewlettpackard.github.io/wireless-tools/wireless_tools.$version.tar.gz"
 desc="Set of tools allowing manipulation of wireless extensions"
 requires="musl"
 
@@ -18,7 +18,7 @@ build() {
   applypatch $srcdir/wireless-tools-Makefile.patch
   applypatch $srcdir/wireless-tools-headers.patch
 
-  make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin" CFLAGS="$CFLAGS -D_GNU_SOURCE -D_BSD_SOURCE"
+  make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin""
   make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin" install DESTDIR="$pkg"
 
   cp COPYING $pkgdocs/
diff --git a/net/wpa-supplicant/wpa-supplicant.SMBuild b/net/wpa-supplicant/wpa-supplicant.SMBuild
index 28102f3..4e897ce 100755
--- a/net/wpa-supplicant/wpa-supplicant.SMBuild
+++ b/net/wpa-supplicant/wpa-supplicant.SMBuild
@@ -3,7 +3,7 @@ sapp="$( echo $app | sed 's@-@_@')"
 version=2.9
 build=1sml
 homepage="https://w1.fi/"
-download="https://w1.fi/releases/wpa_supplicant-2.9.tar.gz"
+download="https://w1.fi/releases/wpa_supplicant-$version.tar.gz"
 desc="WPA/WPA2/IEEE 802.1X Supplicant"
 requires="readline openssl libnl dbus"
 
diff --git a/net/x11vnc/x11vnc.SMBuild b/net/x11vnc/x11vnc.SMBuild
index 004bbf4..35e54ea 100755
--- a/net/x11vnc/x11vnc.SMBuild
+++ b/net/x11vnc/x11vnc.SMBuild
@@ -1,6 +1,10 @@
 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"
 
 build() {
   mkandenterbuilddir
@@ -11,8 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make
   make install DESTDIR=$pkg
@@ -22,10 +25,6 @@ build() {
   mkfinalpkg
 }
 
-homepage="https://github.com/LibVNC/x11vnc"
-download="https://github.com/LibVNC/x11vnc/archive/refs/tags/0.9.16.tar.gz"
-desc="VNC server for real X displays"
-requires="expat nettle openssl libgcrypt libgpg-error libjpeg-turbo libvncserver libxdamage libxinerama libxrandr libxtst avahi"
 sha512sums="
 b375149ef368c7e48abf8d854e38d94c8775624457addef418d7337df0651ae2a4070ff5002dad8fcefee165426a43983482c63b5c4594e91da71bbd1087b6e8  x11vnc-0.9.16.tar.lz
 "
diff --git a/net/xdg-utils/xdg-utils.SMBuild b/net/xdg-utils/xdg-utils.SMBuild
index 69bb13b..68c6a8c 100755
--- a/net/xdg-utils/xdg-utils.SMBuild
+++ b/net/xdg-utils/xdg-utils.SMBuild
@@ -2,7 +2,7 @@ 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-1.1.3.tar.gz"
+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"
 
diff --git a/net/znc/znc.SMBuild b/net/znc/znc.SMBuild
index e35d8f0..c78441d 100755
--- a/net/znc/znc.SMBuild
+++ b/net/znc/znc.SMBuild
@@ -2,7 +2,7 @@ app=znc
 version=1.7.5
 build=1sml
 homepage="https://wiki.znc.in/ZNC"
-download="https://znc.in/releases/archive/znc-1.7.5.tar.gz"
+download="https://znc.in/releases/archive/znc-$version.tar.gz"
 desc="An advanced IRC bouncer"
 requires="gcc-libs zlib python3 openssl"