user/*: Modernise / fix syntax / deps

54 files changed, 15 insertions, 168 deletions

diff --git a/user/appres/APKBUILD b/user/appres/APKBUILD
index 49dcb6115..c0d655348 100644
--- a/user/appres/APKBUILD
+++ b/user/appres/APKBUILD
@@ -4,17 +4,15 @@ pkgname=appres
 pkgver=1.0.5
 pkgrel=0
 pkgdesc="list X application resource database"
-url="https://xorg.freedesktop.org/"
+url="https://www.X.org/"
 arch="all"
 license="X11"
 depends=""
 makedepends="libx11-dev libxt-dev xproto"
-install=""
 subpackages="$pkgname-doc"
-source="https://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/beforelight/APKBUILD b/user/beforelight/APKBUILD
index 88fef1821..4cb502c9d 100644
--- a/user/beforelight/APKBUILD
+++ b/user/beforelight/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/beforelight-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	chmod a+w config.sub
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/editres/APKBUILD b/user/editres/APKBUILD
index f0f7bd1d8..a22c2d68a 100644
--- a/user/editres/APKBUILD
+++ b/user/editres/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/editres-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD
index 62d1ddcae..c8c4c8739 100644
--- a/user/fonttosfnt/APKBUILD
+++ b/user/fonttosfnt/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/fonttosfnt-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/fslsfonts/APKBUILD b/user/fslsfonts/APKBUILD
index 5734d3301..d910a5664 100644
--- a/user/fslsfonts/APKBUILD
+++ b/user/fslsfonts/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/fslsfonts-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/fstobdf/APKBUILD b/user/fstobdf/APKBUILD
index 0c39dcfba..ad6ffdb18 100644
--- a/user/fstobdf/APKBUILD
+++ b/user/fstobdf/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/fstobdf-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/iceauth/APKBUILD b/user/iceauth/APKBUILD
index 5f59f51ce..5700b0b24 100644
--- a/user/iceauth/APKBUILD
+++ b/user/iceauth/APKBUILD
@@ -3,16 +3,15 @@ pkgname=iceauth
 pkgver=1.0.8
 pkgrel=0
 pkgdesc="X.Org ICE authority file utility"
-url="http://xorg.freedesktop.org"
+url="https://www.X.org/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-doc"
+depends=""
 makedepends="libice-dev util-macros"
+subpackages="$pkgname-doc"
 source="http://www.x.org/releases/individual/app/iceauth-$pkgver.tar.bz2"
 
-
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +21,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/ico/APKBUILD b/user/ico/APKBUILD
index 8f6c2d7dd..8be9ae00c 100644
--- a/user/ico/APKBUILD
+++ b/user/ico/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/ico-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/liblbxutil/APKBUILD b/user/liblbxutil/APKBUILD
index def4dc83c..2c7f03f5d 100644
--- a/user/liblbxutil/APKBUILD
+++ b/user/liblbxutil/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-dev"
 source="https://www.x.org/releases/individual/lib/liblbxutil-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	chmod a+w config.sub
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/listres/APKBUILD b/user/listres/APKBUILD
index 987002899..168ef1a37 100644
--- a/user/listres/APKBUILD
+++ b/user/listres/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/listres-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/luit/APKBUILD b/user/luit/APKBUILD
index 09e135e12..5464e3d9d 100644
--- a/user/luit/APKBUILD
+++ b/user/luit/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/luit-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/oclock/APKBUILD b/user/oclock/APKBUILD
index d75964c02..58369a584 100644
--- a/user/oclock/APKBUILD
+++ b/user/oclock/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/oclock-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/rendercheck/APKBUILD b/user/rendercheck/APKBUILD
index 30a821e2c..10ba7f50c 100644
--- a/user/rendercheck/APKBUILD
+++ b/user/rendercheck/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/rendercheck-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/rgb/APKBUILD b/user/rgb/APKBUILD
index 42be8cbe4..f45691ebc 100644
--- a/user/rgb/APKBUILD
+++ b/user/rgb/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/rgb-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/showfont/APKBUILD b/user/showfont/APKBUILD
index 63af1593b..45168cabb 100644
--- a/user/showfont/APKBUILD
+++ b/user/showfont/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/showfont-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/smproxy/APKBUILD b/user/smproxy/APKBUILD
index 03e3eda4e..95416aa0a 100644
--- a/user/smproxy/APKBUILD
+++ b/user/smproxy/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/smproxy-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/transset/APKBUILD b/user/transset/APKBUILD
index 8b063867c..f5b9ba519 100644
--- a/user/transset/APKBUILD
+++ b/user/transset/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/transset-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/twm/APKBUILD b/user/twm/APKBUILD
index fad37c996..de08c9b46 100644
--- a/user/twm/APKBUILD
+++ b/user/twm/APKBUILD
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xcmsdb/APKBUILD b/user/xcmsdb/APKBUILD
index 973f006f0..f0f595804 100644
--- a/user/xcmsdb/APKBUILD
+++ b/user/xcmsdb/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xcmsdb-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xconsole/APKBUILD b/user/xconsole/APKBUILD
index 4bbac0359..8c7a64ff7 100644
--- a/user/xconsole/APKBUILD
+++ b/user/xconsole/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xconsole-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xdbedizzy/APKBUILD b/user/xdbedizzy/APKBUILD
index 5d190e7c5..a16dc62fe 100644
--- a/user/xdbedizzy/APKBUILD
+++ b/user/xdbedizzy/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xdbedizzy-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xdpyinfo/APKBUILD b/user/xdpyinfo/APKBUILD
index 903b9a11d..52dd15d09 100644
--- a/user/xdpyinfo/APKBUILD
+++ b/user/xdpyinfo/APKBUILD
@@ -7,12 +7,13 @@ url="https://www.X.Org/"
 arch="all"
 license="X11"
 depends=""
-makedepends="libx11-dev libxcomposite-dev libxext-dev libxinerama-dev libxrender-dev libxtst-dev libxxf86dga-dev libxxf86misc-dev libxxf86vm-dev util-macros xorgproto-dev"
+makedepends="libx11-dev libxcomposite-dev libxext-dev libxinerama-dev
+	libxrender-dev libxtst-dev libxxf86dga-dev libxxf86misc-dev
+	libxxf86vm-dev util-macros xorgproto-dev"
 subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xdriinfo/APKBUILD b/user/xdriinfo/APKBUILD
index ae39b7f97..fe20244c0 100644
--- a/user/xdriinfo/APKBUILD
+++ b/user/xdriinfo/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xdriinfo-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xedit/APKBUILD b/user/xedit/APKBUILD
index 3ad25658c..6926602ed 100644
--- a/user/xedit/APKBUILD
+++ b/user/xedit/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xedit-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xeyes/APKBUILD b/user/xeyes/APKBUILD
index 76edc0272..253d4738b 100644
--- a/user/xeyes/APKBUILD
+++ b/user/xeyes/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xeyes-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfindproxy/APKBUILD b/user/xfindproxy/APKBUILD
index 430427fb2..bca667899 100644
--- a/user/xfindproxy/APKBUILD
+++ b/user/xfindproxy/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xfindproxy-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfontsel/APKBUILD b/user/xfontsel/APKBUILD
index e34c9d2ac..2256f0359 100644
--- a/user/xfontsel/APKBUILD
+++ b/user/xfontsel/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xfontsel-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfs/APKBUILD b/user/xfs/APKBUILD
index d7e0fdeb6..e36ce177c 100644
--- a/user/xfs/APKBUILD
+++ b/user/xfs/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xfs-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfwp/APKBUILD b/user/xfwp/APKBUILD
index 46540f2ce..07d72f7b5 100644
--- a/user/xfwp/APKBUILD
+++ b/user/xfwp/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xfwp-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xgamma/APKBUILD b/user/xgamma/APKBUILD
index d93f3853b..f6f49a5cb 100644
--- a/user/xgamma/APKBUILD
+++ b/user/xgamma/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xgamma-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xgc/APKBUILD b/user/xgc/APKBUILD
index 8e55f8a4f..472ea5da1 100644
--- a/user/xgc/APKBUILD
+++ b/user/xgc/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xgc-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xinput/APKBUILD b/user/xinput/APKBUILD
index 8e5dde983..7e4014048 100644
--- a/user/xinput/APKBUILD
+++ b/user/xinput/APKBUILD
@@ -8,6 +8,7 @@ url="https://www.X.Org/"
 arch="all"
 options="!check"  # No test suite.
 license="X11"
+depends=""
 makedepends="util-macros libx11-dev libxext-dev libxi-dev libxrandr-dev
 	libxinerama-dev"
 subpackages="$pkgname-doc"
diff --git a/user/xkbevd/APKBUILD b/user/xkbevd/APKBUILD
index 2402772b7..6ddef0568 100644
--- a/user/xkbevd/APKBUILD
+++ b/user/xkbevd/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xkbevd-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xkbprint/APKBUILD b/user/xkbprint/APKBUILD
index a313ee04c..ce4387c78 100644
--- a/user/xkbprint/APKBUILD
+++ b/user/xkbprint/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xkbprint-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xkbutils/APKBUILD b/user/xkbutils/APKBUILD
index d627a69a8..ec291a6e9 100644
--- a/user/xkbutils/APKBUILD
+++ b/user/xkbutils/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xkbutils-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	chmod a+w config.sub
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xkill/APKBUILD b/user/xkill/APKBUILD
index bc4d3cceb..f0fd097e4 100644
--- a/user/xkill/APKBUILD
+++ b/user/xkill/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xkill-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xload/APKBUILD b/user/xload/APKBUILD
index 71414484b..a89b3a6ca 100644
--- a/user/xload/APKBUILD
+++ b/user/xload/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xload-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	CFLAGS="$CFLAGS -DRLOADSTUB" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xlsclients/APKBUILD b/user/xlsclients/APKBUILD
index 81b470a1d..511d2d152 100644
--- a/user/xlsclients/APKBUILD
+++ b/user/xlsclients/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xlsclients-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xlsfonts/APKBUILD b/user/xlsfonts/APKBUILD
index 054386397..d3765c29b 100644
--- a/user/xlsfonts/APKBUILD
+++ b/user/xlsfonts/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xlsfonts-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xmag/APKBUILD b/user/xmag/APKBUILD
index 85191ca8d..ca81d63c8 100644
--- a/user/xmag/APKBUILD
+++ b/user/xmag/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xmag-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xmh/APKBUILD b/user/xmh/APKBUILD
index d7594e546..ae460e7ae 100644
--- a/user/xmh/APKBUILD
+++ b/user/xmh/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xmh-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xmodmap/APKBUILD b/user/xmodmap/APKBUILD
index abf6c45ba..a37dd7b67 100644
--- a/user/xmodmap/APKBUILD
+++ b/user/xmodmap/APKBUILD
@@ -12,7 +12,7 @@ makedepends="libx11-dev util-macros"
 subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
-build () {
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/user/xpr/APKBUILD b/user/xpr/APKBUILD
index a8980c5c4..103f60db6 100644
--- a/user/xpr/APKBUILD
+++ b/user/xpr/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xpr-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xprop/APKBUILD b/user/xprop/APKBUILD
index 1339105a2..252178ea3 100644
--- a/user/xprop/APKBUILD
+++ b/user/xprop/APKBUILD
@@ -16,7 +16,10 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
 	make
 }
 
diff --git a/user/xrandr/APKBUILD b/user/xrandr/APKBUILD
index e9e37a32c..59ffef0ec 100644
--- a/user/xrandr/APKBUILD
+++ b/user/xrandr/APKBUILD
@@ -9,9 +9,9 @@ url="https://www.X.Org/"
 arch="all"
 options="!check"  # No test suite.
 license="MIT"
-subpackages="$pkgname-doc"
 depends=""
 makedepends="libxrandr-dev util-macros"
+subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz"
 
 build() {
diff --git a/user/xrefresh/APKBUILD b/user/xrefresh/APKBUILD
index e942b954b..d84afd58c 100644
--- a/user/xrefresh/APKBUILD
+++ b/user/xrefresh/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xrefresh-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xrx/APKBUILD b/user/xrx/APKBUILD
index 97e71a06d..f2e79d9fb 100644
--- a/user/xrx/APKBUILD
+++ b/user/xrx/APKBUILD
@@ -14,13 +14,11 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xrx-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xscope/APKBUILD b/user/xscope/APKBUILD
index 9b4ce4205..7a51fc97c 100644
--- a/user/xscope/APKBUILD
+++ b/user/xscope/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xscope-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xsetmode/APKBUILD b/user/xsetmode/APKBUILD
index 37615c3f3..09a038202 100644
--- a/user/xsetmode/APKBUILD
+++ b/user/xsetmode/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xsetmode-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xsetpointer/APKBUILD b/user/xsetpointer/APKBUILD
index 0e0d5f697..35ca4aa67 100644
--- a/user/xsetpointer/APKBUILD
+++ b/user/xsetpointer/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xsetpointer-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xsm/APKBUILD b/user/xsm/APKBUILD
index f3e42cd18..b0a5b9968 100644
--- a/user/xsm/APKBUILD
+++ b/user/xsm/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xsm-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xvidtune/APKBUILD b/user/xvidtune/APKBUILD
index 4c4e9d8b7..bcdcb69eb 100644
--- a/user/xvidtune/APKBUILD
+++ b/user/xvidtune/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xvidtune-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	chmod a+w config.sub
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xwd/APKBUILD b/user/xwd/APKBUILD
index c7bd606be..23cf55fa6 100644
--- a/user/xwd/APKBUILD
+++ b/user/xwd/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xwd-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xwud/APKBUILD b/user/xwud/APKBUILD
index 72f7e9e50..4a606fc9f 100644
--- a/user/xwud/APKBUILD
+++ b/user/xwud/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/xwud-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }