Install the fontconfig configuration:

* Sync font directory list with base system.
* Put the user font cache directory under:
XDG_CACHE_HOME/.cache/fontconfig-compat_linux
to make it clear it is used by the Linux compatibility layer.
(fontconfig in Fedora 10 does not support the "xdg" prefix for cachedir)

This prevents creating the fontconfig cachedir directly in the user home
directory.

WARNING: due to a symlink replaced by a directory, this package can not
be properly updated, so a pkg_delete+pkg_add will be needed; since we
are riding the time_t switch, this will not be an issue for regular
release update since all pkg must be removed anyway.

emulators/fedora/base/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2012/11/12 15:03:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2013/12/04 15:53:33 ajacoutot Exp $
 
 COMMENT=	Linux compatibility package based on Fedora Core ${FEDORA_V}
 
 PKGNAME=	fedora_base-${FEDORA_V}.0
-REVISION=	1
+REVISION=	2
 
 SHARED_LIBS +=  cap                       2.10
 SHARED_LIBS +=  blkid                     1.0
@@ -71,8 +71,8 @@ RPMS=		basesystem-10.0-1.noarch.rpm \
 		libXxf86misc-1.0.1-6.fc10.i386.rpm \
 		libXxf86vm-1.0.2-1.fc10.i386.rpm
 
-REMOVE_DIRS=	boot dev etc/fonts home initrd media root tmp var/log var/run var/tmp \
-		usr/local usr/tmp usr/share/fonts etc/fonts
+REMOVE_DIRS=	boot dev home initrd media root tmp var/log var/run var/tmp \
+		usr/local usr/tmp usr/share/fonts
 
 REMOVE_FILES=	bin/df bin/su etc/exports etc/group etc/localtime \
 		etc/motd etc/passwd etc/printcap etc/services \
@@ -81,8 +81,12 @@ REMOVE_FILES=	bin/df bin/su etc/exports etc/group etc/localtime \
 ADD_DIRS=	usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
 		usr/X11R6/include usr/X11R6/bin
 
+PATCH_LIST=
+
 post-install:
-	ln -s ${SYSCONFDIR}/fonts ${FEDORADIR}/etc/fonts
+# fix fontconfig search path and cache directory
+	cd ${FEDORADIR}/etc/fonts && ${PATCH} -p0 -s --posix < \
+		${PATCHDIR}/patch-etc_fonts_fonts_conf
 	mkdir ${FEDORADIR}/dev; \
 		ln -s /dev/console ${FEDORADIR}/dev/tty0; \
 		ln -s /dev/ttyC0 ${FEDORADIR}/dev/tty1; \

emulators/fedora/base/patches/patch-etc_fonts_fonts_conf

@@ -0,0 +1,31 @@
+$OpenBSD: patch-etc_fonts_fonts_conf,v 1.3 2013/12/04 15:53:33 ajacoutot Exp $
+
+Sync font directory list with base system.
+
+Put the user font cache directory under:
+XDG_CACHE_HOME/.cache/fontconfig-compat_linux
+to make it clear it is used by the Linux compatibility layer.
+(fontconfig in Fedora 10 does not support the "xdg" prefix for cachedir)
+
+--- fonts.conf.orig	Wed Dec  4 16:20:56 2013
++++ fonts.conf	Wed Dec  4 16:22:17 2013
+@@ -23,8 +23,8 @@
+ 
+ <!-- Font directory list -->
+ 
+-	<dir>/usr/share/fonts</dir>
+-	<dir>/usr/share/X11/fonts/Type1</dir> <dir>/usr/share/X11/fonts/TTF</dir> <dir>/usr/local/share/fonts</dir>
++	<dir>/usr/X11R6/lib/X11/fonts</dir>
++	<dir>/usr/local/lib/X11/fonts</dir>
+ 	<dir>~/.fonts</dir>
+ 
+ <!--
+@@ -71,7 +71,7 @@
+ <!-- Font cache directory list -->
+ 
+ 	<cachedir>/var/cache/fontconfig</cachedir>
+-	<cachedir>~/.fontconfig</cachedir>
++	<cachedir>~/.cache/fontconfig-compat_linux</cachedir>
+ 
+ 	<config>
+ <!--

emulators/fedora/base/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2012/10/11 12:16:18 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.13 2013/12/04 15:53:33 ajacoutot Exp $
 @unexec-delete rm -f %D/emul/fedora/usr/share/man/whatis.db
 emul/
 emul/fedora/
@@ -61,7 +61,55 @@ emul/fedora/etc/default/nss
 emul/fedora/etc/environment
 emul/fedora/etc/fedora-release
 emul/fedora/etc/filesystems
-emul/fedora/etc/fonts
+emul/fedora/etc/fonts/
+emul/fedora/etc/fonts/conf.avail/
+emul/fedora/etc/fonts/conf.avail/10-autohint.conf
+emul/fedora/etc/fonts/conf.avail/10-no-sub-pixel.conf
+emul/fedora/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
+emul/fedora/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+emul/fedora/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+emul/fedora/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+emul/fedora/etc/fonts/conf.avail/10-unhinted.conf
+emul/fedora/etc/fonts/conf.avail/20-fix-globaladvance.conf
+emul/fedora/etc/fonts/conf.avail/20-unhint-small-vera.conf
+emul/fedora/etc/fonts/conf.avail/25-unhint-nonlatin.conf
+emul/fedora/etc/fonts/conf.avail/30-metric-aliases.conf
+emul/fedora/etc/fonts/conf.avail/30-urw-aliases.conf
+emul/fedora/etc/fonts/conf.avail/40-nonlatin.conf
+emul/fedora/etc/fonts/conf.avail/45-latin.conf
+emul/fedora/etc/fonts/conf.avail/49-sansserif.conf
+emul/fedora/etc/fonts/conf.avail/50-user.conf
+emul/fedora/etc/fonts/conf.avail/51-local.conf
+emul/fedora/etc/fonts/conf.avail/60-latin.conf
+emul/fedora/etc/fonts/conf.avail/65-fonts-persian.conf
+emul/fedora/etc/fonts/conf.avail/65-khmer.conf
+emul/fedora/etc/fonts/conf.avail/65-nonlatin.conf
+emul/fedora/etc/fonts/conf.avail/69-unifont.conf
+emul/fedora/etc/fonts/conf.avail/70-no-bitmaps.conf
+emul/fedora/etc/fonts/conf.avail/70-yes-bitmaps.conf
+emul/fedora/etc/fonts/conf.avail/80-delicious.conf
+emul/fedora/etc/fonts/conf.avail/90-synthetic.conf
+emul/fedora/etc/fonts/conf.d/
+emul/fedora/etc/fonts/conf.d/20-fix-globaladvance.conf
+emul/fedora/etc/fonts/conf.d/20-unhint-small-vera.conf
+emul/fedora/etc/fonts/conf.d/25-no-bitmap-fedora.conf
+emul/fedora/etc/fonts/conf.d/25-unhint-nonlatin.conf
+emul/fedora/etc/fonts/conf.d/30-metric-aliases.conf
+emul/fedora/etc/fonts/conf.d/30-urw-aliases.conf
+emul/fedora/etc/fonts/conf.d/40-nonlatin.conf
+emul/fedora/etc/fonts/conf.d/45-latin.conf
+emul/fedora/etc/fonts/conf.d/49-sansserif.conf
+emul/fedora/etc/fonts/conf.d/50-user.conf
+emul/fedora/etc/fonts/conf.d/51-local.conf
+emul/fedora/etc/fonts/conf.d/60-latin.conf
+emul/fedora/etc/fonts/conf.d/65-fonts-persian.conf
+emul/fedora/etc/fonts/conf.d/65-nonlatin.conf
+emul/fedora/etc/fonts/conf.d/69-unifont.conf
+emul/fedora/etc/fonts/conf.d/80-delicious.conf
+emul/fedora/etc/fonts/conf.d/90-synthetic.conf
+emul/fedora/etc/fonts/conf.d/README
+emul/fedora/etc/fonts/fonts.conf
+emul/fedora/etc/fonts/fonts.dtd
 emul/fedora/etc/host.conf
 emul/fedora/etc/hosts.allow
 emul/fedora/etc/hosts.deny