From 4eb9fc5218f539a17e79abee056e1a0fd99e4053 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 2 Jan 2019 00:48:28 +0000
Subject: user/[X11 fonts]: fix up font paths

---
 user/font-misc-misc/APKBUILD | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'user/font-misc-misc')

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"
-- 
cgit v1.2.3-60-g2f50