user/[X11 fonts]: fix up font paths

13 files changed, 40 insertions, 57 deletions

diff --git a/user/encodings/APKBUILD b/user/encodings/APKBUILD
index 84c49ddab..d5c5adbea 100644
--- a/user/encodings/APKBUILD
+++ b/user/encodings/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=encodings
 pkgver=1.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Font encoding files for X11"
 url="https://www.X.Org/"
 arch="noarch"
@@ -21,8 +21,7 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--with-encodingsdir=/usr/share/fonts/encodings
+		--prefix=/usr
 	make
 }
 
diff --git a/user/font-adobe-100dpi/APKBUILD b/user/font-adobe-100dpi/APKBUILD
index 2e43c78db..023fc78b8 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=""
-makedepends="bdftopcf fontconfig font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2"
 
diff --git a/user/font-adobe-75dpi/APKBUILD b/user/font-adobe-75dpi/APKBUILD
index 4f7089c4a..957ea82d4 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=""
-makedepends="bdftopcf fontconfig font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2"
 
diff --git a/user/font-adobe-utopia-100dpi/APKBUILD b/user/font-adobe-utopia-100dpi/APKBUILD
index 6170f9695..c2d2dbdd1 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=""
-makedepends="bdftopcf fontconfig font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.bz2"
 
diff --git a/user/font-adobe-utopia-75dpi/APKBUILD b/user/font-adobe-utopia-75dpi/APKBUILD
index 338f6e0ee..6df4f30a6 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=""
-makedepends="bdftopcf fontconfig font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.bz2"
 
diff --git a/user/font-adobe-utopia-type1/APKBUILD b/user/font-adobe-utopia-type1/APKBUILD
index fbc243ccf..50d1f8749 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=""
-makedepends="fontconfig mkfontdir mkfontscale util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="mkfontdir mkfontscale util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.bz2"
 
diff --git a/user/font-alias/APKBUILD b/user/font-alias/APKBUILD
index 91fc0705b..dee7f9487 100644
--- a/user/font-alias/APKBUILD
+++ b/user/font-alias/APKBUILD
@@ -1,18 +1,19 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=font-alias
 pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Font alias definitions from X.Org"
 url="https://www.X.Org/"
 arch="noarch"
-license="unknown:BSD-Style"
+license="MIT"
 depends=""
 makedepends="util-macros"
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	update_config_sub
+	cd "$builddir"
 	default_prepare
+	update_config_sub
 }
 
 build() {
@@ -20,8 +21,7 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--with-fontrootdir=/usr/share/fonts
+		--prefix=/usr
 	make
 }
 
diff --git a/user/font-arabic-misc/APKBUILD b/user/font-arabic-misc/APKBUILD
index 8e0d092df..8f4e79567 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=""
-makedepends="bdftopcf fontconfig mkfontdir util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.bz2"
 
diff --git a/user/font-bh-lucidatypewriter-100dpi/APKBUILD b/user/font-bh-lucidatypewriter-100dpi/APKBUILD
index 32498a626..04f9deb00 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=""
-makedepends="bdftopcf fontconfig font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-$pkgver.tar.bz2"
 
diff --git a/user/font-bh-lucidatypewriter-75dpi/APKBUILD b/user/font-bh-lucidatypewriter-75dpi/APKBUILD
index d17f2e755..6f1fab5a9 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=""
-makedepends="bdftopcf fontconfig font-util-dev mkfontdir util-macros"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir util-macros"
 subpackages=""
 source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-$pkgver.tar.bz2"
 
diff --git a/user/font-cursor-misc/APKBUILD b/user/font-cursor-misc/APKBUILD
index 8056a774b..f7f9d9a9c 100644
--- a/user/font-cursor-misc/APKBUILD
+++ b/user/font-cursor-misc/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=font-cursor-misc
 pkgver=1.0.3
-pkgrel=2
-pkgdesc="Cursor fonts from X.Org"
+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 mkfontdir mkfontscale util-macros"
-makedepends="bdftopcf font-util-dev"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir mkfontscale util-macros"
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
@@ -22,18 +22,13 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--with-fontdir=/usr/share/fonts/misc
+		--prefix=/usr
 	make
 }
 
 package() {
 	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install
+	make -j1 DESTDIR="$pkgdir" install
 }
 
 sha512sums="7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83  font-cursor-misc-1.0.3.tar.bz2"
diff --git a/user/font-misc-misc/APKBUILD b/user/font-misc-misc/APKBUILD
index 6a8278eac..77f20f97a 100644
--- a/user/font-misc-misc/APKBUILD
+++ b/user/font-misc-misc/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=font-misc-misc
 pkgver=1.1.2
-pkgrel=2
-pkgdesc="Miscellaneous fonts included with X.Org"
+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 mkfontdir mkfontscale util-macros"
-makedepends="bdftopcf font-util-dev"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir mkfontscale util-macros"
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
@@ -22,19 +22,13 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--with-fontdir=/usr/share/fonts/misc
+		--prefix=/usr
 	make
 }
 
 package() {
 	cd "$builddir"
-	make -j1 \
-		DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install
+	make -j1 DESTDIR="$pkgdir" install
 }
 
 sha512sums="d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74  font-misc-misc-1.1.2.tar.bz2"
diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD
index cb7690e89..59a3c31dd 100644
--- a/user/font-sony-misc/APKBUILD
+++ b/user/font-sony-misc/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=font-sony-misc
 pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Sony fonts"
 url="https://www.X.Org/"
 arch="noarch"
 options="!check"  # Cannot test a font.
 license="MIT"
-depends="encodings font-alias fontconfig mkfontdir mkfontscale"
-makedepends="bdftopcf font-util-dev"
+depends="encodings font-alias fontconfig"
+makedepends="bdftopcf font-util-dev mkfontdir mkfontscale util-macros"
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
@@ -22,18 +22,13 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--with-fontdir=/usr/share/fonts/misc
+		--prefix=/usr
 	make
 }
 
 package() {
 	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install
+	make -j1 DESTDIR="$pkgdir" install
 }
 
 sha512sums="c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d  font-sony-misc-1.0.3.tar.bz2"