user/[X11 stuff]: modernise and fix syntax

9 files changed, 8 insertions, 28 deletions

diff --git a/user/bdftopcf/APKBUILD b/user/bdftopcf/APKBUILD
index 5e7282cca..438a2d8a2 100644
--- a/user/bdftopcf/APKBUILD
+++ b/user/bdftopcf/APKBUILD
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/bdftopcf-$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/encodings/APKBUILD b/user/encodings/APKBUILD
index c535aba6a..b8ed52b7b 100644
--- a/user/encodings/APKBUILD
+++ b/user/encodings/APKBUILD
@@ -8,6 +8,7 @@ arch="noarch"
 license="Public-Domain"
 depends=""
 makedepends="cmd:gzip mkfontscale util-macros"
+subpackages=""
 source="https://www.X.Org/releases/individual/font/encodings-$pkgver.tar.bz2"
 
 build() {
diff --git a/user/font-alias/APKBUILD b/user/font-alias/APKBUILD
index dee7f9487..e995fa571 100644
--- a/user/font-alias/APKBUILD
+++ b/user/font-alias/APKBUILD
@@ -8,16 +8,15 @@ arch="noarch"
 license="MIT"
 depends=""
 makedepends="util-macros"
+subpackages=""
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 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/libxkbui/APKBUILD b/user/libxkbui/APKBUILD
index 80340714e..1d5bcf8f2 100644
--- a/user/libxkbui/APKBUILD
+++ b/user/libxkbui/APKBUILD
@@ -12,13 +12,11 @@ subpackages="$pkgname-dev"
 source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libxmu/APKBUILD b/user/libxmu/APKBUILD
index 854f806a3..60360e16c 100644
--- a/user/libxmu/APKBUILD
+++ b/user/libxmu/APKBUILD
@@ -7,11 +7,11 @@ url="https://www.X.Org/"
 arch="all"
 options="!check"  # No test suite.
 license="X11 AND MIT"
-subpackages="$pkgname-dev $pkgname-doc"
 depends=""
 depends_dev="util-linux-dev"
 makedepends="$depends_dev libsm-dev libx11-dev libxext-dev libxt-dev
 	util-macros xmlto"
+subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.X.Org/releases/individual/lib/libXmu-$pkgver.tar.bz2"
 builddir="$srcdir"/libXmu-$pkgver
 
diff --git a/user/libxxf86misc/APKBUILD b/user/libxxf86misc/APKBUILD
index 2ead4d544..ab259eb3d 100644
--- a/user/libxxf86misc/APKBUILD
+++ b/user/libxxf86misc/APKBUILD
@@ -6,14 +6,13 @@ pkgdesc="X11 XFree86 miscellaneous extension library"
 url="https://www.X.Org/"
 arch="all"
 license="X11"
-subpackages="$pkgname-dev $pkgname-doc"
 depends=""
 makedepends="libx11-dev libxext-dev util-macros xorgproto-dev"
+subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.X.Org/releases/individual/lib/libXxf86misc-$pkgver.tar.bz2"
 builddir="$srcdir/libXxf86misc-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,12 +22,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/mcpp/APKBUILD b/user/mcpp/APKBUILD
index 233899f5f..761a3149e 100644
--- a/user/mcpp/APKBUILD
+++ b/user/mcpp/APKBUILD
@@ -15,13 +15,11 @@ source="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	02-gniibe-fixes.patch"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -36,17 +34,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-
-	mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
-	mv "$pkgdir"/usr/share/doc/$pkgname/LICENSE \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 sha512sums="1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235  mcpp-2.7.2.tar.gz
diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD
index cfda36c89..71f215ecd 100644
--- a/user/mkfontscale/APKBUILD
+++ b/user/mkfontscale/APKBUILD
@@ -6,12 +6,12 @@ pkgdesc="Scalable font file creator for X.Org"
 url="https://www.X.Org/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-doc"
 depends=""
 makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev zlib-dev"
 provides="mkfontdir=$pkgver-r$pkgrel"
 triggers="$pkgname.trigger=/usr/share/fonts/*
 	$pkgname.trigger=/usr/share/fonts/X11/*"
+subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
diff --git a/user/xinit/APKBUILD b/user/xinit/APKBUILD
index 37556cb27..9ec540564 100644
--- a/user/xinit/APKBUILD
+++ b/user/xinit/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="X.Org initialisation program"
 url="https://www.X.Org/"
 arch="all"
 license="X11"
-subpackages="$pkgname-doc"
 depends="cmd:mcookie xauth xmodmap xrdb"
 makedepends="libx11-dev util-macros"
+subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/xinit-$pkgver.tar.bz2
 	06_move_serverauthfile_into_tmp.patch
 	xinitrc