diff --git a/xorg/at-spi2-core/at-spi2-core.SMBuild b/xorg/at-spi2-core/at-spi2-core.SMBuild
index eab8886..8158282 100755
--- a/xorg/at-spi2-core/at-spi2-core.SMBuild
+++ b/xorg/at-spi2-core/at-spi2-core.SMBuild
@@ -17,7 +17,8 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix=/ \
+  meson .. \
+    --prefix=/usr \
     --sysconfdir=/etc
 
   ninja
diff --git a/xorg/bdftopcf/bdftopcf.SMBuild b/xorg/bdftopcf/bdftopcf.SMBuild
index 2356d6e..db1047f 100755
--- a/xorg/bdftopcf/bdftopcf.SMBuild
+++ b/xorg/bdftopcf/bdftopcf.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/dbus/dbus.SMBuild b/xorg/dbus/dbus.SMBuild
index 5e2e3af..fedfdc9 100755
--- a/xorg/dbus/dbus.SMBuild
+++ b/xorg/dbus/dbus.SMBuild
@@ -20,11 +20,11 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --bindir=/bin \
     --sbindir=/bin \
     --sysconfdir=/etc \
-    --libexecdir=/lib \
+    --libexecdir=/usr/lib \
     --localstatedir=/var \
     --disable-Werror \
     --disable-installed-tests \
diff --git a/xorg/dconf/dconf.SMBuild b/xorg/dconf/dconf.SMBuild
index cbb487b..a6b491d 100755
--- a/xorg/dconf/dconf.SMBuild
+++ b/xorg/dconf/dconf.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --disable-gtk-doc \
diff --git a/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild b/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild
index fb6132b..36d7a3d 100755
--- a/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild
+++ b/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild
@@ -18,8 +18,8 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir -p $pkg/share/fonts/TTF
-  cp -a ttf/* $pkg/share/fonts/TTF/
+  mkdir -p $pkg/usr/share/fonts/TTF
+  cp -a ttf/* $pkg/usr/share/fonts/TTF/
   cp LICENSE $pkgdocs/
 
   mkdir -p $pkg/etc/fonts/conf.d
diff --git a/xorg/font-util/font-util.SMBuild b/xorg/font-util/font-util.SMBuild
index dc2106b..08e7573 100755
--- a/xorg/font-util/font-util.SMBuild
+++ b/xorg/font-util/font-util.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc 
 
   make
diff --git a/xorg/fontconfig/fontconfig.SMBuild b/xorg/fontconfig/fontconfig.SMBuild
index 3d403f0..d372746 100755
--- a/xorg/fontconfig/fontconfig.SMBuild
+++ b/xorg/fontconfig/fontconfig.SMBuild
@@ -5,7 +5,7 @@ build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/fontconfig/"
 download="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$version.tar.gz"
 desc="Library for configuring and customizing font access"
-requires="expat json-c freetype"
+requires="expat json-c gperf freetype"
 
 prepbuilddir() {
   mkandenterbuilddir
@@ -20,10 +20,10 @@ build() {
   printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > test/Makefile.in
 
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc \
-    --localstatedir=/var \
     --bindir=/bin \
+    --localstatedir=/var \
     --disable-docs 
 
   make
diff --git a/xorg/freeglut/freeglut.SMBuild b/xorg/freeglut/freeglut.SMBuild
index 305929d..44082d4 100755
--- a/xorg/freeglut/freeglut.SMBuild
+++ b/xorg/freeglut/freeglut.SMBuild
@@ -19,10 +19,9 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   cmake .. \
-    -DCMAKE_C_COMPILER="$CC" \
-    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DFREEGLUT_BUILD_DEMOS=ON \
-    -DCMAKE_INSTALL_LIBDIR=/lib \
+    -DCMAKE_INSTALL_LIBDIR=lib \
     -DFREEGLUT_BUILD_SHARED_LIBS=ON \
     -DFREEGLUT_BUILD_STATIC_LIBS=OFF 
 
@@ -36,4 +35,4 @@ build() {
 
 sha512sums="
 fddac6a7e16a52aafb5e1ab307014a103d29b239bd532ea04dd535432a10b8d47db3cd865793453edbef291994c02ea14d1e96ee284764bb37d7ea720517a9cc  freeglut-3.4.0.tar.lz
-"
\ No newline at end of file
+"
diff --git a/xorg/gccmakedep/gccmakedep.SMBuild b/xorg/gccmakedep/gccmakedep.SMBuild
index da91a0b..06a2102 100755
--- a/xorg/gccmakedep/gccmakedep.SMBuild
+++ b/xorg/gccmakedep/gccmakedep.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/glew/glew.SMBuild b/xorg/glew/glew.SMBuild
index 925be14..6ea4965 100755
--- a/xorg/glew/glew.SMBuild
+++ b/xorg/glew/glew.SMBuild
@@ -21,7 +21,7 @@ build() {
   TEMPFILE=$(mktemp)
   fromdos < config/config.guess ; rm -f $TEMPFILE
 
-  make install.all GLEW_DEST="$pkg" LIBDIR="$pkg"/lib
+  make install.all GLEW_DEST="$pkg" LIBDIR="$pkg"/usr/lib
 
   cp LICENSE.txt $pkgdocs/
 
diff --git a/xorg/glu/glu.SMBuild b/xorg/glu/glu.SMBuild
index cfc088d..2f2c0da 100755
--- a/xorg/glu/glu.SMBuild
+++ b/xorg/glu/glu.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/iceauth/iceauth.SMBuild b/xorg/iceauth/iceauth.SMBuild
index 90d4c5a..359d903 100755
--- a/xorg/iceauth/iceauth.SMBuild
+++ b/xorg/iceauth/iceauth.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc 
 
   make
diff --git a/xorg/imake/imake.SMBuild b/xorg/imake/imake.SMBuild
index a031b1a..69e0390 100755
--- a/xorg/imake/imake.SMBuild
+++ b/xorg/imake/imake.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/imlib2/imlib2.SMBuild b/xorg/imlib2/imlib2.SMBuild
index f745e42..45108c2 100755
--- a/xorg/imlib2/imlib2.SMBuild
+++ b/xorg/imlib2/imlib2.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/jasper/jasper.SMBuild b/xorg/jasper/jasper.SMBuild
index 2257d41..c896d71 100755
--- a/xorg/jasper/jasper.SMBuild
+++ b/xorg/jasper/jasper.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX= \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DLATEX_FOUND=NO
 
diff --git a/xorg/lcms2/lcms2.SMBuild b/xorg/lcms2/lcms2.SMBuild
index f7b7fb9..487755f 100755
--- a/xorg/lcms2/lcms2.SMBuild
+++ b/xorg/lcms2/lcms2.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc 
 
   make
diff --git a/xorg/libdrm/libdrm.SMBuild b/xorg/libdrm/libdrm.SMBuild
index e7504df..243eb85 100755
--- a/xorg/libdrm/libdrm.SMBuild
+++ b/xorg/libdrm/libdrm.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
-   --prefix=/ \
+   --prefix=/usr \
    -Dcairo-tests=disabled
 
   ninja
diff --git a/xorg/libepoxy/libepoxy.SMBuild b/xorg/libepoxy/libepoxy.SMBuild
index 1b16b4f..12e7718 100755
--- a/xorg/libepoxy/libepoxy.SMBuild
+++ b/xorg/libepoxy/libepoxy.SMBuild
@@ -18,7 +18,8 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix=/
+  meson .. \
+    --prefix=/usr
 
   ninja
   DESTDIR="$pkg" ninja install
diff --git a/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild b/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild
index 2d321fc..7513f00 100755
--- a/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild
+++ b/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild
@@ -17,8 +17,8 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir -p $pkg/share/fonts/TTF
-  cp -a *ttf $pkg/share/fonts/TTF/
+  mkdir -p $pkg/usr/share/fonts/TTF
+  cp -a *ttf $pkg/usr/share/fonts/TTF/
 
   install -Dm 644 $srcdir/60-liberation.conf $pkg/etc/fonts/conf.d/60-liberation.conf
 
diff --git a/xorg/libevdev/libevdev.SMBuild b/xorg/libevdev/libevdev.SMBuild
index 7467bce..cdbb731 100755
--- a/xorg/libevdev/libevdev.SMBuild
+++ b/xorg/libevdev/libevdev.SMBuild
@@ -19,7 +19,8 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
-    --prefix=/ \
+    --prefix=/usr \
+    --bindir=/bin \
     -Dtests=disabled \
     -Ddocumentation=disabled 
 
diff --git a/xorg/libfontenc/libfontenc.SMBuild b/xorg/libfontenc/libfontenc.SMBuild
index 58eeb9c..8d2a0a0 100755
--- a/xorg/libfontenc/libfontenc.SMBuild
+++ b/xorg/libfontenc/libfontenc.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libgudev/libgudev.SMBuild b/xorg/libgudev/libgudev.SMBuild
index b78b542..4af737d 100755
--- a/xorg/libgudev/libgudev.SMBuild
+++ b/xorg/libgudev/libgudev.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static \
     --disable-umockdev 
 
diff --git a/xorg/libice/libice.SMBuild b/xorg/libice/libice.SMBuild
index dcd43e9..5e6d8f3 100755
--- a/xorg/libice/libice.SMBuild
+++ b/xorg/libice/libice.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libinput/libinput.SMBuild b/xorg/libinput/libinput.SMBuild
index cc06395..da869a7 100755
--- a/xorg/libinput/libinput.SMBuild
+++ b/xorg/libinput/libinput.SMBuild
@@ -19,7 +19,8 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
-    --prefix=/ \
+    --prefix=/usr \
+    --bindir=/bin \
     -Ddocumentation=false \
     -Dtests=false \
     -Ddebug-gui=false
diff --git a/xorg/libraw/libraw.SMBuild b/xorg/libraw/libraw.SMBuild
index 0b138ef..85a622c 100755
--- a/xorg/libraw/libraw.SMBuild
+++ b/xorg/libraw/libraw.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static \
     --enable-openmp 
 
diff --git a/xorg/libsm/libsm.SMBuild b/xorg/libsm/libsm.SMBuild
index 3771394..2bfd0c3 100755
--- a/xorg/libsm/libsm.SMBuild
+++ b/xorg/libsm/libsm.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libtiff/libtiff.SMBuild b/xorg/libtiff/libtiff.SMBuild
index 1739b03..7cd603f 100755
--- a/xorg/libtiff/libtiff.SMBuild
+++ b/xorg/libtiff/libtiff.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --libdir=/lib \
     --with-pic \
     --enable-shared \
diff --git a/xorg/libvdpau/libvdpau.SMBuild b/xorg/libvdpau/libvdpau.SMBuild
index 0857fc3..6191bc1 100755
--- a/xorg/libvdpau/libvdpau.SMBuild
+++ b/xorg/libvdpau/libvdpau.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libwacom/libwacom.SMBuild b/xorg/libwacom/libwacom.SMBuild
index a7fef2a..e697ce6 100755
--- a/xorg/libwacom/libwacom.SMBuild
+++ b/xorg/libwacom/libwacom.SMBuild
@@ -18,7 +18,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
+    --bindir=/bin \
     --disable-static 
 
   make
diff --git a/xorg/libx11/libx11.SMBuild b/xorg/libx11/libx11.SMBuild
index 54de1e8..2787e15 100755
--- a/xorg/libx11/libx11.SMBuild
+++ b/xorg/libx11/libx11.SMBuild
@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
-    --disable-static 
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/libxau/libxau.SMBuild b/xorg/libxau/libxau.SMBuild
index 5441759..b6ac885 100755
--- a/xorg/libxau/libxau.SMBuild
+++ b/xorg/libxau/libxau.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxaw/libxaw.SMBuild b/xorg/libxaw/libxaw.SMBuild
index 4e3fbe3..414fb3c 100755
--- a/xorg/libxaw/libxaw.SMBuild
+++ b/xorg/libxaw/libxaw.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxaw3d/libxaw3d.SMBuild b/xorg/libxaw3d/libxaw3d.SMBuild
index 4cba672..60f3c6d 100755
--- a/xorg/libxaw3d/libxaw3d.SMBuild
+++ b/xorg/libxaw3d/libxaw3d.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libxaw3dxft/libxaw3dxft.SMBuild b/xorg/libxaw3dxft/libxaw3dxft.SMBuild
index 7798f4a..0e24fcf 100755
--- a/xorg/libxaw3dxft/libxaw3dxft.SMBuild
+++ b/xorg/libxaw3dxft/libxaw3dxft.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxcb/libxcb.SMBuild b/xorg/libxcb/libxcb.SMBuild
index aadf9e5..8445130 100755
--- a/xorg/libxcb/libxcb.SMBuild
+++ b/xorg/libxcb/libxcb.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/ \
+    --prefix=/usr \
     --disable-static \
     --disable-devel-docs \
     --without-doxygen
diff --git a/xorg/libxcomposite/libxcomposite.SMBuild b/xorg/libxcomposite/libxcomposite.SMBuild
index 349353b..b38cb00 100755
--- a/xorg/libxcomposite/libxcomposite.SMBuild
+++ b/xorg/libxcomposite/libxcomposite.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libxcursor/libxcursor.SMBuild b/xorg/libxcursor/libxcursor.SMBuild
index 1c5e7f5..4c0448e 100755
--- a/xorg/libxcursor/libxcursor.SMBuild
+++ b/xorg/libxcursor/libxcursor.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxdamage/libxdamage.SMBuild b/xorg/libxdamage/libxdamage.SMBuild
index 72cc371..acd47f3 100755
--- a/xorg/libxdamage/libxdamage.SMBuild
+++ b/xorg/libxdamage/libxdamage.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libxdmcp/libxdmcp.SMBuild b/xorg/libxdmcp/libxdmcp.SMBuild
index f0820af..58f22df 100755
--- a/xorg/libxdmcp/libxdmcp.SMBuild
+++ b/xorg/libxdmcp/libxdmcp.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxext/libxext.SMBuild b/xorg/libxext/libxext.SMBuild
index f7ebeae..71e424d 100755
--- a/xorg/libxext/libxext.SMBuild
+++ b/xorg/libxext/libxext.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   ac_cv_func__XEatDataWords=yes \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxfixes/libxfixes.SMBuild b/xorg/libxfixes/libxfixes.SMBuild
index eb79c18..b38979d 100755
--- a/xorg/libxfixes/libxfixes.SMBuild
+++ b/xorg/libxfixes/libxfixes.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxfont2/libxfont2.SMBuild b/xorg/libxfont2/libxfont2.SMBuild
index f53ffbd..600f662 100755
--- a/xorg/libxfont2/libxfont2.SMBuild
+++ b/xorg/libxfont2/libxfont2.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxft/libxft.SMBuild b/xorg/libxft/libxft.SMBuild
index 7857a73..cb52be9 100755
--- a/xorg/libxft/libxft.SMBuild
+++ b/xorg/libxft/libxft.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxi/libxi.SMBuild b/xorg/libxi/libxi.SMBuild
index 0199418..d418050 100755
--- a/xorg/libxi/libxi.SMBuild
+++ b/xorg/libxi/libxi.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxinerama/libxinerama.SMBuild b/xorg/libxinerama/libxinerama.SMBuild
index b3a8253..17a8fcc 100755
--- a/xorg/libxinerama/libxinerama.SMBuild
+++ b/xorg/libxinerama/libxinerama.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxkbcommon/libxkbcommon.SMBuild b/xorg/libxkbcommon/libxkbcommon.SMBuild
index eb4709d..b2ecae1 100755
--- a/xorg/libxkbcommon/libxkbcommon.SMBuild
+++ b/xorg/libxkbcommon/libxkbcommon.SMBuild
@@ -18,7 +18,8 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix=/ \
+  meson .. \
+    --prefix=/usr \
     --buildtype=release \
     -Denable-docs=false
 
@@ -32,4 +33,4 @@ build() {
 
 sha512sums="
 bbba6665f052c04c7450413cc5e2badd6bfd41326b0e4c60e3ec01d730cae695fd34ce2662b8a91ece7a76b974a0ea330f7462dd5d2db148b0d0da26264ced9c  libxkbcommon-1.5.0.tar.xz
-"
\ No newline at end of file
+"
diff --git a/xorg/libxkbfile/libxkbfile.SMBuild b/xorg/libxkbfile/libxkbfile.SMBuild
index 2e7460b..10ee8cb 100755
--- a/xorg/libxkbfile/libxkbfile.SMBuild
+++ b/xorg/libxkbfile/libxkbfile.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxklavier/libxklavier.SMBuild b/xorg/libxklavier/libxklavier.SMBuild
index 0093377..69cd585 100755
--- a/xorg/libxklavier/libxklavier.SMBuild
+++ b/xorg/libxklavier/libxklavier.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static \
     --with-xkb-base=/etc/X11/xkb
 
diff --git a/xorg/libxmu/libxmu.SMBuild b/xorg/libxmu/libxmu.SMBuild
index d5f14bd..5071339 100755
--- a/xorg/libxmu/libxmu.SMBuild
+++ b/xorg/libxmu/libxmu.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxpm/libxpm.SMBuild b/xorg/libxpm/libxpm.SMBuild
index 0ea9c69..e04327b 100755
--- a/xorg/libxpm/libxpm.SMBuild
+++ b/xorg/libxpm/libxpm.SMBuild
@@ -18,7 +18,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
+    --bindir=/bin \
     --disable-static 
 
   make
diff --git a/xorg/libxpresent/libxpresent.SMBuild b/xorg/libxpresent/libxpresent.SMBuild
index 2ce7140..7b46dc8 100755
--- a/xorg/libxpresent/libxpresent.SMBuild
+++ b/xorg/libxpresent/libxpresent.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libxrandr/libxrandr.SMBuild b/xorg/libxrandr/libxrandr.SMBuild
index ddd2aba..1070d8b 100755
--- a/xorg/libxrandr/libxrandr.SMBuild
+++ b/xorg/libxrandr/libxrandr.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   ac_cv_func__XEatDataWords=yes \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxrender/libxrender.SMBuild b/xorg/libxrender/libxrender.SMBuild
index 33edb28..40360d9 100755
--- a/xorg/libxrender/libxrender.SMBuild
+++ b/xorg/libxrender/libxrender.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxscrnsaver/libxscrnsaver.SMBuild b/xorg/libxscrnsaver/libxscrnsaver.SMBuild
index 853e51d..4f25a30 100755
--- a/xorg/libxscrnsaver/libxscrnsaver.SMBuild
+++ b/xorg/libxscrnsaver/libxscrnsaver.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libxshmfence/libxshmfence.SMBuild b/xorg/libxshmfence/libxshmfence.SMBuild
index d3282ce..f052ae7 100755
--- a/xorg/libxshmfence/libxshmfence.SMBuild
+++ b/xorg/libxshmfence/libxshmfence.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxt/libxt.SMBuild b/xorg/libxt/libxt.SMBuild
index 15f3ff8..faef7ff 100755
--- a/xorg/libxt/libxt.SMBuild
+++ b/xorg/libxt/libxt.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxtst/libxtst.SMBuild b/xorg/libxtst/libxtst.SMBuild
index fb42e29..3f5545e 100755
--- a/xorg/libxtst/libxtst.SMBuild
+++ b/xorg/libxtst/libxtst.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/libxv/libxv.SMBuild b/xorg/libxv/libxv.SMBuild
index 683d262..7efa3f6 100755
--- a/xorg/libxv/libxv.SMBuild
+++ b/xorg/libxv/libxv.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/libxxf86vm/libxxf86vm.SMBuild b/xorg/libxxf86vm/libxxf86vm.SMBuild
index 73a966e..cb30af6 100755
--- a/xorg/libxxf86vm/libxxf86vm.SMBuild
+++ b/xorg/libxxf86vm/libxxf86vm.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/makedepend/makedepend.SMBuild b/xorg/makedepend/makedepend.SMBuild
index a3c6e59..8e888c9 100755
--- a/xorg/makedepend/makedepend.SMBuild
+++ b/xorg/makedepend/makedepend.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/mesa-demos/mesa-demos.SMBuild b/xorg/mesa-demos/mesa-demos.SMBuild
index 8975cf0..f7375dc 100755
--- a/xorg/mesa-demos/mesa-demos.SMBuild
+++ b/xorg/mesa-demos/mesa-demos.SMBuild
@@ -18,9 +18,9 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-gles1 \
-    --with-system-data-files=/share/mesa-demos
+    --with-system-data-files=/usr/share/mesa-demos
 
   make
   make install DESTDIR=$pkg 
diff --git a/xorg/mkfontscale/mkfontscale.SMBuild b/xorg/mkfontscale/mkfontscale.SMBuild
index f891398..21c018e 100755
--- a/xorg/mkfontscale/mkfontscale.SMBuild
+++ b/xorg/mkfontscale/mkfontscale.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/mtdev/mtdev.SMBuild b/xorg/mtdev/mtdev.SMBuild
index 941f875..c91ca1a 100755
--- a/xorg/mtdev/mtdev.SMBuild
+++ b/xorg/mtdev/mtdev.SMBuild
@@ -18,9 +18,9 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
-    --disable-static \
-    $builddist
+    --prefix=/usr \
+    --bindir=/bin \
+    --disable-static 
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/numlockx/numlockx.SMBuild b/xorg/numlockx/numlockx.SMBuild
index 7fb652b..d0ea5a3 100755
--- a/xorg/numlockx/numlockx.SMBuild
+++ b/xorg/numlockx/numlockx.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/pixman/pixman.SMBuild b/xorg/pixman/pixman.SMBuild
index 1e8c874..a22162e 100755
--- a/xorg/pixman/pixman.SMBuild
+++ b/xorg/pixman/pixman.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild 
-  meson .. --prefix=/
+  meson .. --prefix=/usr
 
   ninja
   DESTDIR="$pkg" ninja install
diff --git a/xorg/setxkbmap/setxkbmap.SMBuild b/xorg/setxkbmap/setxkbmap.SMBuild
index 688a243..c98f874 100755
--- a/xorg/setxkbmap/setxkbmap.SMBuild
+++ b/xorg/setxkbmap/setxkbmap.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/spandsp/spandsp.SMBuild b/xorg/spandsp/spandsp.SMBuild
index 7288c46..7501d2f 100755
--- a/xorg/spandsp/spandsp.SMBuild
+++ b/xorg/spandsp/spandsp.SMBuild
@@ -18,9 +18,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
-    --disable-static \
-    $builddist
+    --prefix=/usr \
+    --disable-static
 
   make
   make install DESTDIR=$pkg 
diff --git a/xorg/startup-notification/startup-notification.SMBuild b/xorg/startup-notification/startup-notification.SMBuild
index 7dae6b1..15ced9e 100755
--- a/xorg/startup-notification/startup-notification.SMBuild
+++ b/xorg/startup-notification/startup-notification.SMBuild
@@ -18,9 +18,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
-    --disable-static \
-    $builddist
+    --prefix=/usr \
+    --disable-static
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild b/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild
index 86536e1..83f4acd 100755
--- a/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild
+++ b/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild
@@ -17,8 +17,8 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir -p $pkg/share/fonts/TTF
-  cp -a */*.ttf $pkg/share/fonts/TTF/
+  mkdir -p $pkg/usr/share/fonts/TTF
+  cp -a */*.ttf $pkg/usr/share/fonts/TTF/
 
   mkdir -p $pkg/etc/fonts/conf.avail
   find . -name "*.conf" -exec cp -a {} $pkg/etc/fonts/conf.avail \;
diff --git a/xorg/twm/twm.SMBuild b/xorg/twm/twm.SMBuild
index ea65a81..e50a0ed 100755
--- a/xorg/twm/twm.SMBuild
+++ b/xorg/twm/twm.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/vala/vala.SMBuild b/xorg/vala/vala.SMBuild
index 6fe3343..0b9d27e 100755
--- a/xorg/vala/vala.SMBuild
+++ b/xorg/vala/vala.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-valadoc
 
   make
diff --git a/xorg/xauth/xauth.SMBuild b/xorg/xauth/xauth.SMBuild
index 620f300..246cf0d 100755
--- a/xorg/xauth/xauth.SMBuild
+++ b/xorg/xauth/xauth.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xbitmaps/xbitmaps.SMBuild b/xorg/xbitmaps/xbitmaps.SMBuild
index 42a922d..63a5256 100755
--- a/xorg/xbitmaps/xbitmaps.SMBuild
+++ b/xorg/xbitmaps/xbitmaps.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xcalc/xcalc.SMBuild b/xorg/xcalc/xcalc.SMBuild
index fa4cc2b..bdb7073 100755
--- a/xorg/xcalc/xcalc.SMBuild
+++ b/xorg/xcalc/xcalc.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xcb-proto/xcb-proto.SMBuild b/xorg/xcb-proto/xcb-proto.SMBuild
index 0537263..716b069 100755
--- a/xorg/xcb-proto/xcb-proto.SMBuild
+++ b/xorg/xcb-proto/xcb-proto.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild b/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild
index c9526b2..7984d87 100755
--- a/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild
+++ b/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/xcb-util-image/xcb-util-image.SMBuild b/xorg/xcb-util-image/xcb-util-image.SMBuild
index f8e5aa5..2b1c874 100755
--- a/xorg/xcb-util-image/xcb-util-image.SMBuild
+++ b/xorg/xcb-util-image/xcb-util-image.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild b/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild
index 5e4a2d1..a02bf5a 100755
--- a/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild
+++ b/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild b/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild
index 88391ac..81d6f6d 100755
--- a/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild
+++ b/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/xcb-util-wm/xcb-util-wm.SMBuild b/xorg/xcb-util-wm/xcb-util-wm.SMBuild
index 49b3717..4ded2f6 100755
--- a/xorg/xcb-util-wm/xcb-util-wm.SMBuild
+++ b/xorg/xcb-util-wm/xcb-util-wm.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make
diff --git a/xorg/xcb-util/xcb-util.SMBuild b/xorg/xcb-util/xcb-util.SMBuild
index da133c6..a92d94a 100755
--- a/xorg/xcb-util/xcb-util.SMBuild
+++ b/xorg/xcb-util/xcb-util.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static
 
   make
diff --git a/xorg/xclipboard/xclipboard.SMBuild b/xorg/xclipboard/xclipboard.SMBuild
index deba6bd..529c4f8 100755
--- a/xorg/xclipboard/xclipboard.SMBuild
+++ b/xorg/xclipboard/xclipboard.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xclock/xclock.SMBuild b/xorg/xclock/xclock.SMBuild
index b2e28f7..7e6308b 100755
--- a/xorg/xclock/xclock.SMBuild
+++ b/xorg/xclock/xclock.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-   --prefix=
+   --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild
index 273e9aa..32678e7 100755
--- a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild
+++ b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild
@@ -20,7 +20,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-man
 
   make
diff --git a/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild b/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild
index c632eea..419029e 100755
--- a/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild
+++ b/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --disable-documentation
 
diff --git a/xorg/xdg-utils/xdg-utils.SMBuild b/xorg/xdg-utils/xdg-utils.SMBuild
index 48c929c..ec6c70a 100755
--- a/xorg/xdg-utils/xdg-utils.SMBuild
+++ b/xorg/xdg-utils/xdg-utils.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg 
diff --git a/xorg/xev/xev.SMBuild b/xorg/xev/xev.SMBuild
index ca55a45..07a1295 100755
--- a/xorg/xev/xev.SMBuild
+++ b/xorg/xev/xev.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild b/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild
index 16a51c8..af71c6a 100755
--- a/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild
+++ b/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-selective-werror 
 
   make
diff --git a/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild b/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild
index 78366bd..76b081b 100755
--- a/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild
+++ b/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-selective-werror 
 
   make
diff --git a/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild b/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild
index 7ec20e6..f57e1ab 100755
--- a/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild
+++ b/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild b/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild
index 2aaaa9c..568931c 100755
--- a/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild
+++ b/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc 
 
   make
diff --git a/xorg/xf86-video-ati/xf86-video-ati.SMBuild b/xorg/xf86-video-ati/xf86-video-ati.SMBuild
index 07448f0..e371c1c 100755
--- a/xorg/xf86-video-ati/xf86-video-ati.SMBuild
+++ b/xorg/xf86-video-ati/xf86-video-ati.SMBuild
@@ -1,6 +1,6 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=xf86-video-ati
-version=19.1.0
+version=22.0.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
 download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-$version.tar.bz2"
@@ -19,7 +19,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --enable-glamor 
 
@@ -32,5 +32,5 @@ build() {
 }
 
 sha512sums="
-f4bcb88be32001ed26dc6596ee5c507d1d60cd2fb40081c62724ecc345353da790b596be2f8834a0f914e0bced9f99eae829777d362f2b75cb3dcefdfe44865b  xf86-video-ati-19.1.0.tar.lz
+fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe  xf86-video-ati-22.0.0.tar.xz
 "
diff --git a/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild b/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild
index 73b67cd..736d827 100755
--- a/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild
+++ b/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg 
diff --git a/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild b/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild
index 87cbbad..89774b8 100755
--- a/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild
+++ b/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --enable-pciaccess \
     --disable-selective-werror 
 
diff --git a/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild b/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild
index 93c59c3..b4b26b7 100755
--- a/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild
+++ b/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --sysconfdir=/etc 
 
   make
diff --git a/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild b/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild
index 93dae15..95a1ebb 100755
--- a/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild
+++ b/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xfontsel/xfontsel.SMBuild b/xorg/xfontsel/xfontsel.SMBuild
index 08237e2..5fe1137 100755
--- a/xorg/xfontsel/xfontsel.SMBuild
+++ b/xorg/xfontsel/xfontsel.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xhost/xhost.SMBuild b/xorg/xhost/xhost.SMBuild
index 650160b..bc5aa5c 100755
--- a/xorg/xhost/xhost.SMBuild
+++ b/xorg/xhost/xhost.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xinit/xinit.SMBuild b/xorg/xinit/xinit.SMBuild
index e77a5d7..de08d78 100755
--- a/xorg/xinit/xinit.SMBuild
+++ b/xorg/xinit/xinit.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xinput/xinput.SMBuild b/xorg/xinput/xinput.SMBuild
index 8488eb1..8777d4e 100755
--- a/xorg/xinput/xinput.SMBuild
+++ b/xorg/xinput/xinput.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xkbcomp/xkbcomp.SMBuild b/xorg/xkbcomp/xkbcomp.SMBuild
index f7b1718..ec0385e 100755
--- a/xorg/xkbcomp/xkbcomp.SMBuild
+++ b/xorg/xkbcomp/xkbcomp.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xmodmap/xmodmap.SMBuild b/xorg/xmodmap/xmodmap.SMBuild
index cfe320d..0027afb 100755
--- a/xorg/xmodmap/xmodmap.SMBuild
+++ b/xorg/xmodmap/xmodmap.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xorg-cf-files/xorg-cf-files.SMBuild b/xorg/xorg-cf-files/xorg-cf-files.SMBuild
index a1a7450..773e181 100755
--- a/xorg/xorg-cf-files/xorg-cf-files.SMBuild
+++ b/xorg/xorg-cf-files/xorg-cf-files.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xorg-fonts/xorg-fonts.SMBuild b/xorg/xorg-fonts/xorg-fonts.SMBuild
index 94acce5..84b0ed2 100755
--- a/xorg/xorg-fonts/xorg-fonts.SMBuild
+++ b/xorg/xorg-fonts/xorg-fonts.SMBuild
@@ -32,8 +32,7 @@ build() {
     cd "$font"-1.?.?
 
     ./configure \
-      --prefix= \
-      $builddist
+      --prefix=/usr
 
     make
     make install DESTDIR="$pkg"
diff --git a/xorg/xorg-macros/xorg-macros.SMBuild b/xorg/xorg-macros/xorg-macros.SMBuild
index e96e059..54b7a37 100755
--- a/xorg/xorg-macros/xorg-macros.SMBuild
+++ b/xorg/xorg-macros/xorg-macros.SMBuild
@@ -19,7 +19,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xorgproto/xorgproto.SMBuild b/xorg/xorgproto/xorgproto.SMBuild
index aa87227..04f4ebc 100755
--- a/xorg/xorgproto/xorgproto.SMBuild
+++ b/xorg/xorgproto/xorgproto.SMBuild
@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix=/ \
-    --datadir=/lib
+  meson .. --prefix=/usr
 
   ninja
   DESTDIR="$pkg" ninja install
diff --git a/xorg/xrandr/xrandr.SMBuild b/xorg/xrandr/xrandr.SMBuild
index 2680451..67d96c0 100755
--- a/xorg/xrandr/xrandr.SMBuild
+++ b/xorg/xrandr/xrandr.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xrdb/xrdb.SMBuild b/xorg/xrdb/xrdb.SMBuild
index de68c34..bb53e69 100755
--- a/xorg/xrdb/xrdb.SMBuild
+++ b/xorg/xrdb/xrdb.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xset/xset.SMBuild b/xorg/xset/xset.SMBuild
index 9122ceb..9804689 100755
--- a/xorg/xset/xset.SMBuild
+++ b/xorg/xset/xset.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xsetroot/xsetroot.SMBuild b/xorg/xsetroot/xsetroot.SMBuild
index 8ace5b2..d76c80e 100755
--- a/xorg/xsetroot/xsetroot.SMBuild
+++ b/xorg/xsetroot/xsetroot.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xtrans/xtrans.SMBuild b/xorg/xtrans/xtrans.SMBuild
index fed2099..ea71a47 100755
--- a/xorg/xtrans/xtrans.SMBuild
+++ b/xorg/xtrans/xtrans.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr 
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xvinfo/xvinfo.SMBuild b/xorg/xvinfo/xvinfo.SMBuild
index 8b15ee6..fbab7a8 100755
--- a/xorg/xvinfo/xvinfo.SMBuild
+++ b/xorg/xvinfo/xvinfo.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg
diff --git a/xorg/xwd/xwd.SMBuild b/xorg/xwd/xwd.SMBuild
index 7fb4629..6e754a3 100755
--- a/xorg/xwd/xwd.SMBuild
+++ b/xorg/xwd/xwd.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr
 
   make
   make install DESTDIR=$pkg