changeset 541:cacbd9d3d3a8

x11: use new FHS
author David Demelier <markand@malikania.fr>
date Wed, 10 Apr 2019 20:30:00 +0200
parents 55d07eb631e4
children ca639101cecc
files x11/appres/appres.sh x11/bdftopcf/bdftopcf.sh x11/bitmap/bitmap.sh x11/font-util/font-util.sh x11/iceauth/iceauth.sh x11/imake/imake.sh x11/libdmx/libdmx.sh x11/libfontenc/libfontenc.sh x11/libfs/libfs.sh x11/libice/libice.sh x11/libpciaccess/libpciaccess.sh x11/libpthread-stubs/libpthread-stubs.sh x11/libsm/libsm.sh x11/libx11/libx11.sh x11/libxau/libxau.sh x11/libxaw/libxaw.sh x11/libxcb/libxcb.sh x11/libxcomposite/libxcomposite.sh x11/libxcursor/libxcursor.sh x11/libxdamage/libxdamage.sh x11/libxdmcp/libxdmcp.sh x11/libxext/libxext.sh x11/libxfixes/libxfixes.sh x11/libxfont2/libxfont2.sh x11/libxft/libxft.sh x11/libxi/libxi.sh x11/libxinerama/libxinerama.sh x11/libxkbfile/libxkbfile.sh x11/libxmu/libxmu.sh x11/libxpm/libxpm.sh x11/libxpresent/libxpresent.sh x11/libxrandr/libxrandr.sh x11/libxrender/libxrender.sh x11/libxres/libxres.sh x11/libxscrnsaver/libxscrnsaver.sh x11/libxshmfence/libxshmfence.sh x11/libxt/libxt.sh x11/libxtrap/libxtrap.sh x11/libxtst/libxtst.sh x11/libxv/libxv.sh x11/libxvmc/libxvmc.sh x11/libxxf86dga/libxxf86dga.sh x11/libxxf86misc/libxxf86misc.sh x11/libxxf86vm/libxxf86vm.sh x11/luit/luit.sh x11/makedepend/makedepend.sh x11/mkfontscale/mkfontscale.sh x11/rendercheck/rendercheck.sh x11/rgb/rgb.sh x11/sessreg/sessreg.sh x11/setxkbmap/setxkbmap.sh x11/twm/twm.sh x11/util-macros/util-macros.sh x11/x11perf/x11perf.sh x11/xauth/xauth.sh x11/xbacklight/xbacklight.sh x11/xbitmaps/xbitmaps.sh x11/xcalc/xcalc.sh x11/xcb-proto/xcb-proto.sh x11/xcb-util-cursor/xcb-util-cursor.sh x11/xcb-util-image/xcb-util-image.sh x11/xcb-util-keysyms/xcb-util-keysyms.sh x11/xcb-util-renderutil/xcb-util-renderutil.sh x11/xcb-util-wm/xcb-util-wm.sh x11/xcb-util/xcb-util.sh x11/xclock/xclock.sh x11/xcompmgr/xcompmgr.sh x11/xcursorgen/xcursorgen.sh x11/xdm/xdm.sh x11/xdpyinfo/xdpyinfo.sh x11/xdriinfo/xdriinfo.sh x11/xev/xev.sh x11/xf86-input-evdev/xf86-input-evdev.sh x11/xf86-input-keyboard/xf86-input-keyboard.sh x11/xf86-input-libinput/xf86-input-libinput.sh x11/xf86-input-mouse/xf86-input-mouse.sh x11/xf86-video-vesa/xf86-video-vesa.sh x11/xfontsel/xfontsel.sh x11/xgamma/xgamma.sh x11/xhost/xhost.sh x11/xinit/xinit.sh x11/xinput/xinput.sh x11/xkbcomp/xkbcomp.sh x11/xkeyboard-config/xkeyboard-config.sh x11/xkill/xkill.sh x11/xlsfonts/xlsfonts.sh x11/xmag/xmag.sh x11/xmodmap/xmodmap.sh x11/xorg-server/xorg-server.sh x11/xorgproto/xorgproto.sh x11/xprop/xprop.sh x11/xrandr/xrandr.sh x11/xrdb/xrdb.sh x11/xset/xset.sh x11/xsetroot/xsetroot.sh x11/xtrans/xtrans.sh x11/xvinfo/xvinfo.sh x11/xwininfo/xwininfo.sh
diffstat 98 files changed, 159 insertions(+), 161 deletions(-) [+]
line wrap: on
line diff
--- a/x11/appres/appres.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/appres/appres.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/bdftopcf/bdftopcf.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/bdftopcf/bdftopcf.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/bitmap/bitmap.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/bitmap/bitmap.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/font-util/font-util.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/font-util/font-util.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/iceauth/iceauth.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/iceauth/iceauth.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/imake/imake.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/imake/imake.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/libdmx/libdmx.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libdmx/libdmx.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libdmx.la
+	rm -f $DESTDIR/lib/libdmx.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libfontenc/libfontenc.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libfontenc/libfontenc.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libfontenc.la
+	rm -f $DESTDIR/lib/libfontenc.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libfs/libfs.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libfs/libfs.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -38,10 +38,10 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
-	./configure --prefix=/usr --disable-static --enable-shared
+	./configure --prefix=/ --disable-static --enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libFS.la
+	rm -f $DESTDIR/lib/libFS.la
 
 	popd
 	rm -rf libFS-$PKGVERSION
--- a/x11/libice/libice.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libice/libice.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libICE.la
+	rm -f $DESTDIR/lib/libICE.la
 
 	popd
 	rm -rf libICE-$PKGVERSION
--- a/x11/libpciaccess/libpciaccess.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libpciaccess/libpciaccess.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libpciaccess.la
+	rm -f $DESTDIR/lib/libpciaccess.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libpthread-stubs/libpthread-stubs.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libpthread-stubs/libpthread-stubs.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/libsm/libsm.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libsm/libsm.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -52,13 +52,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_uuid
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libSM.la
+	rm -f $DESTDIR/lib/libSM.la
 
 	popd
 	rm -rf libSM-$PKGVERSION
--- a/x11/libx11/libx11.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libx11/libx11.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,12 +46,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libX11{,-xcb}.la
+	rm -f $DESTDIR/lib/libX11{,-xcb}.la
 
 	popd
 	rm -rf libX11-$PKGVERSION
--- a/x11/libxau/libxau.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxau/libxau.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXau.la
+	rm -f $DESTDIR/lib/libXau.la
 
 	popd
 	rm -rf libXau-$PKGVERSION
--- a/x11/libxaw/libxaw.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxaw/libxaw.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -49,12 +49,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXaw{6,7}.la
+	rm -f $DESTDIR/lib/libXaw{6,7}.la
 
 	popd
 	rm -rf libXaw-$PKGVERSION
--- a/x11/libxcb/libxcb.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxcb/libxcb.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,16 +47,16 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxcb.la
-	rm -f $DESTDIR/usr/lib/libxcb-{composite,damage,dpms,dri2,dri3,glx}.la
-	rm -f $DESTDIR/usr/lib/libxcb-{present,randr,record,render,res}.la
-	rm -f $DESTDIR/usr/lib/libxcb-{screensaver,shape,shm,sync,xf86dri,xv}.la
-	rm -f $DESTDIR/usr/lib/libxcb-{xfixes,xinerama,xinput,xkb,xtest,xvmc}.la
+	rm -f $DESTDIR/lib/libxcb.la
+	rm -f $DESTDIR/lib/libxcb-{composite,damage,dpms,dri2,dri3,glx}.la
+	rm -f $DESTDIR/lib/libxcb-{present,randr,record,render,res}.la
+	rm -f $DESTDIR/lib/libxcb-{screensaver,shape,shm,sync,xf86dri,xv}.la
+	rm -f $DESTDIR/lib/libxcb-{xfixes,xinerama,xinput,xkb,xtest,xvmc}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libxcomposite/libxcomposite.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxcomposite/libxcomposite.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXcomposite.la
+	rm -f $DESTDIR/lib/libXcomposite.la
 
 	popd
 	rm -rf libXcomposite-$PKGVERSION
--- a/x11/libxcursor/libxcursor.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxcursor/libxcursor.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,10 +47,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXcursor.la
+	rm -f $DESTDIR/lib/libXcursor.la
 
 	popd
 	rm -rf libXcursor-$PKGVERSION
--- a/x11/libxdamage/libxdamage.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxdamage/libxdamage.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXdamage.la
+	rm -f $DESTDIR/lib/libXdamage.la
 
 	popd
 	rm -rf libXdamage-$PKGVERSION
--- a/x11/libxdmcp/libxdmcp.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxdmcp/libxdmcp.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -44,12 +44,12 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXdmcp.la
+	rm -f $DESTDIR/lib/libXdmcp.la
 
 	popd
 	rm -rf libXdmcp-$PKGVERSION
--- a/x11/libxext/libxext.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxext/libxext.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXext.la
+	rm -f $DESTDIR/lib/libXext.la
 
 	popd
 	rm -rf libXext-$PKGVERSION
--- a/x11/libxfixes/libxfixes.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxfixes/libxfixes.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXfixes.la
+	rm -f $DESTDIR/lib/libXfixes.la
 
 	popd
 	rm -rf libXfixes-$PKGVERSION
--- a/x11/libxfont2/libxfont2.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxfont2/libxfont2.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -60,14 +60,14 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_bzip2 \
 		$with_freetype
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXfont2.la
+	rm -f $DESTDIR/lib/libXfont2.la
 
 	popd
 	rm -rf libXfont2-$PKGVERSION
--- a/x11/libxft/libxft.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxft/libxft.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,12 +46,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXft.la
+	rm -f $DESTDIR/lib/libXft.la
 
 	popd
 	rm -rf libXft-$PKGVERSION
--- a/x11/libxi/libxi.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxi/libxi.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,12 +47,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXi.la
+	rm -f $DESTDIR/lib/libXi.la
 
 	popd
 	rm -rf libXi-$PKGVERSION
--- a/x11/libxinerama/libxinerama.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxinerama/libxinerama.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXinerama.la
+	rm -f $DESTDIR/lib/libXinerama.la
 
 	popd
 	rm -rf libXinerama-$PKGVERSION
--- a/x11/libxkbfile/libxkbfile.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxkbfile/libxkbfile.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxkbfile.la
+	rm -f $DESTDIR/lib/libxkbfile.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libxmu/libxmu.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxmu/libxmu.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,12 +47,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXmu{,u}.la
+	rm -f $DESTDIR/lib/libXmu{,u}.la
 
 	popd
 	rm -rf libXmu-$PKGVERSION
--- a/x11/libxpm/libxpm.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxpm/libxpm.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,12 +48,12 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXpm.la
+	rm -f $DESTDIR/lib/libXpm.la
 
 	popd
 	rm -rf libXpm-$PKGVERSION
--- a/x11/libxpresent/libxpresent.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxpresent/libxpresent.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXpresent.la
+	rm -f $DESTDIR/lib/libXpresent.la
 
 	popd
 	rm -rf libXpresent-$PKGVERSION
--- a/x11/libxrandr/libxrandr.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxrandr/libxrandr.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,12 +47,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXrandr.la
+	rm -f $DESTDIR/lib/libXrandr.la
 
 	popd
 	rm -rf libXrandr-$PKGVERSION
--- a/x11/libxrender/libxrender.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxrender/libxrender.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXrender.la
+	rm -f $DESTDIR/lib/libXrender.la
 
 	popd
 	rm -rf libXrender-$PKGVERSION
--- a/x11/libxres/libxres.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxres/libxres.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXRes.la
+	rm -f $DESTDIR/lib/libXRes.la
 
 	popd
 	rm -rf libXres-$PKGVERSION
--- a/x11/libxscrnsaver/libxscrnsaver.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxscrnsaver/libxscrnsaver.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,12 +46,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXss.la
+	rm -f $DESTDIR/lib/libXss.la
 
 	popd
 	rm -rf libXScrnSaver-$PKGVERSION
--- a/x11/libxshmfence/libxshmfence.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxshmfence/libxshmfence.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,13 +43,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		--enable-futex
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxshmfence.la
+	rm -f $DESTDIR/lib/libxshmfence.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libxt/libxt.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxt/libxt.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,12 +47,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXt.la
+	rm -f $DESTDIR/lib/libXt.la
 
 	popd
 	rm -rf libXt-$PKGVERSION
--- a/x11/libxtrap/libxtrap.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxtrap/libxtrap.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,12 +47,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXTrap.la
+	rm -f $DESTDIR/lib/libXTrap.la
 
 	popd
 	rm -rf libXTrap-$PKGVERSION
--- a/x11/libxtst/libxtst.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxtst/libxtst.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,12 +47,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXtst.la
+	rm -f $DESTDIR/lib/libXtst.la
 
 	popd
 	rm -rf libXtst-$PKGVERSION
--- a/x11/libxv/libxv.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxv/libxv.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXv.la
+	rm -f $DESTDIR/lib/libXv.la
 
 	popd
 	rm -rf libXv-$PKGVERSION
--- a/x11/libxvmc/libxvmc.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxvmc/libxvmc.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,12 +47,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXvMC{,W}.la
+	rm -f $DESTDIR/lib/libXvMC{,W}.la
 
 	popd
 	rm -rf libXvMC-$PKGVERSION
--- a/x11/libxxf86dga/libxxf86dga.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxxf86dga/libxxf86dga.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXxf86dga.la
+	rm -f $DESTDIR/lib/libXxf86dga.la
 
 	popd
 	rm -rf libXxf86dga-$PKGVERSION
--- a/x11/libxxf86misc/libxxf86misc.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxxf86misc/libxxf86misc.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXxf86misc.la
+	rm -f $DESTDIR/lib/libXxf86misc.la
 
 	popd
 	rm -rf libXxf86misc-$PKGVERSION
--- a/x11/libxxf86vm/libxxf86vm.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/libxxf86vm/libxxf86vm.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libXxf86vm.la
+	rm -f $DESTDIR/lib/libXxf86vm.la
 
 	popd
 	rm -rf libXxf86vm-$PKGVERSION
--- a/x11/luit/luit.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/luit/luit.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -41,7 +41,7 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
-	./configure --prefix=/usr
+	./configure --prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/makedepend/makedepend.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/makedepend/makedepend.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/mkfontscale/mkfontscale.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/mkfontscale/mkfontscale.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -56,7 +56,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_bzip2
 	make
 	make install DESTDIR=$DESTDIR
--- a/x11/rendercheck/rendercheck.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/rendercheck/rendercheck.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,7 +46,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/rgb/rgb.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/rgb/rgb.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/sessreg/sessreg.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/sessreg/sessreg.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,7 +46,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/setxkbmap/setxkbmap.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/setxkbmap/setxkbmap.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/twm/twm.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/twm/twm.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -50,7 +50,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/util-macros/util-macros.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/util-macros/util-macros.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -42,9 +42,9 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 	make
-	make install pkgconfigdir=/usr/lib/pkgconfig DESTDIR=$DESTDIR
+	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/x11perf/x11perf.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/x11perf/x11perf.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -49,7 +49,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xauth/xauth.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xauth/xauth.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xbacklight/xbacklight.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xbacklight/xbacklight.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xbitmaps/xbitmaps.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xbitmaps/xbitmaps.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,9 +43,9 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
-	make install pkgconfigdir=/usr/lib/pkgconfig DESTDIR=$DESTDIR
+	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcalc/xcalc.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcalc/xcalc.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,7 +47,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xcb-proto/xcb-proto.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcb-proto/xcb-proto.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -29,7 +29,7 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
 	pushd $PKGNAME-$PKGVERSION
 
-	./configure --prefix=/usr
+	./configure --prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xcb-util-cursor/xcb-util-cursor.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcb-util-cursor/xcb-util-cursor.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxcb-cursor.la
+	rm -f $DESTDIR/lib/libxcb-cursor.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-image/xcb-util-image.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcb-util-image/xcb-util-image.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxcb-image.la
+	rm -f $DESTDIR/lib/libxcb-image.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxcb-keysyms.la
+	rm -f $DESTDIR/lib/libxcb-keysyms.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxcb-render-util.la
+	rm -f $DESTDIR/lib/libxcb-render-util.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util-wm/xcb-util-wm.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcb-util-wm/xcb-util-wm.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxcb-{ewmh,icccm}.la
+	rm -f $DESTDIR/lib/libxcb-{ewmh,icccm}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xcb-util/xcb-util.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcb-util/xcb-util.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -42,12 +42,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libxcb-util.la
+	rm -f $DESTDIR/lib/libxcb-util.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xclock/xclock.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xclock/xclock.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -56,7 +56,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_freetype
 	make
 	make install DESTDIR=$DESTDIR
--- a/x11/xcompmgr/xcompmgr.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcompmgr/xcompmgr.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -49,7 +49,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xcursorgen/xcursorgen.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xcursorgen/xcursorgen.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,7 +47,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xdm/xdm.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xdm/xdm.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -52,13 +52,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--without-selinux \
 		--without-pam \
 		--without-systemd-daemon
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/X11/xdm/libXdmGreet.la
+	rm -f $DESTDIR/lib/X11/xdm/libXdmGreet.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xdpyinfo/xdpyinfo.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xdpyinfo/xdpyinfo.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -55,7 +55,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xdriinfo/xdriinfo.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xdriinfo/xdriinfo.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xev/xev.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xev/xev.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,7 +46,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xf86-input-evdev/xf86-input-evdev.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xf86-input-evdev/xf86-input-evdev.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,10 +48,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/xorg/modules/input/evdev_drv.la
+	rm -f $DESTDIR/lib/xorg/modules/input/evdev_drv.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-input-keyboard/xf86-input-keyboard.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xf86-input-keyboard/xf86-input-keyboard.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,10 +43,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/xorg/modules/input/kbd_drv.la
+	rm -f $DESTDIR/lib/xorg/modules/input/kbd_drv.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-input-libinput/xf86-input-libinput.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xf86-input-libinput/xf86-input-libinput.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,10 +46,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/xorg/modules/input/libinput_drv.la
+	rm -f $DESTDIR/lib/xorg/modules/input/libinput_drv.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-input-mouse/xf86-input-mouse.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xf86-input-mouse/xf86-input-mouse.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,10 +43,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/xorg/modules/input/mouse_drv.la
+	rm -f $DESTDIR/lib/xorg/modules/input/mouse_drv.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xf86-video-vesa/xf86-video-vesa.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xf86-video-vesa/xf86-video-vesa.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,10 +43,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/xorg/modules/drivers/vesa_drv.la
+	rm -f $DESTDIR/lib/xorg/modules/drivers/vesa_drv.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xfontsel/xfontsel.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xfontsel/xfontsel.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xgamma/xgamma.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xgamma/xgamma.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -46,7 +46,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xhost/xhost.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xhost/xhost.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xinit/xinit.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xinit/xinit.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,8 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xinput/xinput.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xinput/xinput.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -49,7 +49,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xkbcomp/xkbcomp.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xkbcomp/xkbcomp.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,7 +47,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xkeyboard-config/xkeyboard-config.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xkeyboard-config/xkeyboard-config.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -52,10 +52,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
-	make install pkgconfigdir=/usr/lib/pkgconfig DESTDIR=$DESTDIR
+	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xkill/xkill.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xkill/xkill.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xlsfonts/xlsfonts.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xlsfonts/xlsfonts.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xmag/xmag.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xmag/xmag.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xmodmap/xmodmap.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xmodmap/xmodmap.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xorg-server/xorg-server.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xorg-server/xorg-server.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -68,8 +68,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--localstatedir=/var \
+		--prefix=/ \
 		--enable-pciaccess \
 		--enable-libdrm \
 		--disable-systemd-logind \
@@ -79,9 +78,9 @@
 		$with_wayland
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/xorg/modules/drivers/*.la
-	rm -f $DESTDIR/usr/lib/xorg/modules/extensions/*.la
-	rm -f $DESTDIR/usr/lib/xorg/modules/*.la
+	rm -f $DESTDIR/lib/xorg/modules/drivers/*.la
+	rm -f $DESTDIR/lib/xorg/modules/extensions/*.la
+	rm -f $DESTDIR/lib/xorg/modules/*.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xorgproto/xorgproto.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xorgproto/xorgproto.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,8 +43,8 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--datadir=/usr/lib \
-		--prefix=/usr
+		--datadir=/lib \
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xprop/xprop.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xprop/xprop.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xrandr/xrandr.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xrandr/xrandr.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -47,7 +47,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xrdb/xrdb.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xrdb/xrdb.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xset/xset.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xset/xset.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--without-fontcache
 	make
 	make install DESTDIR=$DESTDIR
--- a/x11/xsetroot/xsetroot.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xsetroot/xsetroot.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xtrans/xtrans.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xtrans/xtrans.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,9 +43,9 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
-	make install pkgconfigdir=/usr/lib/pkgconfig DESTDIR=$DESTDIR
+	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/xvinfo/xvinfo.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xvinfo/xvinfo.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xwininfo/xwininfo.sh	Wed Apr 10 20:28:00 2019 +0200
+++ b/x11/xwininfo/xwininfo.sh	Wed Apr 10 20:30:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR