updatess

2026-01-27 18:20:07 +00:00 · 2021-01-23 14:18:29 +08:00
parent 7a79361f21
commit 0a15c96f90
55 changed files with 2403 additions and 2450 deletions
--- a/core/.REPO
+++ b/core/.REPO
--- a/core/awesome-font/.pkgfiles
+++ b/core/awesome-font/.pkgfiles
@@ -1,9 +1,8 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/fonts/
-drwxr-xr-x root/root    usr/share/fonts/X11/
-drwxr-xr-x root/root    usr/share/fonts/X11/OTF/
-drwxr-xr-x root/root    usr/share/fonts/X11/TTF/
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/fa-brands-400.ttf
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/fa-regular-400.ttf
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/fa-solid-900.ttf
+drwxr-xr-x root/root    usr/share/fonts/OTF/
+drwxr-xr-x root/root    usr/share/fonts/TTF/
+-rw-r--r-- root/root    usr/share/fonts/TTF/fa-brands-400.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/fa-regular-400.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/fa-solid-900.ttf
--- a/core/awesome-font/spkgbuild
+++ b/core/awesome-font/spkgbuild
@@ -3,12 +3,12 @@

 name=awesome-font
 version=5.15.2
-release=1
+release=2
 source="https://github.com/FortAwesome/Font-Awesome/archive/$version/$name-$version.tar.gz"

 build() {
 	cd Font-Awesome-$version

-	install -d $PKG/usr/share/fonts/X11/TTF $PKG/usr/share/fonts/X11/OTF
-	install -m644 webfonts/*.ttf $PKG/usr/share/fonts/X11/TTF/
+	install -d $PKG/usr/share/fonts/TTF $PKG/usr/share/fonts/OTF
+	install -m644 webfonts/*.ttf $PKG/usr/share/fonts/TTF/
 }
--- a/core/dejavu-fonts/.pkgfiles
+++ b/core/dejavu-fonts/.pkgfiles
@@ -1,43 +1,44 @@
-drwxr-xr-x root/root etc/
-drwxr-xr-x root/root etc/fonts/
-drwxr-xr-x root/root etc/fonts/conf.avail/
-rw-r--r-- root/root etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf
-rw-r--r-- root/root etc/fonts/conf.avail/20-unhint-small-dejavu-sans.conf
-rw-r--r-- root/root etc/fonts/conf.avail/20-unhint-small-dejavu-serif.conf
-rw-r--r-- root/root etc/fonts/conf.avail/57-dejavu-sans-mono.conf
-rw-r--r-- root/root etc/fonts/conf.avail/57-dejavu-sans.conf
-rw-r--r-- root/root etc/fonts/conf.avail/57-dejavu-serif.conf
-drwxr-xr-x root/root etc/fonts/conf.d/
-lrwxrwxrwx root/root etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
-lrwxrwxrwx root/root etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf
-lrwxrwxrwx root/root etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf
-lrwxrwxrwx root/root etc/fonts/conf.d/57-dejavu-sans-mono.conf
-lrwxrwxrwx root/root etc/fonts/conf.d/57-dejavu-sans.conf
-lrwxrwxrwx root/root etc/fonts/conf.d/57-dejavu-serif.conf
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/TTF/
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuMathTeXGyre.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSans-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSans-BoldOblique.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSans-ExtraLight.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSans-Oblique.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSans.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansCondensed-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansCondensed-BoldOblique.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansCondensed-Oblique.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansCondensed.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansMono-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansMono-BoldOblique.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansMono-Oblique.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSansMono.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerif-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerif-BoldItalic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerif-Italic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerif.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerifCondensed-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerifCondensed-BoldItalic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerifCondensed-Italic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/DejaVuSerifCondensed.ttf
+drwxr-xr-x root/root    etc/
+drwxr-xr-x root/root    etc/fonts/
+drwxr-xr-x root/root    etc/fonts/conf.avail/
+-rw-r--r-- root/root    etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf
+-rw-r--r-- root/root    etc/fonts/conf.avail/20-unhint-small-dejavu-sans.conf
+-rw-r--r-- root/root    etc/fonts/conf.avail/20-unhint-small-dejavu-serif.conf
+-rw-r--r-- root/root    etc/fonts/conf.avail/57-dejavu-sans-mono.conf
+-rw-r--r-- root/root    etc/fonts/conf.avail/57-dejavu-sans.conf
+-rw-r--r-- root/root    etc/fonts/conf.avail/57-dejavu-serif.conf
+drwxr-xr-x root/root    etc/fonts/conf.d/
+lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf -> ../conf.avail/20-unhint-small-dejavu-sans-mono.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf -> ../conf.avail/20-unhint-small-dejavu-sans.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf -> ../conf.avail/20-unhint-small-dejavu-serif.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-sans-mono.conf -> ../conf.avail/57-dejavu-sans-mono.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-sans.conf -> ../conf.avail/57-dejavu-sans.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-serif.conf -> ../conf.avail/57-dejavu-serif.conf
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/lib/
+lrwxrwxrwx root/root    usr/lib/fonts -> /usr/share/fonts/TTF
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/TTF/
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuMathTeXGyre.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSans-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSans-ExtraLight.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSans.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansCondensed-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansCondensed-BoldOblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansCondensed-Oblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansCondensed.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSansMono.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerif-BoldItalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerif-Italic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerif.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerifCondensed-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerifCondensed-BoldItalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerifCondensed-Italic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuSerifCondensed.ttf
--- a/core/dejavu-fonts/spkgbuild
+++ b/core/dejavu-fonts/spkgbuild
@@ -3,7 +3,7 @@

 name=dejavu-fonts
 version=2.37
-release=2
+release=3
 source="https://downloads.sourceforge.net/dejavu/dejavu/$version/dejavu-fonts-ttf-$version.tar.bz2"

 build() {
@@ -11,10 +11,10 @@ build() {

 	install -dm755 $PKG/etc/fonts/conf.avail
 	install -dm755 $PKG/etc/fonts/conf.d
-	install -dm755 $PKG/usr/share/fonts/X11/TTF
+	install -dm755 $PKG/usr/share/fonts/TTF

 	cd $SRC/dejavu-fonts-ttf-$version
-	install -m644 ttf/*.ttf $PKG/usr/share/fonts/X11/TTF/
+	install -m644 ttf/*.ttf $PKG/usr/share/fonts/TTF/
 	install -m644 fontconfig/*.conf $PKG/etc/fonts/conf.avail/

 	cd $PKG/etc/fonts/conf.avail
--- a/core/encodings/.pkgfiles
+++ b/core/encodings/.pkgfiles
@@ -1,57 +1,56 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/encodings/
-rw-r--r-- root/root usr/share/fonts/X11/encodings/adobe-dingbats.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/adobe-standard.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/adobe-symbol.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/armscii-8.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/ascii-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/dec-special.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/encodings.dir
-rw-r--r-- root/root usr/share/fonts/X11/encodings/ibm-cp437.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/ibm-cp850.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/ibm-cp852.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/ibm-cp866.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/iso8859-11.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/iso8859-13.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/iso8859-16.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/iso8859-6.16.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/iso8859-6.8x.enc.gz
-drwxr-xr-x root/root usr/share/fonts/X11/encodings/large/
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/big5.eten-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/big5hkscs-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/cns11643-1.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/cns11643-2.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/cns11643-3.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/encodings.dir
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/gb18030-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/gb18030.2000-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/gb18030.2000-1.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/gb2312.1980-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/gbk-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/jisx0201.1976-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/jisx0208.1990-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/jisx0212.1990-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/ksc5601.1987-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/ksc5601.1992-3.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/large/sun.unicode.india-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1250.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1251.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1252.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1253.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1254.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1255.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1256.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1257.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-cp1258.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/microsoft-win3.1.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/mulearabic-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/mulearabic-1.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/mulearabic-2.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/mulelao-1.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/suneu-greek.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/tcvn-0.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/tis620-2.enc.gz
-rw-r--r-- root/root usr/share/fonts/X11/encodings/viscii1.1-1.enc.gz
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/encodings/
+-rw-r--r-- root/root    usr/share/fonts/encodings/adobe-dingbats.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/adobe-standard.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/adobe-symbol.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/armscii-8.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/ascii-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/dec-special.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/encodings.dir
+-rw-r--r-- root/root    usr/share/fonts/encodings/ibm-cp437.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/ibm-cp850.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/ibm-cp852.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/ibm-cp866.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/iso8859-11.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/iso8859-13.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/iso8859-16.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/iso8859-6.16.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/iso8859-6.8x.enc.gz
+drwxr-xr-x root/root    usr/share/fonts/encodings/large/
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/big5.eten-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/big5hkscs-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/cns11643-1.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/cns11643-2.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/cns11643-3.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/encodings.dir
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/gb18030-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/gb18030.2000-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/gb18030.2000-1.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/gb2312.1980-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/gbk-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/jisx0201.1976-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/jisx0208.1990-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/jisx0212.1990-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/ksc5601.1987-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/ksc5601.1992-3.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/large/sun.unicode.india-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1250.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1251.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1252.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1253.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1254.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1255.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1256.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1257.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-cp1258.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/microsoft-win3.1.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/mulearabic-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/mulearabic-1.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/mulearabic-2.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/mulelao-1.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/suneu-greek.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/tcvn-0.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/tis620-2.enc.gz
+-rw-r--r-- root/root    usr/share/fonts/encodings/viscii1.1-1.enc.gz
--- a/core/encodings/spkgbuild
+++ b/core/encodings/spkgbuild
@@ -3,7 +3,7 @@

 name=encodings
 version=1.0.5
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/encodings-$version.tar.bz2"

 build() {
--- a/core/font-adobe-100dpi/.pkgfiles
+++ b/core/font-adobe-100dpi/.pkgfiles
--- a/core/font-adobe-100dpi/spkgbuild
+++ b/core/font-adobe-100dpi/spkgbuild
@@ -3,7 +3,7 @@

 name=font-adobe-100dpi
 version=1.0.3
-release=1
+release=2
 source="https://www.x.org/archive/individual/font/$name-$version.tar.bz2"

 build() {
--- a/core/font-adobe-75dpi/.pkgfiles
+++ b/core/font-adobe-75dpi/.pkgfiles
--- a/core/font-adobe-75dpi/spkgbuild
+++ b/core/font-adobe-75dpi/spkgbuild
@@ -3,7 +3,7 @@

 name=font-adobe-75dpi
 version=1.0.3
-release=1
+release=2
 source="https://www.x.org/archive/individual/font/$name-$version.tar.bz2"

 build() {
--- a/core/font-adobe-utopia-type1/.pkgfiles
+++ b/core/font-adobe-utopia-type1/.pkgfiles
@@ -1,13 +1,12 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/Type1/
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTBI____.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTBI____.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTB_____.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTB_____.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTI_____.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTI_____.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTRG____.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/UTRG____.pfa
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/Type1/
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTBI____.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTBI____.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTB_____.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTB_____.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTI_____.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTI_____.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTRG____.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/UTRG____.pfa
--- a/core/font-adobe-utopia-type1/spkgbuild
+++ b/core/font-adobe-utopia-type1/spkgbuild
@@ -3,7 +3,7 @@

 name=font-adobe-utopia-type1
 version=1.0.4
-release=2
+release=3
 source="http://ftp.x.org/pub/individual/font/font-adobe-utopia-type1-$version.tar.bz2"

 build() {
@@ -16,8 +16,5 @@ build() {
 		--disable-static
 	make
 	make DESTDIR=$PKG install
-	
-	find $PKG -name 'fonts.scale' -delete	
-	find $PKG -name 'fonts.dir' -delete
 }

--- a/core/font-alias/.pkgfiles
+++ b/core/font-alias/.pkgfiles
@@ -1,12 +1,11 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/fonts/
-drwxr-xr-x root/root    usr/share/fonts/X11/
-drwxr-xr-x root/root    usr/share/fonts/X11/100dpi/
-rw-r--r-- root/root    usr/share/fonts/X11/100dpi/fonts.alias
-drwxr-xr-x root/root    usr/share/fonts/X11/75dpi/
-rw-r--r-- root/root    usr/share/fonts/X11/75dpi/fonts.alias
-drwxr-xr-x root/root    usr/share/fonts/X11/cyrillic/
-rw-r--r-- root/root    usr/share/fonts/X11/cyrillic/fonts.alias
-drwxr-xr-x root/root    usr/share/fonts/X11/misc/
-rw-r--r-- root/root    usr/share/fonts/X11/misc/fonts.alias
+drwxr-xr-x root/root    usr/share/fonts/100dpi/
+-rw-r--r-- root/root    usr/share/fonts/100dpi/fonts.alias
+drwxr-xr-x root/root    usr/share/fonts/75dpi/
+-rw-r--r-- root/root    usr/share/fonts/75dpi/fonts.alias
+drwxr-xr-x root/root    usr/share/fonts/cyrillic/
+-rw-r--r-- root/root    usr/share/fonts/cyrillic/fonts.alias
+drwxr-xr-x root/root    usr/share/fonts/misc/
+-rw-r--r-- root/root    usr/share/fonts/misc/fonts.alias
--- a/core/font-alias/spkgbuild
+++ b/core/font-alias/spkgbuild
@@ -2,7 +2,7 @@

 name=font-alias
 version=1.0.4
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/font-alias-$version.tar.bz2"

 build() {
--- a/core/font-bh-ttf/.pkgfiles
+++ b/core/font-bh-ttf/.pkgfiles
@@ -1,23 +1,22 @@
-drwxr-xr-x root/root etc/
-drwxr-xr-x root/root etc/fonts/
-drwxr-xr-x root/root etc/fonts/conf.avail/
-rw-r--r-- root/root etc/fonts/conf.avail/42-luxi-mono.conf
-drwxr-xr-x root/root etc/fonts/conf.d/
-lrwxrwxrwx root/root etc/fonts/conf.d/42-luxi-mono.conf
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/TTF/
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luximb.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luximbi.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luximr.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luximri.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxirb.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxirbi.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxirr.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxirri.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxisb.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxisbi.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxisr.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/luxisri.ttf
+drwxr-xr-x root/root    etc/
+drwxr-xr-x root/root    etc/fonts/
+drwxr-xr-x root/root    etc/fonts/conf.avail/
+-rw-r--r-- root/root    etc/fonts/conf.avail/42-luxi-mono.conf
+drwxr-xr-x root/root    etc/fonts/conf.d/
+lrwxrwxrwx root/root    etc/fonts/conf.d/42-luxi-mono.conf -> ../conf.avail/42-luxi-mono.conf
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/TTF/
+-rw-r--r-- root/root    usr/share/fonts/TTF/luximb.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luximbi.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luximr.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luximri.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxirb.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxirbi.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxirr.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxirri.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxisb.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxisbi.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxisr.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/luxisri.ttf
--- a/core/font-bh-ttf/spkgbuild
+++ b/core/font-bh-ttf/spkgbuild
@@ -3,7 +3,7 @@

 name=font-bh-ttf
 version=1.0.3
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/font-bh-ttf-$version.tar.bz2"

 build() {
@@ -16,8 +16,5 @@ build() {
 		--disable-static
 	make
 	make DESTDIR=$PKG install
-	
-	find $PKG -name 'fonts.dir' -delete
-	find $PKG -name 'fonts.scale' -delete
 }

--- a/core/font-bh-type1/.pkgfiles
+++ b/core/font-bh-type1/.pkgfiles
@@ -1,29 +1,28 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/Type1/
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047013t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047013t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047016t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047016t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047033t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047033t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047036t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l047036t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048013t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048013t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048016t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048016t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048033t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048033t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048036t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l048036t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049013t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049013t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049016t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049016t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049033t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049033t.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049036t.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/l049036t.pfa
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/Type1/
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047013t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047013t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047016t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047016t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047033t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047033t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047036t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l047036t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048013t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048013t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048016t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048016t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048033t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048033t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048036t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l048036t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049013t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049013t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049016t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049016t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049033t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049033t.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049036t.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/l049036t.pfa
--- a/core/font-bh-type1/spkgbuild
+++ b/core/font-bh-type1/spkgbuild
@@ -3,7 +3,7 @@

 name=font-bh-type1
 version=1.0.3
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/font-bh-type1-$version.tar.bz2"

 build() {
@@ -16,8 +16,5 @@ build() {
 		--disable-static
 	make
 	make DESTDIR=$PKG install
-	
-	find $PKG -name 'fonts.dir' -delete
-	find $PKG -name 'fonts.scale' -delete
 }

--- a/core/font-daewoo-misc/.pkgfiles
+++ b/core/font-daewoo-misc/.pkgfiles
@@ -1,8 +1,7 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/misc/
-rw-r--r-- root/root usr/share/fonts/X11/misc/hanglg16.pcf.gz
-rw-r--r-- root/root usr/share/fonts/X11/misc/hanglm16.pcf.gz
-rw-r--r-- root/root usr/share/fonts/X11/misc/hanglm24.pcf.gz
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/misc/
+-rw-r--r-- root/root    usr/share/fonts/misc/hanglg16.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/hanglm16.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/hanglm24.pcf.gz
--- a/core/font-daewoo-misc/spkgbuild
+++ b/core/font-daewoo-misc/spkgbuild
@@ -3,7 +3,7 @@

 name=font-daewoo-misc
 version=1.0.3
-release=1
+release=2
 source="https://www.x.org/archive/individual/font/$name-$version.tar.bz2"

 build() {
@@ -16,7 +16,4 @@ build() {
 		--disable-static
 	make
 	make DESTDIR=$PKG install
-
-	find $PKG -name 'fonts.scale' -delete	
-	find $PKG -name 'fonts.dir' -delete
 }
--- a/core/font-ibm-type1/.pkgfiles
+++ b/core/font-ibm-type1/.pkgfiles
@@ -1,13 +1,12 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/Type1/
-rw-r--r-- root/root usr/share/fonts/X11/Type1/cour.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/cour.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/courb.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/courb.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/courbi.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/courbi.pfa
-rw-r--r-- root/root usr/share/fonts/X11/Type1/couri.afm
-rw-r--r-- root/root usr/share/fonts/X11/Type1/couri.pfa
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/Type1/
+-rw-r--r-- root/root    usr/share/fonts/Type1/cour.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/cour.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/courb.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/courb.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/courbi.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/courbi.pfa
+-rw-r--r-- root/root    usr/share/fonts/Type1/couri.afm
+-rw-r--r-- root/root    usr/share/fonts/Type1/couri.pfa
--- a/core/font-ibm-type1/spkgbuild
+++ b/core/font-ibm-type1/spkgbuild
@@ -3,7 +3,7 @@

 name=font-ibm-type1
 version=1.0.3
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/font-ibm-type1-$version.tar.bz2"

 build() {
@@ -16,8 +16,5 @@ build() {
 		--disable-static
 	make
 	make DESTDIR=$PKG install
-	
-	find $PKG -name 'fonts.dir' -delete
-	find $PKG -name 'fonts.scale' -delete
 }

--- a/core/font-isas-misc/.pkgfiles
+++ b/core/font-isas-misc/.pkgfiles
@@ -1,8 +1,7 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/misc/
-rw-r--r-- root/root usr/share/fonts/X11/misc/gb16fs.pcf.gz
-rw-r--r-- root/root usr/share/fonts/X11/misc/gb16st.pcf.gz
-rw-r--r-- root/root usr/share/fonts/X11/misc/gb24st.pcf.gz
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/misc/
+-rw-r--r-- root/root    usr/share/fonts/misc/gb16fs.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/gb16st.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/gb24st.pcf.gz
--- a/core/font-isas-misc/spkgbuild
+++ b/core/font-isas-misc/spkgbuild
@@ -3,7 +3,7 @@

 name=font-isas-misc
 version=1.0.3
-release=1
+release=2
 source="https://www.x.org/archive/individual/font/$name-$version.tar.bz2"

 build() {
@@ -16,7 +16,4 @@ build() {
 		--disable-static
 	make
 	make DESTDIR=$PKG install
-
-	find $PKG -name 'fonts.scale' -delete	
-	find $PKG -name 'fonts.dir' -delete
 }
--- a/core/font-jis-misc/.pkgfiles
+++ b/core/font-jis-misc/.pkgfiles
@@ -1,7 +1,6 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/misc/
-rw-r--r-- root/root usr/share/fonts/X11/misc/jiskan16.pcf.gz
-rw-r--r-- root/root usr/share/fonts/X11/misc/jiskan24.pcf.gz
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/misc/
+-rw-r--r-- root/root    usr/share/fonts/misc/jiskan16.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/jiskan24.pcf.gz
--- a/core/font-jis-misc/spkgbuild
+++ b/core/font-jis-misc/spkgbuild
@@ -3,7 +3,7 @@

 name=font-jis-misc
 version=1.0.3
-release=1
+release=2
 source="https://www.x.org/archive/individual/font/$name-$version.tar.bz2"

 build() {
--- a/core/font-misc-ethiopic/.pkgfiles
+++ b/core/font-misc-ethiopic/.pkgfiles
@@ -1,8 +1,7 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/fonts/
-drwxr-xr-x root/root    usr/share/fonts/X11/
-drwxr-xr-x root/root    usr/share/fonts/X11/OTF/
-rw-r--r-- root/root    usr/share/fonts/X11/OTF/GohaTibebZemen.otf
-drwxr-xr-x root/root    usr/share/fonts/X11/TTF/
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/GohaTibebZemen.ttf
+drwxr-xr-x root/root    usr/share/fonts/OTF/
+-rw-r--r-- root/root    usr/share/fonts/OTF/GohaTibebZemen.otf
+drwxr-xr-x root/root    usr/share/fonts/TTF/
+-rw-r--r-- root/root    usr/share/fonts/TTF/GohaTibebZemen.ttf
--- a/core/font-misc-ethiopic/spkgbuild
+++ b/core/font-misc-ethiopic/spkgbuild
@@ -3,7 +3,7 @@

 name=font-misc-ethiopic
 version=1.0.4
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/font-misc-ethiopic-$version.tar.bz2"

 build() {
--- a/core/font-util/.pkgfiles
+++ b/core/font-util/.pkgfiles
@@ -1,34 +1,33 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/bdftruncate
-rwxr-xr-x root/root usr/bin/ucs2any
-drwxr-xr-x root/root usr/lib/
-drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/fontutil.pc
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/aclocal/
-rw-r--r-- root/root usr/share/aclocal/fontutil.m4
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/util/
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-1
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-10
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-11
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-13
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-14
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-15
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-16
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-2
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-3
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-4
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-5
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-6
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-7
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-8
-rw-r--r-- root/root usr/share/fonts/X11/util/map-ISO8859-9
-rw-r--r-- root/root usr/share/fonts/X11/util/map-JISX0201.1976-0
-rw-r--r-- root/root usr/share/fonts/X11/util/map-KOI8-R
-drwxr-xr-x root/root usr/share/man/
-drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/bdftruncate.1.gz
-rw-r--r-- root/root usr/share/man/man1/ucs2any.1.gz
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/bin/
+-rwxr-xr-x root/root    usr/bin/bdftruncate
+-rwxr-xr-x root/root    usr/bin/ucs2any
+drwxr-xr-x root/root    usr/lib/
+drwxr-xr-x root/root    usr/lib/pkgconfig/
+-rw-r--r-- root/root    usr/lib/pkgconfig/fontutil.pc
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/aclocal/
+-rw-r--r-- root/root    usr/share/aclocal/fontutil.m4
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/util/
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-1
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-10
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-11
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-13
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-14
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-15
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-16
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-2
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-3
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-4
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-5
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-6
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-7
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-8
+-rw-r--r-- root/root    usr/share/fonts/util/map-ISO8859-9
+-rw-r--r-- root/root    usr/share/fonts/util/map-JISX0201.1976-0
+-rw-r--r-- root/root    usr/share/fonts/util/map-KOI8-R
+drwxr-xr-x root/root    usr/share/man/
+drwxr-xr-x root/root    usr/share/man/man1/
+-rw-r--r-- root/root    usr/share/man/man1/bdftruncate.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/ucs2any.1.gz
--- a/core/font-util/spkgbuild
+++ b/core/font-util/spkgbuild
@@ -2,7 +2,7 @@

 name=font-util
 version=1.3.2
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/font-util-$version.tar.bz2"

 build() {
@@ -12,7 +12,9 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		--with-mapdir=/usr/share/fonts/util \
+		--with-fontrootdir=/usr/share/fonts
 	make
 	make DESTDIR=$PKG install
 }
--- a/core/font-xfree86-type1/.pkgfiles
+++ b/core/font-xfree86-type1/.pkgfiles
@@ -1,6 +1,5 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/Type1/
-rw-r--r-- root/root usr/share/fonts/X11/Type1/cursor.pfa
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/Type1/
+-rw-r--r-- root/root    usr/share/fonts/Type1/cursor.pfa
--- a/core/font-xfree86-type1/spkgbuild
+++ b/core/font-xfree86-type1/spkgbuild
@@ -3,7 +3,7 @@

 name=font-xfree86-type1
 version=1.0.4
-release=1
+release=2
 source="http://ftp.x.org/pub/individual/font/font-xfree86-type1-$version.tar.bz2"

 build() {
--- a/core/fontconfig/spkgbuild
+++ b/core/fontconfig/spkgbuild
@@ -3,7 +3,7 @@

 name=fontconfig
 version=2.13.1
-release=3
+release=4
 source="https://www.freedesktop.org/software/fontconfig/release/$name-$version.tar.bz2"

 build() {
@@ -16,7 +16,8 @@ build() {
 	            --sysconfdir=/etc    \
 	            --localstatedir=/var \
 		    --disable-nls        \
-	            --disable-docs
+	            --disable-docs \
+		    --with-default-fonts=/usr/share/fonts
 	make
 	make DESTDIR=$PKG install
 }
--- a/core/liberation-fonts/.pkgfiles
+++ b/core/liberation-fonts/.pkgfiles
@@ -1,23 +1,22 @@
-drwxr-xr-x root/root etc/
-drwxr-xr-x root/root etc/fonts/
-drwxr-xr-x root/root etc/fonts/conf.avail/
-rw-r--r-- root/root etc/fonts/conf.avail/30-liberation-fonts-mono.conf
-rw-r--r-- root/root etc/fonts/conf.avail/30-liberation-fonts-sans.conf
-rw-r--r-- root/root etc/fonts/conf.avail/30-liberation-fonts-serif.conf
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/TTF/
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationMono-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationMono-BoldItalic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationMono-Italic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationMono-Regular.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSans-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSans-BoldItalic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSans-Italic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSans-Regular.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSerif-Bold.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSerif-BoldItalic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSerif-Italic.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/LiberationSerif-Regular.ttf
+drwxr-xr-x root/root    etc/
+drwxr-xr-x root/root    etc/fonts/
+drwxr-xr-x root/root    etc/fonts/conf.avail/
+-rw-r--r-- root/root    etc/fonts/conf.avail/30-liberation-fonts-mono.conf
+-rw-r--r-- root/root    etc/fonts/conf.avail/30-liberation-fonts-sans.conf
+-rw-r--r-- root/root    etc/fonts/conf.avail/30-liberation-fonts-serif.conf
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/TTF/
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationMono-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationMono-BoldItalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationMono-Italic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationMono-Regular.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSans-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSans-BoldItalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSans-Italic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSans-Regular.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSerif-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSerif-BoldItalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSerif-Italic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/LiberationSerif-Regular.ttf
--- a/core/liberation-fonts/spkgbuild
+++ b/core/liberation-fonts/spkgbuild
@@ -3,7 +3,7 @@

 name=liberation-fonts
 version=2.00.1
-release=3
+release=4
 source="https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-$version.tar.gz \
 	30-0-liberation-mono.conf \
        30-0-liberation-sans.conf \
@@ -11,12 +11,10 @@ source="https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-$versi

 build() {
 	cd $name-ttf-$version
-	install -d $PKG/usr/share/fonts/X11/TTF
-	cp *.ttf $PKG/usr/share/fonts/X11/TTF/
+	install -d $PKG/usr/share/fonts/TTF
+	cp *.ttf $PKG/usr/share/fonts/TTF/

 	install -Dm0644 ../30-0-liberation-mono.conf $PKG/etc/fonts/conf.avail/30-$name-mono.conf
 	install -Dm0644 ../30-0-liberation-sans.conf $PKG/etc/fonts/conf.avail/30-$name-sans.conf
 	install -Dm0644 ../30-0-liberation-serif.conf $PKG/etc/fonts/conf.avail/30-$name-serif.conf
-
 }
-
--- a/core/ohsnap/.pkgfiles
+++ b/core/ohsnap/.pkgfiles
@@ -1,38 +1,37 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/consolefonts/
-rw-r--r-- root/root usr/share/consolefonts/ohsnap6x11b.psfu
-rw-r--r-- root/root usr/share/consolefonts/ohsnap6x11r.psfu
-rw-r--r-- root/root usr/share/consolefonts/ohsnap6x13b.psfu
-rw-r--r-- root/root usr/share/consolefonts/ohsnap6x13r.psfu
-rw-r--r-- root/root usr/share/consolefonts/ohsnap7x12b.psfu
-rw-r--r-- root/root usr/share/consolefonts/ohsnap7x12r.psfu
-rw-r--r-- root/root usr/share/consolefonts/ohsnap7x14b.psfu
-rw-r--r-- root/root usr/share/consolefonts/ohsnap7x14r.psfu
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/misc/
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x11b.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x11b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x11r.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x11r.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x13b.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x13b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x13r.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap6x13r.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x12b.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x12b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x12r.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x12r.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x14b.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x14b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x14r.icons.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnap7x14r.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu6x11b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu6x11r.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu6x13b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu6x13r.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu7x12b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu7x12r.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu7x14b.pcf
-rw-r--r-- root/root usr/share/fonts/X11/misc/ohsnapu7x14r.pcf
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/consolefonts/
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap6x11b.psfu
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap6x11r.psfu
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap6x13b.psfu
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap6x13r.psfu
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap7x12b.psfu
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap7x12r.psfu
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap7x14b.psfu
+-rw-r--r-- root/root    usr/share/consolefonts/ohsnap7x14r.psfu
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/misc/
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x11b.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x11b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x11r.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x11r.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x13b.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x13b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x13r.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap6x13r.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x12b.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x12b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x12r.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x12r.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x14b.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x14b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x14r.icons.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnap7x14r.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu6x11b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu6x11r.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu6x13b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu6x13r.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu7x12b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu7x12r.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu7x14b.pcf
+-rw-r--r-- root/root    usr/share/fonts/misc/ohsnapu7x14r.pcf
--- a/core/ohsnap/spkgbuild
+++ b/core/ohsnap/spkgbuild
@@ -3,16 +3,16 @@

 name=ohsnap
 version=1.8.0
-release=2
+release=3
 source="https://sourceforge.net/projects/osnapfont/files/$name-$version.tar.gz"

 build() {
 	cd $name-$version

-	install -d "$PKG/usr/share/fonts/X11/misc"
+	install -d "$PKG/usr/share/fonts/misc"
 	install -d "$PKG/usr/share/consolefonts"

-	install -m644 *.pcf "$PKG/usr/share/fonts/X11/misc"
+	install -m644 *.pcf "$PKG/usr/share/fonts/misc"
 	install -m644 *.psfu "$PKG/usr/share/consolefonts"
 }

--- a/core/qt5/spkgbuild
+++ b/core/qt5/spkgbuild
@@ -1,6 +1,6 @@
 # description	: Cross-platform application framework that is widely used for developing application
 # depends	: dbus gdk-pixbuf gst-plugins-base libepoxy libmng libxkbcommon harfbuzz xcb-util-wm
-# depends	: xcb-util-image xcb-util-keysyms xcb-util-renderutil libxcb
+# depends	: xcb-util-image xcb-util-keysyms xcb-util-renderutil libxcb fontconfig

 name=qt5
 version=5.15.2
--- a/core/siji-font/.pkgfiles
+++ b/core/siji-font/.pkgfiles
@@ -1,9 +1,8 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/misc/
-rw-r--r-- root/root usr/share/fonts/X11/misc/siji.bdf
-rw-r--r-- root/root usr/share/fonts/X11/misc/siji.pcf
-drwxr-xr-x root/root usr/share/siji/
-rwxr-xr-x root/root usr/share/siji/view.sh
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/misc/
+-rw-r--r-- root/root    usr/share/fonts/misc/siji.bdf
+-rw-r--r-- root/root    usr/share/fonts/misc/siji.pcf
+drwxr-xr-x root/root    usr/share/siji/
+-rwxr-xr-x root/root    usr/share/siji/view.sh
--- a/core/siji-font/spkgbuild
+++ b/core/siji-font/spkgbuild
@@ -4,14 +4,14 @@
 name=siji-font
 _name=siji
 version=20190218
-release=1
+release=2
 _commit=c691f200c1c66e76daa2afc9cbbd1aa39045c906
 source="siji-$version.tar.gz::https://github.com/stark/siji/archive/$_commit.tar.gz"

 build() {
 	cd siji-$_commit

-	install -D -m644 pcf/siji.pcf "${PKG}/usr/share/fonts/X11/misc/siji.pcf"
-	install -D -m644 bdf/siji.bdf "${PKG}/usr/share/fonts/X11/misc/siji.bdf"
+	install -D -m644 pcf/siji.pcf "${PKG}/usr/share/fonts/misc/siji.pcf"
+	install -D -m644 bdf/siji.bdf "${PKG}/usr/share/fonts/misc/siji.bdf"
 	install -D -m755 view.sh "${PKG}/usr/share/${_name}/view.sh"
 }
--- a/core/terminus-font/.pkgfiles
+++ b/core/terminus-font/.pkgfiles
@@ -246,23 +246,22 @@ drwxr-xr-x root/root    usr/share/consolefonts/
 -rw-r--r-- root/root    usr/share/consolefonts/ter-v32b.psf.gz
 -rw-r--r-- root/root    usr/share/consolefonts/ter-v32n.psf.gz
 drwxr-xr-x root/root    usr/share/fonts/
-drwxr-xr-x root/root    usr/share/fonts/X11/
-drwxr-xr-x root/root    usr/share/fonts/X11/misc/
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x12b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x12n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x14b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x14n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x16b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x16n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x18b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x18n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x20b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x20n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x22b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x22n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x24b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x24n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x28b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x28n.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x32b.pcf.gz
-rw-r--r-- root/root    usr/share/fonts/X11/misc/ter-x32n.pcf.gz
+drwxr-xr-x root/root    usr/share/fonts/misc/
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x12b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x12n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x14b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x14n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x16b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x16n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x18b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x18n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x20b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x20n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x22b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x22n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x24b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x24n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x28b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x28n.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x32b.pcf.gz
+-rw-r--r-- root/root    usr/share/fonts/misc/ter-x32n.pcf.gz
--- a/core/terminus-font/spkgbuild
+++ b/core/terminus-font/spkgbuild
@@ -3,16 +3,15 @@

 name=terminus-font
 version=4.49.1
-release=1
+release=2
 source="https://downloads.sourceforge.net/project/$name/$name-${version%.1}/terminus-font-$version.tar.gz"

 build() {
 	cd $name-$version

-	chmod +x configure
 	./configure \
 		--prefix=/usr \
-		--x11dir=/usr/share/fonts/X11/misc \
+		--x11dir=/usr/share/fonts/misc \
 		--psfdir=/usr/share/consolefonts
 	make
 	make DESTDIR=$PKG install
--- a/core/ttf-firacode/.pkgfiles
+++ b/core/ttf-firacode/.pkgfiles
@@ -1,10 +1,10 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/fonts/
-drwxr-xr-x root/root    usr/share/fonts/ttf-firacode/
-rw-r--r-- root/root    usr/share/fonts/ttf-firacode/FiraCode-Bold.ttf
-rw-r--r-- root/root    usr/share/fonts/ttf-firacode/FiraCode-Light.ttf
-rw-r--r-- root/root    usr/share/fonts/ttf-firacode/FiraCode-Medium.ttf
-rw-r--r-- root/root    usr/share/fonts/ttf-firacode/FiraCode-Regular.ttf
-rw-r--r-- root/root    usr/share/fonts/ttf-firacode/FiraCode-Retina.ttf
-rw-r--r-- root/root    usr/share/fonts/ttf-firacode/FiraCode-SemiBold.ttf
+drwxr-xr-x root/root    usr/share/fonts/firacode/
+-rw-r--r-- root/root    usr/share/fonts/firacode/FiraCode-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/firacode/FiraCode-Light.ttf
+-rw-r--r-- root/root    usr/share/fonts/firacode/FiraCode-Medium.ttf
+-rw-r--r-- root/root    usr/share/fonts/firacode/FiraCode-Regular.ttf
+-rw-r--r-- root/root    usr/share/fonts/firacode/FiraCode-Retina.ttf
+-rw-r--r-- root/root    usr/share/fonts/firacode/FiraCode-SemiBold.ttf
--- a/core/ttf-firacode/spkgbuild
+++ b/core/ttf-firacode/spkgbuild
@@ -1,15 +1,11 @@
-# description	: Fira Code Font ttf 
-# depends	: 
+# description	: Fira Code Font ttf

 name=ttf-firacode
 version=5.2
-release=1
-options=""
-noextract=""
-backup=""
+release=2
 source="https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"

 build() {
-	mkdir -p "$PKG/usr/share/fonts/${name}"
-	cp "ttf/"*.ttf "$PKG/usr/share/fonts/${name}"
+	mkdir -p "$PKG/usr/share/fonts/firacode"
+	cp "ttf/"*.ttf "$PKG/usr/share/fonts/firacode"
 }
--- a/core/ttf-hack/.pkgfiles
+++ b/core/ttf-hack/.pkgfiles
@@ -1,9 +1,8 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/fonts/
-drwxr-xr-x root/root    usr/share/fonts/X11/
-drwxr-xr-x root/root    usr/share/fonts/X11/TTF/
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/Hack-Bold.ttf
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/Hack-BoldItalic.ttf
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/Hack-Italic.ttf
-rw-r--r-- root/root    usr/share/fonts/X11/TTF/Hack-Regular.ttf
+drwxr-xr-x root/root    usr/share/fonts/TTF/
+-rw-r--r-- root/root    usr/share/fonts/TTF/Hack-Bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/Hack-BoldItalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/Hack-Italic.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/Hack-Regular.ttf
--- a/core/ttf-hack/spkgbuild
+++ b/core/ttf-hack/spkgbuild
@@ -2,9 +2,9 @@

 name=ttf-hack
 version=3.003
-release=1
+release=2
 source="https://github.com/source-foundry/Hack/releases/download/v${version}/Hack-v${version}-ttf.tar.xz"

 build() {
-	install -Dm644 -t "$PKG/usr/share/fonts/X11/TTF/" "$SRC"/Hack-*.ttf
+	install -Dm644 -t "$PKG/usr/share/fonts/TTF/" "$SRC"/Hack-*.ttf
 }
--- a/core/ttf-ionicons/spkgbuild
+++ b/core/ttf-ionicons/spkgbuild
@@ -1,12 +1,8 @@
 # description	: Font from the Ionic mobile framework 
-# depends	: 

 name=ttf-ionicons
 version=5.3.0
 release=1
-options=""
-noextract=""
-backup=""
 source="$name-$version.tar.gz::https://github.com/ionic-team/ionicons/archive/v${version/_/-}.tar.gz"

 build() {
--- a/core/ttf-iosevka/.pkgfiles
+++ b/core/ttf-iosevka/.pkgfiles
@@ -1,59 +1,58 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/fonts/
-drwxr-xr-x root/root    usr/share/fonts/TTF/
-drwxr-xr-x root/root    usr/share/fonts/TTF/ttf-iosevka/
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-bold.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-bolditalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-boldoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extended.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedbold.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedbolditalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedboldoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedextrabold.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedextrabolditalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedextraboldoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedextralight.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedextralightitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedextralightoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedheavy.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedheavyitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedheavyoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendeditalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedlight.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedlightitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedlightoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedmedium.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedmediumitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedmediumoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedsemibold.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedsemibolditalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedsemiboldoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedthin.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedthinitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extendedthinoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extrabold.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extrabolditalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extraboldoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extralight.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extralightitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-extralightoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-heavy.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-heavyitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-heavyoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-italic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-light.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-lightitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-lightoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-medium.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-mediumitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-mediumoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-oblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-regular.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-semibold.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-semibolditalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-semiboldoblique.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-thin.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-thinitalic.ttf
-rw-r--r-- root/root    usr/share/fonts/TTF/ttf-iosevka/iosevka-thinoblique.ttf
+drwxr-xr-x root/root    usr/share/fonts/iosevka/
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-bold.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-bolditalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-boldoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extended.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedbold.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedbolditalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedboldoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedextrabold.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedextrabolditalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedextraboldoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedextralight.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedextralightitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedextralightoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedheavy.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedheavyitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedheavyoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendeditalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedlight.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedlightitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedlightoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedmedium.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedmediumitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedmediumoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedsemibold.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedsemibolditalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedsemiboldoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedthin.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedthinitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extendedthinoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extrabold.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extrabolditalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extraboldoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extralight.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extralightitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-extralightoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-heavy.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-heavyitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-heavyoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-italic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-light.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-lightitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-lightoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-medium.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-mediumitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-mediumoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-oblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-regular.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-semibold.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-semibolditalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-semiboldoblique.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-thin.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-thinitalic.ttf
+-rw-r--r-- root/root    usr/share/fonts/iosevka/iosevka-thinoblique.ttf
--- a/core/ttf-iosevka/spkgbuild
+++ b/core/ttf-iosevka/spkgbuild
@@ -2,10 +2,10 @@

 name=ttf-iosevka
 version=4.5.0
-release=1
+release=2
 source="https://github.com/be5invis/Iosevka/releases/download/v${version}/${name}-${version}.zip"

 build() {
-	install -d ${PKG}/usr/share/fonts/TTF/${name}/
-	install -m644 *.ttf ${PKG}/usr/share/fonts/TTF/${name}
+	install -d ${PKG}/usr/share/fonts/iosevka
+	install -m644 *.ttf ${PKG}/usr/share/fonts/iosevka
 }
--- a/core/ttf-wps-fonts/.pkgfiles
+++ b/core/ttf-wps-fonts/.pkgfiles
@@ -1,11 +1,10 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/fonts/
-drwxr-xr-x root/root usr/share/fonts/X11/
-drwxr-xr-x root/root usr/share/fonts/X11/TTF/
-rw-r--r-- root/root usr/share/fonts/X11/TTF/WEBDINGS.TTF
-rw-r--r-- root/root usr/share/fonts/X11/TTF/WINGDNG2.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/WINGDNG3.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/mtextra.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/symbol.ttf
-rw-r--r-- root/root usr/share/fonts/X11/TTF/wingding.ttf
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fonts/
+drwxr-xr-x root/root    usr/share/fonts/TTF/
+-rw-r--r-- root/root    usr/share/fonts/TTF/WEBDINGS.TTF
+-rw-r--r-- root/root    usr/share/fonts/TTF/WINGDNG2.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/WINGDNG3.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/mtextra.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/symbol.ttf
+-rw-r--r-- root/root    usr/share/fonts/TTF/wingding.ttf
--- a/core/ttf-wps-fonts/spkgbuild
+++ b/core/ttf-wps-fonts/spkgbuild
@@ -3,13 +3,13 @@

 name=ttf-wps-fonts
 version=20170816
-release=2
+release=3
 _commit=b3e935355afcfb5240bac5a99707ffecc35772a2
 source="$name-$_commit.tar.gz::https://github.com/iamdh4/ttf-wps-fonts/archive/$_commit.tar.gz"

 build() {
 	cd $name-$_commit
-	install -d $PKG/usr/share/fonts/X11/TTF
-	install -m644 *.ttf $PKG/usr/share/fonts/X11/TTF
-	install -m644 *.TTF $PKG/usr/share/fonts/X11/TTF
+	install -d $PKG/usr/share/fonts/TTF
+	install -m644 *.ttf $PKG/usr/share/fonts/TTF
+	install -m644 *.TTF $PKG/usr/share/fonts/TTF
 }
--- a/multilib/.REPO
+++ b/multilib/.REPO
--- a/nonfree/.REPO
+++ b/nonfree/.REPO
--- a/testing/.REPO
+++ b/testing/.REPO