Merge branch 'font.paths' into 'master'

user/{t,o}tf-*: ensure fonts are installed in /usr/share/fonts/X11/...



See merge request !247

8 files changed, 18 insertions, 18 deletions

diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD
index 588a20ec9..939ae229a 100644
--- a/user/otf-exo/APKBUILD
+++ b/user/otf-exo/APKBUILD
@@ -15,9 +15,9 @@ builddir="$srcdir"
 
 package() {
 	cd "$builddir"
-	mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	for i in *.otf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	done
 }
 
diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD
index 6628a1d77..0f34cac2a 100644
--- a/user/otf-office-code-pro/APKBUILD
+++ b/user/otf-office-code-pro/APKBUILD
@@ -14,15 +14,15 @@ source="https://github.com/nathco/Office-Code-Pro/archive/1.004.zip"
 builddir="$srcdir/Office-Code-Pro-$pkgver"
 
 package() {
-	mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	cd "$builddir/Fonts/Office Code Pro/OTF"
 	for i in *.otf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	done
-	mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}-d
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}-d
 	cd "$builddir/Fonts/Office Code Pro D/OTF"
 	for i in *.otf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}-d
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}-d
 	done
 }
 
diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD
index 598f710e8..3af3cc125 100644
--- a/user/otf-proggy-vector/APKBUILD
+++ b/user/otf-proggy-vector/APKBUILD
@@ -15,9 +15,9 @@ builddir="$srcdir/proggyfonts-$pkgver"
 
 package() {
 	cd "$builddir"/ProggyVector
-	mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	for i in *.otf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	done
 }
 
diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD
index 442611e3f..78e144b82 100644
--- a/user/otf-source-code-pro/APKBUILD
+++ b/user/otf-source-code-pro/APKBUILD
@@ -16,9 +16,9 @@ builddir="$srcdir/source-code-pro-${pkgver}R-ro-${_pkgver}R-it"
 
 package() {
 	cd "$builddir"/OTF
-	mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	for i in *.otf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	done
 }
 
diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD
index 497de47fa..1e7c3b319 100644
--- a/user/otf-source-sans-pro/APKBUILD
+++ b/user/otf-source-sans-pro/APKBUILD
@@ -16,9 +16,9 @@ builddir="$srcdir/source-sans-pro-${pkgver}R-ro-${_pkgver}R-it"
 
 package() {
 	cd "$builddir"/OTF
-	mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	for i in *.otf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	done
 }
 
diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD
index 529c4fd71..bd139c4a3 100644
--- a/user/otf-source-serif-pro/APKBUILD
+++ b/user/otf-source-serif-pro/APKBUILD
@@ -16,9 +16,9 @@ builddir="$srcdir/source-serif-pro-${pkgver}R-ro-${_pkgver}R-it"
 
 package() {
 	cd "$builddir"/OTF
-	mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	for i in *.otf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
 	done
 }
 
diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD
index 385b2bd77..62883e32e 100644
--- a/user/ttf-sudo/APKBUILD
+++ b/user/ttf-sudo/APKBUILD
@@ -15,9 +15,9 @@ builddir="$srcdir/sudo"
 
 package() {
 	cd "$builddir"
-	mkdir -p "$pkgdir"/usr/share/X11/TTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
 	for i in *.ttf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/TTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
 	done
 }
 
diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD
index 532c7fa36..ebb4f09f4 100644
--- a/user/ttf-terminus/APKBUILD
+++ b/user/ttf-terminus/APKBUILD
@@ -15,9 +15,9 @@ builddir="$srcdir/terminus-ttf-$pkgver"
 
 package() {
 	cd "$builddir"
-	mkdir -p "$pkgdir"/usr/share/X11/TTF/${pkgname#*-}
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
 	for i in *.ttf; do
-		install -Dm644 "$i" "$pkgdir"/usr/share/X11/TTF/${pkgname#*-}
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
 	done
 }