summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/terminus-font/APKBUILD4
-rw-r--r--user/ttf-freefont/APKBUILD6
-rw-r--r--user/ttf-noto-cjk/APKBUILD6
-rw-r--r--user/ttf-noto/APKBUILD6
4 files changed, 11 insertions, 11 deletions
diff --git a/user/terminus-font/APKBUILD b/user/terminus-font/APKBUILD
index 0020705e8..10ebdd481 100644
--- a/user/terminus-font/APKBUILD
+++ b/user/terminus-font/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=terminus-font
pkgver=4.46
-pkgrel=0
+pkgrel=1
pkgdesc="Monospace bitmap font (for X11 and console)"
url="http://terminus-font.sourceforge.net/" # No HTTPS
arch="noarch"
@@ -17,7 +17,7 @@ build() {
./configure \
--prefix=/usr \
--psfdir=/usr/share/consolefonts \
- --x11dir=/usr/share/fonts/misc
+ --x11dir=/usr/share/fonts/X11/misc
make
}
diff --git a/user/ttf-freefont/APKBUILD b/user/ttf-freefont/APKBUILD
index 532f064a7..d4a67e4a0 100644
--- a/user/ttf-freefont/APKBUILD
+++ b/user/ttf-freefont/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=ttf-freefont
pkgver=20120503
-pkgrel=0
+pkgrel=1
pkgdesc="High-quality TrueType fonts covering the UCS character set"
url="http://www.nongnu.org/freefont/"
arch="noarch"
@@ -14,8 +14,8 @@ builddir="$srcdir/freefont-$pkgver"
package() {
cd "$builddir"
- install -d "$pkgdir/usr/share/fonts/TTF"
- install -m644 *.ttf "$pkgdir/usr/share/fonts/TTF/"
+ install -d "$pkgdir/usr/share/fonts/$pkgname/"
+ install -m644 *.ttf "$pkgdir/usr/share/fonts/$pkgname/"
# Licensing exception is discussed in README in pkgver==20120503
install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
}
diff --git a/user/ttf-noto-cjk/APKBUILD b/user/ttf-noto-cjk/APKBUILD
index cf8b77938..a5d7c3034 100644
--- a/user/ttf-noto-cjk/APKBUILD
+++ b/user/ttf-noto-cjk/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=ttf-noto-cjk
pkgver=20170601
-pkgrel=0
+pkgrel=1
pkgdesc="Noto fonts for Chinese, Japanese, and Korean"
url="https://www.google.com/get/noto/help/cjk/"
arch="noarch"
@@ -25,11 +25,11 @@ source="https://dev.sick.bike/$pkgname-$pkgver.tar.xz
"
package() {
- mkdir -p "$pkgdir"/usr/share/fonts/truetype/"$pkgname" \
+ mkdir -p "$pkgdir"/usr/share/fonts/"$pkgname" \
"$pkgdir"/etc/fonts/conf.d \
"$pkgdir"/etc/fonts/conf.avail
- cp "$builddir"/*.ttc "$pkgdir"/usr/share/fonts/truetype/"$pkgname"
+ cp "$builddir"/*.ttc "$pkgdir"/usr/share/fonts/"$pkgname"
cp "$srcdir"/90-ttf-noto-cjk.conf "$pkgdir"/etc/fonts/conf.avail
cd "$pkgdir"/etc/fonts/conf.d
diff --git a/user/ttf-noto/APKBUILD b/user/ttf-noto/APKBUILD
index 3551fe7fe..21c83d972 100644
--- a/user/ttf-noto/APKBUILD
+++ b/user/ttf-noto/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ttf-noto
pkgver=20170403
-pkgrel=1
+pkgrel=2
pkgdesc="Noto font family"
url="https://www.google.com/get/noto/"
arch="noarch"
@@ -21,9 +21,9 @@ source="https://dev.gentoo.org/~floppym/dist/noto-$pkgver.tar.xz
builddir="$srcdir"/noto-$pkgver
package() {
- mkdir -p "$pkgdir"/usr/share/fonts/truetype/
+ mkdir -p "$pkgdir"/usr/share/fonts/$pkgname/
mkdir -p "$pkgdir"/etc/fonts/conf.d/
- cp "$builddir"/*.ttf "$pkgdir"/usr/share/fonts/truetype/
+ cp "$builddir"/*.ttf "$pkgdir"/usr/share/fonts/$pkgname/
cp "$srcdir"/*.conf "$pkgdir"/etc/fonts/conf.d/
}