From 1e787a2c8b46158082cf41d4852dc146dcab76f0 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 8 Sep 2017 18:55:34 -0500
Subject: main/font-misc-misc: modernise, deps, noarch, no test, no mapfiles

---
 main/font-misc-misc/APKBUILD | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

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

diff --git a/main/font-misc-misc/APKBUILD b/main/font-misc-misc/APKBUILD
index c4c2f82fc2..e23e94b729 100644
--- a/main/font-misc-misc/APKBUILD
+++ b/main/font-misc-misc/APKBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-misc
 pkgver=1.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"  # No test suite.
+depends="encodings font-alias mkfontscale mkfontdir fontconfig util-macros"
 makedepends="font-util-dev bdftopcf"
 install=
 source="http://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	cd "$builddir"
+	update_config_sub
+	default_prepare
 }
 
 build() {
@@ -24,20 +24,18 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make -j1 \
 		DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 md5sums="c88eb44b3b903d79fb44b860a213e623  font-misc-misc-1.1.2.tar.bz2"
-- 
cgit v1.2.3