[notify] xorg-font-msttcorefonts: new font path and new dependency fontconfig

3 files changed, 42 insertions, 41 deletions

diff --git a/xorg-font-msttcorefonts/.footprint b/xorg-font-msttcorefonts/.footprint
index 3d85a9f61..89fc93219 100644
--- a/xorg-font-msttcorefonts/.footprint
+++ b/xorg-font-msttcorefonts/.footprint
@@ -1,36 +1,36 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/X11/
-drwxr-xr-x	root/root	usr/lib/X11/fonts/
-drwxr-xr-x	root/root	usr/lib/X11/fonts/msttcorefonts/
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/andalemo.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/arial.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/arialbd.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/arialbi.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/ariali.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/ariblk.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/comic.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/comicbd.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/cour.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/courbd.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/courbi.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/couri.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/georgia.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/georgiab.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/georgiai.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/georgiaz.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/impact.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/tahoma.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/times.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/timesbd.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/timesbi.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/timesi.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/trebuc.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/trebucbd.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/trebucbi.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/trebucit.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/verdana.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/verdanab.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/verdanai.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/verdanaz.ttf
--rw-r--r--	root/root	usr/lib/X11/fonts/msttcorefonts/webdings.ttf
+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/andalemo.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/arial.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/arialbd.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/arialbi.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/ariali.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/ariblk.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/comic.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/comicbd.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/cour.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/courbd.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/courbi.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/couri.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/georgia.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/georgiab.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/georgiai.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/georgiaz.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/impact.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/tahoma.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/times.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/timesbd.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/timesbi.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/timesi.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/trebuc.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/trebucbd.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/trebucbi.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/trebucit.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/verdana.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/verdanab.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/verdanai.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/verdanaz.ttf
+-rw-r--r--	root/root	usr/share/fonts/X11/TTF/webdings.ttf
diff --git a/xorg-font-msttcorefonts/Pkgfile b/xorg-font-msttcorefonts/Pkgfile
index 9337a5010..2027024ce 100644
--- a/xorg-font-msttcorefonts/Pkgfile
+++ b/xorg-font-msttcorefonts/Pkgfile
@@ -2,11 +2,11 @@
 # Description: Microsoft's Web Fonts (truetype)
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: xorg-mkfontdir xorg-mkfontscale cabextract
+# Depends on: fontconfig xorg-mkfontdir xorg-mkfontscale cabextract
 
 name=xorg-font-msttcorefonts
 version=1.4
-release=1
+release=2
 source=(http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/webdin32.exe
 	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/andale32.exe
 	http://downloads.sourceforge.net/project/corefonts/the%20fonts/final/arial32.exe
@@ -30,8 +30,8 @@ build() {
 	done
 
 	cabextract --lowercase viewer1.cab
-	install -d $PKG/usr/lib/X11/fonts/msttcorefonts
+	install -d $PKG/usr/share/fonts/X11/TTF
 
 	install -o root -g root -m 0644 \
-		-t $PKG/usr/lib/X11/fonts/msttcorefonts/ *.ttf
+		-t $PKG/usr/share/fonts/X11/TTF *.ttf
 }
diff --git a/xorg-font-msttcorefonts/post-install b/xorg-font-msttcorefonts/post-install
index 1e5fcde55..f33f93d3a 100755
--- a/xorg-font-msttcorefonts/post-install
+++ b/xorg-font-msttcorefonts/post-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-mkfontdir /usr/lib/X11/fonts/msttcorefonts
-mkfontscale /usr/lib/X11/fonts/msttcorefonts
+fc-cache /usr/share/fonts/X11/TTF
+mkfontscale /usr/share/fonts/X11/TTF
+mkfontdir /usr/share/fonts/X11/TTF