Fixed breakage when compiling strace 5.7 with musl 1.2.3

Removed unnecessary build options from several package build files in xfce

base/strace/remove-ipproto-max.patch

@@ -0,0 +1,85 @@
+musl-1.2.2 updated IPPROTO_MAX to 263 with respect to the addition of
+IPPROTO_MPTCP, which has a value of '262'. The issue has been fixed in
+strace-5.10 in commit 2c949e0d8204 ("xlat: remove IPPROTO_MAX").
+
+This patch extends the original change made only in
+xlat/inet_protocols.in to xlat/inet_protocols.h as it is part of the
+source files used in gentoo.
+
+Upstream-issue: https://github.com/strace/strace/issues/164
+
+diff --git a/xlat/inet_protocols.h b/xlat/inet_protocols.h
+index 9d37ec67..8708fdbd 100644
+--- a/xlat/inet_protocols.h
++++ b/xlat/inet_protocols.h
+@@ -234,13 +234,6 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+ #else
+ # define IPPROTO_RAW 255
+ #endif
+-#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX)
+-DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+-static_assert((IPPROTO_MAX) == (256), "IPPROTO_MAX != 256");
+-DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+-#else
+-# define IPPROTO_MAX 256
+-#endif
+ #if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+ static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262");
+@@ -353,12 +346,9 @@ static const struct xlat_data inet_protocols_xdata[] = {
+  XLAT(IPPROTO_RAW),
+  #define XLAT_VAL_32 ((unsigned) (IPPROTO_RAW))
+  #define XLAT_STR_32 STRINGIFY(IPPROTO_RAW)
+- XLAT(IPPROTO_MAX),
+- #define XLAT_VAL_33 ((unsigned) (IPPROTO_MAX))
+- #define XLAT_STR_33 STRINGIFY(IPPROTO_MAX)
+  XLAT(IPPROTO_MPTCP),
+- #define XLAT_VAL_34 ((unsigned) (IPPROTO_MPTCP))
+- #define XLAT_STR_34 STRINGIFY(IPPROTO_MPTCP)
++ #define XLAT_VAL_33 ((unsigned) (IPPROTO_MPTCP))
++ #define XLAT_STR_33 STRINGIFY(IPPROTO_MPTCP)
+ };
+ const struct xlat inet_protocols[1] = { {
+  .data = inet_protocols_xdata,
+@@ -466,9 +456,6 @@ const struct xlat inet_protocols[1] = { {
+ #  endif
+ #  ifdef XLAT_VAL_33
+   | XLAT_VAL_33
+-#  endif
+-#  ifdef XLAT_VAL_34
+-  | XLAT_VAL_34
+ #  endif
+   ,
+  .flags_strsz = 0
+@@ -573,9 +560,6 @@ const struct xlat inet_protocols[1] = { {
+ #  endif
+ #  ifdef XLAT_STR_33
+   + sizeof(XLAT_STR_33)
+-#  endif
+-#  ifdef XLAT_STR_34
+-  + sizeof(XLAT_STR_34)
+ #  endif
+   ,
+ } };
+@@ -648,8 +632,6 @@ const struct xlat inet_protocols[1] = { {
+ #  undef XLAT_VAL_32
+ #  undef XLAT_STR_33
+ #  undef XLAT_VAL_33
+-#  undef XLAT_STR_34
+-#  undef XLAT_VAL_34
+ # endif /* !IN_MPERS */
+ 
+ #endif /* !XLAT_MACROS_ONLY */
+diff --git a/xlat/inet_protocols.in b/xlat/inet_protocols.in
+index c37508fa..89aa56ac 100644
+--- a/xlat/inet_protocols.in
++++ b/xlat/inet_protocols.in
+@@ -32,5 +32,4 @@ IPPROTO_UDPLITE		136
+ IPPROTO_MPLS		137
+ IPPROTO_ETHERNET	143
+ IPPROTO_RAW		255
+-IPPROTO_MAX		256
+ IPPROTO_MPTCP		262
+-- 
+2.26.3
+

base/strace/strace.SMBuild

@@ -1,6 +1,6 @@
 app=strace
 version=5.7
-build=1sml
+build=2sml
 homepage="https://strace.io/"
 download="https://strace.io/files/$version/strace-$version.tar.xz"
 desc="linux system call tracing utility"
@@ -14,6 +14,9 @@ build() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+  
+  # Credits: https://github.com/arkamar/gentoo
+  applypatch $srcdir/remove-ipproto-max.patch
 
   CFLAGS="$CFLAGS -Dsigcontext_struct=sigcontext" \
   ./configure \
@@ -31,4 +34,5 @@ build() {
 
 sha512sums="
 7e6a8f50792cdaa11aedcc8972a3f0143900fc0de0c8852e6796a884aada43fe11480b31cad9a27caee354d697746ff1f1b8e511855f01e0164ed745a044d0d7  strace-5.7.tar.lz
+f8b7c226cf568c8e5a41beb947e5e7bde49670d1d108b1ab035e0db4b91b483a154d5a04f1926725844817d8c195dc2dacd0da758c3967e40e939f4d5b2e55ea  remove-ipproto-max.patch
 "

xfce/exo/exo.SMBuild

@@ -2,7 +2,7 @@ app=exo
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/exo/start"
-download="https://archive.xfce.org/xfce/4.16/src/exo-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/exo-$version.tar.bz2"
 desc="Extension library for Xfce"
 requires="gtk3 libxfce4util libxfce4ui"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-static 
 
   make
@@ -29,4 +28,4 @@ build() {
 
 sha512sums="
 10cbdfc2d81290e75c07f851ed562fcff4aea8cb709317bb768387f4a955cd208772927d356e7e3582cc4747f237d1dd34c0de1532bc549bece0306c106f411a  exo-4.16.0.tar.lz
-"
+"

xfce/faenza-icon-theme/faenza-icon-theme.SMBuild

@@ -2,7 +2,7 @@ app=faenza-icon-theme
 version=1.3
 build=1sml
 homepage="https://gnome-look.org/content/show.php/Faenza?content=128143"
-download="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_1.3.tar.gz"
+download="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_$version.tar.gz"
 desc="Theme pack for GNOME"
 requires="gtk2 gtk3"
 
@@ -25,4 +25,4 @@ build() {
 
 sha512sums="
 742c11438fa3a5044765381c4a2a2f9bef3d997ab3bf9a2c2be8fc25f7a9cf95a25b84e5e0dfeeceaeb4b4c3ed6d98c4be860575cd5bebda59226f26e3ed560b  faenza-icon-theme-1.3.tar.lz
-"
+"

xfce/garcon/garcon.SMBuild

@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-static 
 
   make
@@ -29,4 +28,4 @@ build() {
 
 sha512sums="
 8f1b17daa746bbf8eeddc0eb5a17a20f6b987fd4ac30b0de104c22efe91f293292f3d71c548b14e073b616af4bcc68f2dd3bf950786b3ee78ab118d196711fe4  garcon-4.16.1.tar.lz
-"
+"

xfce/libxfce4ui/libxfce4ui.SMBuild

@@ -2,7 +2,7 @@ app=libxfce4ui
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/libxfce4ui/start"
-download="https://archive.xfce.org/xfce/4.16/src/libxfce4ui-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/libxfce4ui-$version.tar.bz2"
 desc="Xfce widget library"
 requires="libsm libepoxy libxfce4util xfconf gtk3"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-static 
 
   make
@@ -28,5 +27,5 @@ build() {
 }
 
 sha512sums="
-07ce8399ca860d5414f91b0795ba61eff21b6022a9e8c26de77a6c4e6c45371e10318b626a892b7e2998d95c7e92cf32c2cd48fdefc291bb5521fe8a6cf93aed  libxfce4ui-4.16.0.tar.bz2
+2a4fa253b954e72a5183c1ede7a101b1469e289d4e6bc24e5e7015160fe3393ca7ddc727fcd1b68cad46fb7d1105867ac42cf3c7ffdb339f4c64de2f2f59cd04  libxfce4ui-4.16.0.tar.lz
 "

xfce/libxfce4util/libxfce4util.SMBuild

@@ -2,7 +2,7 @@ app=libxfce4util
 version=4.16.0
 build=1sml
 homepage="https://www.xfce.org"
-download="https://archive.xfce.org/xfce/4.16/src/libxfce4util-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/libxfce4util-$version.tar.bz2"
 desc="Basic non-GUI utility library for Xfce"
 requires="glib"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --sbindir=/bin \
     --disable-static 
 
@@ -30,5 +28,5 @@ build() {
 }
 
 sha512sums="
-dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c  libxfce4util-4.16.0.tar.bz2
+db9d3da4dda73684ca02eb0ee26ad0120c606095cbacf1264ef0008c3b2dcbda2b2d7f367c4ed442cf4337f939f9c2768fdcc9bee945151612d9c8cc64c1628f  libxfce4util-4.16.0.tar.lz
-"
+"

xfce/mousepad/mousepad.SMBuild

@@ -2,7 +2,7 @@ app=mousepad
 version=0.5.8
 build=1sml
 homepage="https://docs.xfce.org/apps/mousepad/start"
-download="https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.8.tar.bz2"
+download="https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-$version.tar.bz2"
 desc="Fast, easy-to-use text editor for Xfce"
 requires="desktop-file-utils gspell"
 
@@ -26,5 +26,5 @@ build() {
 }
 
 sha512sums="
-6446927b564fe18c3127835e592d0248efa690c7b8fc2a7da92f237eb16184bd502c446a5b50aed8acd1d8233c22ee7e91c0b9ee512232f7d7a69c72f1dea9e9  mousepad-0.5.8.tar.bz2
+206054ccfa94e587410c4a90d22d57356c731d52a364f165866f26876848fd78d4a889fd78361fbd6a6a0a6a035e2bc2836739be0f55a5e6b118f69f3f660ba3  mousepad-0.5.8.tar.lz
 "

xfce/ristretto/ristretto.SMBuild

@@ -2,7 +2,7 @@ app=ristretto
 version=0.12.2
 build=1sml
 homepage="https://docs.xfce.org/apps/ristretto/start"
-download="https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.2.tar.bz2"
+download="https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-$version.tar.bz2"
 desc="Lightweight image viewer for Xfce"
 requires="file libexif libxfce4ui tumbler xfconf"
 
@@ -15,8 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc 
 
   make
   make install DESTDIR=$pkg
@@ -27,5 +26,5 @@ build() {
 }
 
 sha512sums="
-39fc5868c3858e3667660b6411b3d39c19a2306be3d169e499aa11aff34a24e0ee8e745e15dfe301be48e1c6adce30129ed76270b025f5160cfa773467764379  ristretto-0.12.2.tar.bz2
+9ef6fc92258e314fdfc8f051061eb5499857831f6323831ecbeeee110eca6584043abcc15749fab90b46cb536a4815da8eceb226251e122e31fd4037c301350b  ristretto-0.12.2.tar.lz
-"
+"

xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild

@@ -2,7 +2,7 @@ app=thunar-archive-plugin
 version=0.4.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/thunar/archive"
-download="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-0.4.0.tar.bz2"
+download="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-$version.tar.bz2"
 desc="Plugin to create and extract archives in Thunar"
 requires="xfce4-dev-tools thunar"
 
@@ -16,8 +16,6 @@ build() {
  
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static \
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-6590d8765ac6eab14fae7758e4c47c66b52e79e2e4b01a86d25bd35492590925ca35e4bbade8a9d8f0c73386eaeda6863e2a7a39a2df2904404f7e2bfdd91a44  thunar-archive-plugin-0.4.0.tar.bz2
+91882d89bef2875a46524eb1a16f203e1b54cc63082807fd02d2327d5fdfdffacb8e47e163fe2f79a0c222d48c4314bfa25f664c9c40b7ed3a014335e1214381  thunar-archive-plugin-0.4.0.tar.lz
-"
+"

xfce/thunar-volman/thunar-volman.SMBuild

@@ -2,7 +2,7 @@ app=thunar-volman
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/thunar/thunar-volman"
-download="https://archive.xfce.org/xfce/4.16/src/thunar-volman-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/thunar-volman-$version.tar.bz2"
 desc="Plugin to auto-manage removable devices in Thunar"
 requires="libxfce4ui thunar"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static 
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-33b7561e55491b793aa634dfa0b108788286e6b7a2f60a781b8ba10f73de74630520736ae99c4db66ae2da562a82bb1a6bdacd8307d6d452f26e647da6471af8  thunar-volman-4.16.0.tar.bz2
+ad239971f7454301b30f33d6cd0d7fec9ad736558d865ead461d4a11805f11002be9d1298f9981f4b978f2003ba3c4949cb0d5c81c962723a16ec199d19bba96  thunar-volman-4.16.0.tar.lz
-"
+"

xfce/thunar/thunar.SMBuild

@@ -2,7 +2,7 @@ app=thunar
 version=4.16.2
 build=1sml
 homepage="https://docs.xfce.org/xfce/thunar/start"
-download="https://archive.xfce.org/xfce/4.16/src/thunar-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/thunar-$version.tar.bz2"
 desc="Modern file manager for Xfce Desktop Environment"
 requires="desktop-file-utils libexif libgudev libpng pcre libnotify libxfce4util libxfce4ui exo tumbler gobject-introspection"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --enable-gio-unix \
     --enable-gudev \
     --enable-exif \
@@ -31,5 +30,5 @@ build() {
 }
 
 sha512sums="
-761bc2b2106db523b5b56b9f330a42e487aeccd144d2118956a67d6935ee6d795edf543a815c3e035dd7cc4b0965679811d39d9c5e6b6f7ca84eb362f22561e0  thunar-4.16.2.tar.bz2
+bdb5942d92af6e7ef4170964e67a5f5e5ed975e0f068e53e7bf1110f4128f9ab203b275b20742c9897a9d9822a90c5b1bffba94afa67e7597ca3d4d63d7dbe84  thunar-4.16.2.tar.lz
 "

xfce/tumbler/tumbler.SMBuild

@@ -2,7 +2,7 @@ app=tumbler
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/tumbler/start"
-download="https://archive.xfce.org/xfce/4.16/src/tumbler-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/tumbler-$version.tar.bz2"
 desc="Thumbnail generator"
 requires="glib gobject-introspection"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-static 
 
   make
@@ -29,4 +28,4 @@ build() {
 
 sha512sums="
 e243b79e4bd953c266146905b3717be2ef8b518f4cf1a7d70be8f32056abf4ca4cc113edef2690db19559f1af1c8ed45241bdf7028e5304322371cf399bd9eb7  tumbler-4.16.0.tar.lz
-"
+"

xfce/upower/upower.SMBuild

@@ -2,7 +2,7 @@ app=upower
 version=0.99.11
 build=1sml
 homepage="http://upower.freedesktop.org"
-download="https://upower.freedesktop.org/releases/upower-0.99.11.tar.xz"
+download="https://upower.freedesktop.org/releases/upower-$version.tar.xz"
 desc="Abstraction layer for enumerating power devices"
 requires="pcre glib util-linux netbsd-curses libffi eudev libusb dbus"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static
 
   make
@@ -30,4 +28,4 @@ build() {
 
 sha512sums="
 1f61e3d47ee62e34a7be15cc7144ee5f684eb204859bbd98c4b697e25ce3a6b7a100cb2354518190ebcaffb2f96d4ffb6464309654c16aea9dc1db727b982aca  upower-0.99.11.tar.lz
-"
+"

xfce/vte5/vte5.SMBuild

@@ -2,7 +2,7 @@ app=vte5
 version=0.50.4
 build=1sml
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
-download="https://gitlab.gnome.org/GNOME/vte/-/archive/0.50.4/vte-0.50.4.tar.bz2"
+download="https://gitlab.gnome.org/GNOME/vte/-/archive/$version/vte-$version.tar.bz2"
 desc="GTK+ terminal widget library for use in writing terminal emulators"
 requires="gtk3"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --enable-vala=no \
     --disable-introspection \
     --disable-static
@@ -31,4 +30,4 @@ build() {
 
 sha512sums="
 7a3fa071559e35151bc72b7f349401844be63b5314aba663591796d694c76e2e84c6bc5f3f14cdccd864546515156c9683be66151c2c6b80ef45921d49f73b27  vte-0.50.4.tar.lz
-"
+"

xfce/xfce4-appfinder/xfce4-appfinder.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-appfinder
 version=4.16.1
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfce4-appfinder-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-appfinder-$version.tar.bz2"
 desc="Application finding widget for Xfce"
 requires="garcon libxfce4ui xfconf"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static 
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-5a28d93675af7d77de3050e7df9e064a0fd94d579d7e617878329d4385b42594afd8de96740cb91de38ffcc22bda71e4f90b61ff401980a5582bf09b2a19870c  xfce4-appfinder-4.16.1.tar.bz2
+f08f3dc81d9502c136635ec4c85814d606b847f08956ddfbc76285d27e15b205fa0a3f3eff89905fe5bd5faeba790bdd363e438192ec55a59f37d62c424b2a5d  xfce4-appfinder-4.16.1.tar.lz
-"
+"

xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-cpugraph-plugin
 version=1.2.6
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.6.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-$version.tar.bz2"
 desc="Xfce Panel plugin to show graphically show CPU load"
 requires="xfce4-panel"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-6205a0a7616b0dc5de3cdeb79a5148ee775b426a16b52c491129f74104ab224ec3b29b042a3c8ee05b77cc8775c83d75a8312b96a71504cde50dc257e8354857  xfce4-cpugraph-plugin-1.2.6.tar.bz2
+8e26f22639189a896c3f0d7fa6b73e2fb38418f3046c1153d2c8a264c0a4ce3d60182a6faca2a3589ddddb61e9c93f420110d00aa5f12af01984f0a1a4958ac3  xfce4-cpugraph-plugin-1.2.6.tar.lz
-"
+"

xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-datetime-plugin
 version=0.8.1
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-datetime-plugin"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-0.8.1.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-$version.tar.bz2"
 desc="Xfce panel plugin to show date and time"
 requires="xfce4-panel"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-2671b3732e9bfca68543ababa69dd16d988ba0acf0f0c8d2eba539143f8764f561053c69de3f89441e32c3098d135ee0cdf630aed5a4db16316455bdfc98120a  xfce4-datetime-plugin-0.8.1.tar.bz2
+f58a8b39ed21764c0453fb41263fce52ac10e5711056bd4dded030754fbbcda61d82782049e423021119053200af5eb3bf680e733b3f6a31216e2423355e2fa7  xfce4-datetime-plugin-0.8.1.tar.lz
-"
+"

xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-dev-tools
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfce4-dev-tools/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfce4-dev-tools-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-dev-tools-$version.tar.bz2"
 desc="XFCE developer tools and macros"
 requires="musl"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-static 
 
   make
@@ -28,5 +27,5 @@ build() {
 }
 
 sha512sums="
-54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7  xfce4-dev-tools-4.16.0.tar.bz2
+22784f256124ef6f49e768a89047986317cc79e10b4638d1409def006002e22b0be38edce06db21b7d0b8ca5b775c50f97d03252d0bf8df88540f004b9c446eb  xfce4-dev-tools-4.16.0.tar.lz
-"
+"

xfce/xfce4-dict/xfce4-dict.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-dict
 version=0.8.4
 build=1sml
 homepage="https://docs.xfce.org/apps/xfce4-dict/start"
-download="https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.4.tar.bz2"
+download="https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-$version.tar.bz2"
 desc="Dictionary plugin for Xfce panel"
 requires="librsvg xfce4-panel"
 
@@ -15,9 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc \
-    --localstatedir=/var
 
   make
   make install DESTDIR=$pkg
@@ -28,5 +26,5 @@ build() {
 }
 
 sha512sums="
-f662b94671f2179cc93010e9ff6ad7f3425cfafeb8d7c635fefb8e816d78273f0135d6c7ff3ed143e5e01985eb4275ac89827d197ed059fbfa79df69b327f253  xfce4-dict-0.8.4.tar.bz2
+583a3b15c0daf8c1916579ac589f1ed36090fd2e162e2c22d09a7fe23bba365b59d47faf0766822d4cb2fab8ffc99b0c2f87616ceec65480703d667d59c1b95a  xfce4-dict-0.8.4.tar.lz
 "

xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-diskperf-plugin
 version=2.6.3
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-2.6.3.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$version.tar.bz2"
 desc="Xfce panel plugin to show disk and partition performance"
 requires="xfce4-panel"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static
 
   make
@@ -29,5 +27,5 @@ build() {
 }
  
 sha512sums="
-fb7ffeaca14f67bb8a2423529f7040d3e51a0184a552f4636acfb4aec914da5fef95db2c710cad8cb1a3b96ef9abc308ad072b03f6e2ccc49793c0edb73dc116  xfce4-diskperf-plugin-2.6.3.tar.bz2
+a354ebc4056ce1447c0d2c97a9848d3038c9e5a78e8442d992bce3700e0e1c67353a970f7dc55ec861dc1621439d0a7c3d6b51b2267477ab15357cb522f20e34  xfce4-diskperf-plugin-2.6.3.tar.lz
-"
+"

xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-fsguard-plugin
 version=1.1.2
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-1.1.2.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-$version.tar.bz2"
 desc="File system usage plugin for Xfce panel"
 requires="xfce4-panel"
 
@@ -15,9 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc \
-    --localstatedir=/var
 
   make
   make install DESTDIR=$pkg
@@ -28,5 +26,5 @@ build() {
 }
 
 sha512sums="
-ff42f3d92292357f432a69fc401dec474b1eadabbcd7602f4453f7567faaa623d3672664c3a2baa98ea4e522c6a607b5a40327c5fea33b2d8535f15a4d511ebb  xfce4-fsguard-plugin-1.1.2.tar.bz2
+350485341152f9113049e273df61f1cdc8185880d7f2d93a283b842b91f46e1d8f4e2fe5f943b1ac1e11e2e2be37f76e0162e1fbb2cf0c819141f552f574702c  xfce4-fsguard-plugin-1.1.2.tar.lz
-"
+"

xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-netload-plugin
 version=1.4.0
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.4/xfce4-netload-plugin-1.4.0.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.4/xfce4-netload-plugin-$version.tar.bz2"
 desc="Network load plugin for Xfce panel"
 requires="xfce4-panel"
 
@@ -15,9 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc \
-    --localstatedir=/var
 
   make
   make install DESTDIR=$pkg
@@ -26,5 +24,5 @@ build() {
 }
 
 sha512sums="
-b9740251a81382f25ed3c89f10e842ef5432e36696df304a2b038d4a0a0a8c49d9988fff5274f3421870afe4f8cca1755222d6e7c514cea51e6eea7235a00382  xfce4-netload-plugin-1.4.0.tar.bz2
+e8d95f8845f3017ebe73b47fcc32d6f7df99e0fdbc46b3632b5fed646ccd3374fe25b0908456dd7465d3e3ee8a321c39cb8f305aee12fab58de5f18c07a94ff6  xfce4-netload-plugin-1.4.0.tar.lz
-"
+"

xfce/xfce4-notifyd/xfce4-notifyd.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-notifyd
 version=0.6.2
 build=1sml
 homepage="https://docs.xfce.org/apps/notifyd/start"
-download="https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.2.tar.bz2"
+download="https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-$version.tar.bz2"
 desc="Notification daemon for the Xfce desktop"
 requires="libnotify libxfce4ui"
 
@@ -17,8 +17,7 @@ build() {
   sed -e "s/^systemd_user_in_files =.*/systemd_user_in_files =/"  -i Makefile.in
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc 
 
   make
   make install DESTDIR=$pkg
@@ -29,5 +28,5 @@ build() {
 }
 
 sha512sums="
-13fdbcd5031ad44a89327eb65356a4d2c45315e0c8c507e457eee4cc95898794679163de9603a2059d9aaf20d62df317f8a09e0353f6adb526970a21d580b325  xfce4-notifyd-0.6.2.tar.bz2
+e991397c47f7ed66c05f96a29f34c5403fbcfc7400aff01e40ce77bb7107733e1c9491beab6fc8cbee9174f74be6dd6369cf344f14fa50ac7bde637e18b935ee  xfce4-notifyd-0.6.2.tar.lz
 "

xfce/xfce4-panel/xfce4-panel.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-panel
 version=4.16.1
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfce4-panel-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-panel-$version.tar.bz2"
 desc="Panel for the Xfce Desktop Environment"
 requires="desktop-file-utils exo garcon libxfce4ui xfconf"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --enable-gio-unix \
     --disable-static 
 
@@ -30,5 +28,5 @@ build() {
 }
 
 sha512sums="
-ec55a9812d61db755ea56a87ea1b709af2870703fc0e5a45797406f2f4c78e8afecd6e1bc081f3618a81030c9c0595ae8edbb29731d4bef3750e202bbf35e99c  xfce4-panel-4.16.1.tar.bz2
+0cec3ce868184eaf7d8f5c17c51556313b53f424a3e62e939fa293fcb49d1f5b3554ca6dba907a24b7b39e46a371d9ce75b908ed209876a77b22c37761ab44b1  xfce4-panel-4.16.1.tar.lz
-"
+"

xfce/xfce4-power-manager/xfce4-power-manager.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-power-manager
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfce4-power-manager/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfce4-power-manager-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-power-manager-$version.tar.bz2"
 desc="Power manager for Xfce"
 requires="upower libnotify libxfce4ui xfce4-panel xfce4-notifyd"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-polkit \
     --disable-network-manager 
 
@@ -29,5 +28,5 @@ build() {
 }
 
 sha512sums="
-1c6ecfb7696bc13c9b11fdfb4ad4e3278de2350bbc59c84c933b28c07c1a0c55b9954794e1f57e4407d2b54ffaace9ea5baed829bf0683332cf9d12bff7e71ec  xfce4-power-manager-4.16.0.tar.bz2
+2480d6ac40d7108d7b026a8e47e3ba34e343a07caed26e6ad37777d35ca714268e4716140fd5edaa492fd45cf9c0ce849b9a33733cd63a75bbca42f9ecd5a681  xfce4-power-manager-4.16.0.tar.lz
 "

xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-screenshooter
 version=1.9.8
 build=1sml
 homepage="https://docs.xfce.org/apps/screenshooter/start"
-download="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.9.tar.bz2"
+download="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-$version.tar.bz2"
 desc="Program to take screenshots in Xfce"
 requires="libsoup xfce4-panel"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static 
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-325697cf37075c313956621707ec9ae40a51ec85dfa65d73ccb8695a0b2d14cff0d62a9a30114b60b0404bd9ba25728bc4c350d3c2a65def6afa4a382883746a  xfce4-screenshooter-1.9.8.tar.bz2
+a037f291dc1a128d41b7ece84310e45d9f93cc4a19c85ed8917a4fb514cf95caafc0886d43bc6255f3548976c160f2ce3612dc013caf605179af6ddaaa9eb0c1  xfce4-screenshooter-1.9.8.tar.lz
-"
+"

xfce/xfce4-sensors-plugin/xfce4-sensors-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-sensors-plugin
 version=1.4.3
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.3.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-$version.tar.bz2"
 desc="Sensors plugin for XFCE panel"
 requires="lm-sensors xfce4-panel libnotify"
    
@@ -15,8 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc
 
   make 
   make install DESTDIR=$pkg
@@ -27,5 +26,5 @@ build() {
 }
 
 sha512sums="
-2cb91afaf740db5bbbb8451cfa0540ee979671e6a1a640ad61dfeb41328c057bc16fa668e9d536595ef460bfbd41617e8b3d27f63e02324e9764543fa6a0b2b5  xfce4-sensors-plugin-1.4.3.tar.bz2
+50dd07d52abe1bd71aedf965df0e228bfa16c75f4d36733febaa146f66a559734cd8c9aca51e22ba2857b26639de9f65d4da1d1e2543efd39325d68197f142e4  xfce4-sensors-plugin-1.4.3.tar.lz
 "

xfce/xfce4-session/xfce4-session.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-session
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfce4-session/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfce4-session-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-session-$version.tar.bz2"
 desc="Xfce Session Manager"
 requires="libsm xinit xrdb libxfce4ui"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="/" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static \
     --disable-polkit \
     --disable-legacy-sm
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad  xfce4-session-4.16.0.tar.bz2
+8740a030b3840fa798951075ad50854f65df8fd9da7276c87b3aa78b20ff34225d8e06efd3fc996fb11641715a9c741b84f8b2aaa49e4068df412f736c43a236  xfce4-session-4.16.0.tar.lz
 "

xfce/xfce4-settings/xfce4-settings.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-settings
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfce4-settings/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfce4-settings-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-settings-$version.tar.bz2"
 desc="Settings Manager for Xfce"
 requires="libnotify exo garcon libxfce4ui xfconf"
 
@@ -18,8 +18,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static \
     --enable-sound-settings \
     --enable-pluggable-dialogs \
@@ -34,6 +32,6 @@ build() {
 }
 
 sha512sums="
-38c06e4d4c0963019c20a3afadb0dc1bde8d1b477bcff2d0253e29beb5e4a8b5ae9d058b544cec6fe2bfc2c1d44f74283c94538eda25436d58db0754f112a238  xfce4-settings-4.16.0.tar.bz2
+ffb45c679280548b9351db5b485723645eadc07299ea8b10f35ba6a31821af9edee328bec09a7db4389f8bd9b88cffccb3cdda34ae0e7c053a2f650d1fbd7523  xfce4-settings-4.16.0.tar.lz
 09fe6b214dbf5638d9ba47e40f67a22a1d96d61031b3c9e6e971cefc8b0f511ed37bdc90c1a906f26522ebb04a6c458b82f4e23ed84cb90772445be961b244c3  default-xsettings-xml.patch
-"
+"

xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-systemload-plugin
 version=1.3.1
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-1.3.1.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-$version.tar.bz2"
 desc="System load plugin for the Xfce panel"
 requires="xfce4-panel"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876  xfce4-systemload-plugin-1.3.1.tar.bz2
+3a05924693be074a8ddbd1a6811e3dd367a0524ff6d31dc42bf50985b54f46054db5a4543b94e1948f97e2f066ca277ad41b727af1d7f47dac9d21592dc6e496  xfce4-systemload-plugin-1.3.1.tar.lz
-"
+"

xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-taskmanager
 version=1.5.2
 build=1sml
 homepage="https://docs.xfce.org/apps/xfce4-taskmanager"
-download="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-1.5.2.tar.bz2"
+download="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-$version.tar.bz2"
 desc="Task manager for Xfce Desktop Environment"
 requires="libwnck3 libxmu"
 
@@ -15,9 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc \
-    --localstatedir=/var
 
   make
   make install DESTDIR=$pkg
@@ -28,5 +26,5 @@ build() {
 }
 
 sha512sums="
-81074da8bf84a0fa9cecd2ab4d5672cb100e4c58ee66bdbaddcb5f6ac2886f615f4bed281920ed71e84fc94f8cd96577a3634b152d393a26f7cb4f62703d9683  xfce4-taskmanager-1.5.2.tar.bz2
+c3bf11695e10d647f8cf7d137d22e55e4c2ba2c9637df1b2547e47a49310756b9dc18e03b97a4d08e7e59fb554ff452959e60d1527bbea8e0b8038c389d4f9af  xfce4-taskmanager-1.5.2.tar.lz
 "

xfce/xfce4-terminal/xfce4-terminal.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-terminal
 version=0.8.10
 build=1sml
 homepage="https://docs.xfce.org/apps/terminal/start"
-download="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.10.tar.bz2"
+download="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$version.tar.bz2"
 desc="Modern terminal emulator for the Xfce Desktop Environment"
 requires="libxfce4ui vte5"
 
@@ -15,9 +15,7 @@ build() {
   fixbuilddirpermissions
 
   ./configure \
-    --prefix="" \
+    --prefix=""
-    --sysconfdir=/etc \
-    --localstatedir=/var
 
   make
   make install DESTDIR=$pkg
@@ -28,5 +26,5 @@ build() {
 }
 
 sha512sums="
-92310837445adf3b611c069d28abea05650b93d54500c0436fb90e0a9be8846122d6ca69f8e6f89a11f2067dc4bfae5557bb11af48d62135b2e5eb395ccdb0f4  xfce4-terminal-0.8.10.tar.bz2
+6e6718f269fc528aeb02921ebc0c7a9cbfa2135decc163561fcfe2a71d669e338cf03e7a26da98fb385385f86f2c308e9826dc81a6ddf0627cd8c0f43cda0374  xfce4-terminal-0.8.10.tar.lz
-"
+"

xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-wavelan-plugin
 version=0.6.2
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-0.6.2.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-$version.tar.bz2"
 desc="Xfce panel plugin to display wifi connectivity monitor"
 requires="xfce4-panel"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-90e0d5f2e9add1f177f0f69e537ccdeeaf518a122feb776cb8bce139b9af6ea7d248e758ae381b69041bbdefe2d38f2162d08b25fd246d98c3a028d743892123  xfce4-wavelan-plugin-0.6.2.tar.bz2
+96b8fa09c9f9d01a575627b23ddd5503d9437e04a17ad724f499c74bb0312d030116b13f28481bb5794ebb2c9c7b69b04121f8bf52ee5aa38b0fda19a2b0ae9a  xfce4-wavelan-plugin-0.6.2.tar.lz
-"
+"

xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-weather-plugin
 version=0.11.0
 build=1sml
 homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"
-download="https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.11/xfce4-weather-plugin-0.11.0.tar.bz2"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.11/xfce4-weather-plugin-$version.tar.bz2"
 desc="Weather plugin for Xfce panel"
 requires="libsoup libxml2 xfce4-panel"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --disable-static
 
   make
@@ -28,5 +26,5 @@ build() {
   mkfinalpkg
 }
 sha512sums="
-f4534d47f825358752ec6252fd0fc49a44ac682e4cdce960d744cd343f5f670473fa4175c59849282352dc75ca9b22b83d7ace68cedfc7dc89bcb21be24ccf86  xfce4-weather-plugin-0.11.0.tar.bz2
+60fb097c9e206f1d7c5a5575f06e103036089fb54c218a0a297b7c197a1a59d5fb5c37f7d4e42e70fdbdb2ee1a082853617c0f209833a8f9809b8f750e0f0e33  xfce4-weather-plugin-0.11.0.tar.lz
-"
+"

xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild

@@ -2,7 +2,7 @@ app=xfce4-whiskermenu-plugin
 version=2.7.1
 build=1sml
 homepage="https://gottcode.org/xfce4-whiskermenu-plugin/"
-download="https://gottcode.org/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1-src.tar.bz2"
+download="https://gottcode.org/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-$version-src.tar.bz2"
 desc="Alternate application launcher for Xfce"
 requires="gtk3 garcon xfce4-panel"
 
@@ -28,5 +28,5 @@ build() {
 }
 
 sha512sums="
-40a1124ad8bcb51a21cab20cde8079fdce31d57ade3da787235554391e5eb9ec747c646f46f84f9ecadacf124446bf80a7aec8138415b68ed064e02371aa7c0a  xfce4-whiskermenu-plugin-2.7.1-src.tar.bz2
+1a0ee8b7a641d7c6784d606c6081bc1589e3422b5fdab00d8440afe4ad3eba0ea536599a7c3e020433009e741d0421000765ff1717fcdd21b865261c3480e263  xfce4-whiskermenu-plugin-2.7.1.tar.lz
 "

xfce/xfconf/xfconf.SMBuild

@@ -2,7 +2,7 @@ app=xfconf
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfconf/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfconf-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfconf-$version.tar.bz2"
 desc="Xfce configuration storage system"
 requires="libxfce4util gobject-introspection"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-static \
     --disable-nls 
 
@@ -29,5 +28,5 @@ build() {
 }
 
 sha512sums="
-d2e6b272243d6eda71f42cb3df18cb9c0745a1864718639e9aa494902dfe5b4989b2761fee2195456e5725cad0f744978f9c95c6f01e48aa016a919ce3468344  xfconf-4.16.0.tar.bz2
+54b8ef8d94bca9fcf64523a84bbe0ca8936caba0ef95b4b7a62815fe985006974567147a70c63a4ce119dd16a24b9fc2ea610d6609c9f0e93ba15f9d63cef574  xfconf-4.16.0.tar.lz
-"
+"

xfce/xfdesktop/xfdesktop.SMBuild

@@ -2,7 +2,7 @@ app=xfdesktop
 version=4.16.0
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfdesktop/start"
-download="https://archive.xfce.org/xfce/4.16/src/xfdesktop-4.16.0.tar.bz2"
+download="https://archive.xfce.org/xfce/4.16/src/xfdesktop-$version.tar.bz2"
 desc="Xfce Desktop Manager"
 requires="exo garcon libxfce4ui thunar"
 
@@ -16,7 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --enable-thunarx \
     --enable-notifications 
 
@@ -29,5 +28,5 @@ build() {
 }
 
 sha512sums="
-e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129  xfdesktop-4.16.0.tar.bz2
+70ce063b7ed853457997ff27051a207b7e879567c78ca95f690fef09b0495d860eb8a834556bb01585aa6ac3e77edc1e324f5fbe6c3a29134fa05e33f5ccc0f4  xfdesktop-4.16.0.tar.lz
-"
+"

xfce/xfwm4-themes/xfwm4-themes.SMBuild

@@ -2,7 +2,7 @@ app=xfwm4-themes
 version=4.10.0
 build=1sml
 homepage="https://www.xfce.org"
-download="https://archive.xfce.org/src/art/xfwm4-themes/4.10/xfwm4-themes-4.10.0.tar.bz2"
+download="https://archive.xfce.org/src/art/xfwm4-themes/4.10/xfwm4-themes-$version.tar.bz2"
 desc="Collection of Xfce Window Manager Themes"
 requires="xfwm4"
 
@@ -16,8 +16,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
     --libexecdir=/lib 
 
   make
@@ -29,5 +27,5 @@ build() {
 }
 
 sha512sums="
-5c77e9f1b4b1051f86696605d2fcc8ba6abbc667fc2ae48c5eb1235d62fb99e5171a7c8b9b662147e86b1f508fd8d723f931bd211e41675ab390ec0d7a5e1305  xfwm4-themes-4.10.0.tar.bz2
+f0717659b782123b9fd287d8e48facfe7e66e6f0d23b88ddd3571549b4df3fe713198fa1fe0c635b42bc7697dc790da6814c20fa211a8d52485e9a120000711e  xfwm4-themes-4.10.0.tar.lz
-"
+"

xfce/xfwm4/xfwm4.SMBuild

@@ -2,7 +2,7 @@ app=xfwm4
 version=4.16.1
 build=1sml
 homepage="https://docs.xfce.org/xfce/xfwm4/start"
-download="https://archive.xfce.org/src/xfce/xfwm4/4.16/xfwm4-4.16.1.tar.bz2"
+download="https://archive.xfce.org/src/xfce/xfwm4/4.16/xfwm4-$version.tar.bz2"
 desc="Xfce Window Manager"
 requires="libepoxy libxpresent libxfce4ui xfconf"
 
@@ -14,8 +14,8 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  # Results in faster window draw and less CPU on the pi 
+  # Results in faster window draw and less CPU on the pi
-  if [ "$ARCH" = "aarch64" ]; then
+  if [ "$aarch" = "aarch64" ]; then
     compositingflag="--disable-compositor" 
   else
     compositingflag="--enable-compositor"
@@ -23,7 +23,6 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --disable-static \
     --enable-startup-notification \
     --enable-randr \
@@ -39,5 +38,5 @@ build() {
 }
 
 sha512sums="
-f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9  xfwm4-4.16.1.tar.bz2
+51c42e908c1807809488a4b168b8a56a29c629889123d9ec84f7b1a6f284f6ba06e40e8034846049d57a2e1623f19584605331841043eaa9464a7ff88896d78f  xfwm4-4.16.1.tar.lz
-"
+"