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-sony-misc/APKBUILD | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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

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