user/[X11 fonts]: create fonts.dir and fonts.scale on the target system

31 files changed, 117 insertions, 66 deletions

diff --git a/user/font-adobe-100dpi/APKBUILD b/user/font-adobe-100dpi/APKBUILD
index 023fc78b8..4547cee87 100644
--- a/user/font-adobe-100dpi/APKBUILD
+++ b/user/font-adobe-100dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="100dpi X11 fonts from Adobe"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987  font-adobe-100dpi-1.0.3.tar.bz2"
diff --git a/user/font-adobe-75dpi/APKBUILD b/user/font-adobe-75dpi/APKBUILD
index 957ea82d4..8f3f7ac0c 100644
--- a/user/font-adobe-75dpi/APKBUILD
+++ b/user/font-adobe-75dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="75dpi X11 fonts from Adobe"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d  font-adobe-75dpi-1.0.3.tar.bz2"
diff --git a/user/font-adobe-utopia-100dpi/APKBUILD b/user/font-adobe-utopia-100dpi/APKBUILD
index c2d2dbdd1..ffd9eb443 100644
--- a/user/font-adobe-utopia-100dpi/APKBUILD
+++ b/user/font-adobe-utopia-100dpi/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
 # [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts
 # [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec
 license="Utopia"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.bz2"
 
@@ -44,6 +44,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b  font-adobe-utopia-100dpi-1.0.4.tar.bz2"
diff --git a/user/font-adobe-utopia-75dpi/APKBUILD b/user/font-adobe-utopia-75dpi/APKBUILD
index 6df4f30a6..da04ba89e 100644
--- a/user/font-adobe-utopia-75dpi/APKBUILD
+++ b/user/font-adobe-utopia-75dpi/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
 # [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts
 # [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec
 license="Utopia"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.bz2"
 
@@ -44,6 +44,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92  font-adobe-utopia-75dpi-1.0.4.tar.bz2"
diff --git a/user/font-adobe-utopia-type1/APKBUILD b/user/font-adobe-utopia-type1/APKBUILD
index 50d1f8749..12443931b 100644
--- a/user/font-adobe-utopia-type1/APKBUILD
+++ b/user/font-adobe-utopia-type1/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
 # [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts
 # [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec
 license="Utopia"
-depends="encodings font-alias fontconfig"
-makedepends="mkfontdir mkfontscale util-macros"
+depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+makedepends="util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.bz2"
 
@@ -44,6 +44,8 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
+	find "$pkgdir" -name fonts.scale -exec rm {} +
 }
 
 sha512sums="53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6  font-adobe-utopia-type1-1.0.4.tar.bz2"
diff --git a/user/font-arabic-misc/APKBUILD b/user/font-arabic-misc/APKBUILD
index 8f4e79567..e36be36a0 100644
--- a/user/font-arabic-misc/APKBUILD
+++ b/user/font-arabic-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Arabic X11 fonts"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0  font-arabic-misc-1.0.3.tar.bz2"
diff --git a/user/font-bh-100dpi/APKBUILD b/user/font-bh-100dpi/APKBUILD
index ef9ca6d98..507bd19cc 100644
--- a/user/font-bh-100dpi/APKBUILD
+++ b/user/font-bh-100dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="100dpi X11 fonts from Bigelow & Holmes"
 url="https://www.X.Org/"
 arch="noarch"
 license="Lucida"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bh-100dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2  font-bh-100dpi-1.0.3.tar.bz2"
diff --git a/user/font-bh-75dpi/APKBUILD b/user/font-bh-75dpi/APKBUILD
index 378bd0237..6a1287b10 100644
--- a/user/font-bh-75dpi/APKBUILD
+++ b/user/font-bh-75dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="75dpi X11 fonts from Bigelow & Holmes"
 url="https://www.X.Org/"
 arch="noarch"
 license="Lucida"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bh-75dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50  font-bh-75dpi-1.0.3.tar.bz2"
diff --git a/user/font-bh-lucidatypewriter-100dpi/APKBUILD b/user/font-bh-lucidatypewriter-100dpi/APKBUILD
index 04f9deb00..afa5b8a83 100644
--- a/user/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ b/user/font-bh-lucidatypewriter-100dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="100dpi Lucida Typewriter X11 font from Bigelow & Holmes"
 url="https://www.X.Org/"
 arch="noarch"
 license="Lucida"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f  font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"
diff --git a/user/font-bh-lucidatypewriter-75dpi/APKBUILD b/user/font-bh-lucidatypewriter-75dpi/APKBUILD
index 6f1fab5a9..e1e9508dc 100644
--- a/user/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ b/user/font-bh-lucidatypewriter-75dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="75dpi Lucida Typewriter X11 font from Bigelow & Holmes"
 url="https://www.X.Org/"
 arch="noarch"
 license="Lucida"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13  font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"
diff --git a/user/font-bitstream-100dpi/APKBUILD b/user/font-bitstream-100dpi/APKBUILD
index 60f5ef3f9..27c9f4848 100644
--- a/user/font-bitstream-100dpi/APKBUILD
+++ b/user/font-bitstream-100dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="100dpi X11 fonts from Bitstream"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd  font-bitstream-100dpi-1.0.3.tar.bz2"
diff --git a/user/font-bitstream-75dpi/APKBUILD b/user/font-bitstream-75dpi/APKBUILD
index c54c5e3a2..a456b9bd6 100644
--- a/user/font-bitstream-75dpi/APKBUILD
+++ b/user/font-bitstream-75dpi/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="75dpi X11 fonts from Bitstream"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650  font-bitstream-75dpi-1.0.3.tar.bz2"
diff --git a/user/font-bitstream-speedo/APKBUILD b/user/font-bitstream-speedo/APKBUILD
index e5c5e947d..dcee83640 100644
--- a/user/font-bitstream-speedo/APKBUILD
+++ b/user/font-bitstream-speedo/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Speedo X11 fonts from Bitstream"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="mkfontdir mkfontscale util-macros"
+depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+makedepends="util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bitstream-speedo-$pkgver.tar.bz2"
 
@@ -38,6 +38,8 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
+	find "$pkgdir" -name fonts.scale -exec rm {} +
 }
 
 sha512sums="78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb  font-bitstream-speedo-1.0.2.tar.bz2"
diff --git a/user/font-bitstream-type1/APKBUILD b/user/font-bitstream-type1/APKBUILD
index 0676576e8..328b0f874 100644
--- a/user/font-bitstream-type1/APKBUILD
+++ b/user/font-bitstream-type1/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Type 1 X11 fonts from Bitstream"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="fontconfig"
-makedepends="mkfontdir mkfontscale util-macros"
+depends="fontconfig mkfontdir mkfontscale"
+makedepends="util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bitstream-type1-$pkgver.tar.bz2"
 
@@ -38,6 +38,8 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
+	find "$pkgdir" -name fonts.scale -exec rm {} +
 }
 
 sha512sums="71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61  font-bitstream-type1-1.0.3.tar.bz2"
diff --git a/user/font-cronyx-cyrillic/APKBUILD b/user/font-cronyx-cyrillic/APKBUILD
index 9ee471df5..ee537b55b 100644
--- a/user/font-cronyx-cyrillic/APKBUILD
+++ b/user/font-cronyx-cyrillic/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Cyrillic X11 fonts from Cronyx"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-cronyx-cyrillic-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456  font-cronyx-cyrillic-1.0.3.tar.bz2"
diff --git a/user/font-cursor-misc/APKBUILD b/user/font-cursor-misc/APKBUILD
index f7f9d9a9c..fe6d4610b 100644
--- a/user/font-cursor-misc/APKBUILD
+++ b/user/font-cursor-misc/APKBUILD
@@ -5,16 +5,16 @@ pkgrel=3
 pkgdesc="X11 cursor fonts"
 url="https://www.X.Org/"
 arch="noarch"
-options="!check"  # Can't test fonts.
 license="Public-Domain"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir mkfontscale util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
+subpackages=""
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
 	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
@@ -26,9 +26,15 @@ build() {
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 package() {
 	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83  font-cursor-misc-1.0.3.tar.bz2"
diff --git a/user/font-daewoo-misc/APKBUILD b/user/font-daewoo-misc/APKBUILD
index 245910326..a71dba0aa 100644
--- a/user/font-daewoo-misc/APKBUILD
+++ b/user/font-daewoo-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="X11 fonts from Daewoo"
 url="https://www.X.Org/"
 arch="noarch"
 license="X11"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-daewoo-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06  font-daewoo-misc-1.0.3.tar.bz2"
diff --git a/user/font-dec-misc/APKBUILD b/user/font-dec-misc/APKBUILD
index 80105c825..36045bbca 100644
--- a/user/font-dec-misc/APKBUILD
+++ b/user/font-dec-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="X11 fonts from Digital"
 url="https://www.X.Org/"
 arch="noarch"
 license="X11"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-dec-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6  font-dec-misc-1.0.3.tar.bz2"
diff --git a/user/font-isas-misc/APKBUILD b/user/font-isas-misc/APKBUILD
index d44071fc0..6dd2a8b08 100644
--- a/user/font-isas-misc/APKBUILD
+++ b/user/font-isas-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Chinese X11 fonts from Academia Sinica"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-isas-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b  font-isas-misc-1.0.3.tar.bz2"
diff --git a/user/font-jis-misc/APKBUILD b/user/font-jis-misc/APKBUILD
index eb524ca43..67cad5057 100644
--- a/user/font-jis-misc/APKBUILD
+++ b/user/font-jis-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Japanese Industrial Standard X11 fonts"
 url="https://www.X.Org/"
 arch="noarch"
 license="Public-Domain"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-jis-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c  font-jis-misc-1.0.3.tar.bz2"
diff --git a/user/font-micro-misc/APKBUILD b/user/font-micro-misc/APKBUILD
index 415c8674d..7c72642fe 100644
--- a/user/font-micro-misc/APKBUILD
+++ b/user/font-micro-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Smol X11 font"
 url="https://www.X.Org/"
 arch="noarch"
 license="Public-Domain"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-micro-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69  font-micro-misc-1.0.3.tar.bz2"
diff --git a/user/font-misc-cyrillic/APKBUILD b/user/font-misc-cyrillic/APKBUILD
index 5ec5c4d84..e66c9ccd8 100644
--- a/user/font-misc-cyrillic/APKBUILD
+++ b/user/font-misc-cyrillic/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Cyrillic X11 fonts"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT AND Public-Domain"
-depends="encodings font-alias fontconfig"
+depends="encodings font-alias fontconfig mkfontdir"
 makedepends="bdftopcf mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-misc-cyrillic-$pkgver.tar.bz2"
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf  font-misc-cyrillic-1.0.3.tar.bz2"
diff --git a/user/font-misc-ethiopic/APKBUILD b/user/font-misc-ethiopic/APKBUILD
index 9ed61da5f..e04621e66 100644
--- a/user/font-misc-ethiopic/APKBUILD
+++ b/user/font-misc-ethiopic/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Ethiopic X11 fonts"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="mkfontdir mkfontscale util-macros"
+depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+makedepends="util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.bz2"
 
@@ -38,6 +38,8 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
+	find "$pkgdir" -name fonts.scale -exec rm {} +
 }
 
 sha512sums="b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d  font-misc-ethiopic-1.0.3.tar.bz2"
diff --git a/user/font-misc-misc/APKBUILD b/user/font-misc-misc/APKBUILD
index 77f20f97a..1a7cf7b53 100644
--- a/user/font-misc-misc/APKBUILD
+++ b/user/font-misc-misc/APKBUILD
@@ -5,10 +5,10 @@ pkgrel=3
 pkgdesc="Miscellaneous X11 fonts included with X.Org"
 url="https://www.X.Org/"
 arch="noarch"
-options="!check"  # Can't test fonts.
 license="Public-Domain"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir mkfontscale util-macros"
+depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+makedepends="bdftopcf font-util-dev util-macros"
+subpackages=""
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
@@ -26,9 +26,15 @@ build() {
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 package() {
 	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74  font-misc-misc-1.1.2.tar.bz2"
diff --git a/user/font-mutt-misc/APKBUILD b/user/font-mutt-misc/APKBUILD
index f134ad37c..62a4437ff 100644
--- a/user/font-mutt-misc/APKBUILD
+++ b/user/font-mutt-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="MUTT X11 font family"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-mutt-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db  font-mutt-misc-1.0.3.tar.bz2"
diff --git a/user/font-schumacher-misc/APKBUILD b/user/font-schumacher-misc/APKBUILD
index 4d6abf0e1..4b3008fe5 100644
--- a/user/font-schumacher-misc/APKBUILD
+++ b/user/font-schumacher-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="X11 fonts from Dale Schumacher"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf font-util-dev util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-schumacher-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a  font-schumacher-misc-1.1.2.tar.bz2"
diff --git a/user/font-screen-cyrillic/APKBUILD b/user/font-screen-cyrillic/APKBUILD
index 65d3051b1..8dc59ebe6 100644
--- a/user/font-screen-cyrillic/APKBUILD
+++ b/user/font-screen-cyrillic/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Cyrillic X11 fonts"
 url="https://www.X.Org/"
 arch="noarch"
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-screen-cyrillic-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51  font-screen-cyrillic-1.0.4.tar.bz2"
diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD
index 59a3c31dd..7ce54a805 100644
--- a/user/font-sony-misc/APKBUILD
+++ b/user/font-sony-misc/APKBUILD
@@ -2,13 +2,13 @@
 pkgname=font-sony-misc
 pkgver=1.0.3
 pkgrel=3
-pkgdesc="Sony fonts"
+pkgdesc="X11 fonts from Sony"
 url="https://www.X.Org/"
 arch="noarch"
-options="!check"  # Cannot test a font.
 license="MIT"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf font-util-dev mkfontdir mkfontscale util-macros"
+depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+makedepends="bdftopcf font-util-dev util-macros"
+subpackages=""
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
@@ -26,9 +26,15 @@ build() {
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 package() {
 	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d  font-sony-misc-1.0.3.tar.bz2"
diff --git a/user/font-sun-misc/APKBUILD b/user/font-sun-misc/APKBUILD
index f736bd167..e004d9738 100644
--- a/user/font-sun-misc/APKBUILD
+++ b/user/font-sun-misc/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="X11 fonts from Sun Microsystems"
 url="https://www.X.Org/"
 arch="noarch"
 license="X11"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-sun-misc-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275  font-sun-misc-1.0.3.tar.bz2"
diff --git a/user/font-winitzki-cyrillic/APKBUILD b/user/font-winitzki-cyrillic/APKBUILD
index 04fa93e5f..03e93b01f 100644
--- a/user/font-winitzki-cyrillic/APKBUILD
+++ b/user/font-winitzki-cyrillic/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Cyrillic X11 fonts from Serge Winitzki"
 url="https://www.X.Org/"
 arch="noarch"
 license="Public-Domain"
-depends="encodings font-alias fontconfig"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-winitzki-cyrillic-$pkgver.tar.bz2"
 
@@ -38,6 +38,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
 
 sha512sums="f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7  font-winitzki-cyrillic-1.0.3.tar.bz2"
diff --git a/user/font-xfree86-type1/APKBUILD b/user/font-xfree86-type1/APKBUILD
index 50377df68..f82b76bcf 100644
--- a/user/font-xfree86-type1/APKBUILD
+++ b/user/font-xfree86-type1/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="Type 1 X11 fonts from the XFree86 project"
 url="https://www.X.Org/"
 arch="noarch"
 license="X11"
-depends="fontconfig"
-makedepends="mkfontdir mkfontscale util-macros"
+depends="fontconfig mkfontdir mkfontscale"
+makedepends="util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-xfree86-type1-$pkgver.tar.bz2"
 
@@ -38,6 +38,8 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name fonts.dir -exec rm {} +
+	find "$pkgdir" -name fonts.scale -exec rm {} +
 }
 
 sha512sums="2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c  font-xfree86-type1-1.0.4.tar.bz2"