Index: head/japanese/font-ipa/Makefile
===================================================================
--- head/japanese/font-ipa/Makefile	(revision 148142)
+++ head/japanese/font-ipa/Makefile	(revision 148143)
@@ -1,54 +1,58 @@
 # New ports collection makefile for:	IPA TrueType fonts
 # Date created:		18 July 2004
 # Whom:			NAKATA, Maho <maho@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20040814
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese TrueType fonts distributed by IPA
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n
+RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts/TrueType
 GRASS_FONTSDIR=	grass5/fonts
 
-PKGINSTALL_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR}
-PLIST_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${X11BASE}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${PREFIX}/${LOCAL_FONTSDIR} \
+USE_X_PREFIX=	yes
+
+PLIST_SUB=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
+		FONTSDIR_EXTRA=${PREFIX}/${X_FONTSDIR}/fonts.dir.ipa \
+		LOCAL_FONTSDIR=${LOCALBASE}/${LOCAL_FONTSDIR} \
 		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
 
-pre-install:
-	@${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/pkg-install.in \
-		> ${WRKDIR}/pkg-install
-	${CHMOD} +x ${WRKDIR}/pkg-install
-
 do-install:
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType
-	${MKDIR} ${X11BASE}/${X_FONTSDIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${X11BASE}/${X_FONTSDIR}/
+		${PREFIX}/${X_FONTSDIR}/
+	${MKDIR} ${PREFIX}/etc/fonts/conf.d
+	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
+		${PREFIX}/etc/fonts/conf.d
 
 post-install:
+	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>

Property changes on: head/japanese/font-ipa/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/japanese/font-ipa/files/2.ipa-ttfonts.conf
===================================================================
--- head/japanese/font-ipa/files/2.ipa-ttfonts.conf	(nonexistent)
+++ head/japanese/font-ipa/files/2.ipa-ttfonts.conf	(revision 148143)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>IPAPMincho</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>IPAPGothic</family>
+			<family>IPAUIGothic</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>IPAGothic</family>
+			<family>IPAMincho</family>
+		</prefer>
+	</alias>
+	<match target="font">
+		<test name="family">
+			<string>IPAMincho</string>
+			<string>IPAGothic</string>
+			<string>IPAPMincho</string>
+			<string>IPAPGothic</string>
+			<string>IPAUIGothic</string>
+		</test>
+		<edit name="hintstyle">
+			<const>hintslight</const>
+		</edit>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>

Property changes on: head/japanese/font-ipa/files/2.ipa-ttfonts.conf
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/japanese/font-ipa/pkg-plist
===================================================================
--- head/japanese/font-ipa/pkg-plist	(revision 148142)
+++ head/japanese/font-ipa/pkg-plist	(revision 148143)
@@ -1,26 +1,30 @@
 @comment $FreeBSD$
+etc/fonts/conf.d/2.ipa-ttfonts.conf
 @exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @exec mkdir -p %%X_FONTSDIR%%
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
+@exec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
 @unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
 @unexec rm -f %%X_FONTSDIR%%/ipag.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipam.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
+@unexec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
+@unexec if [ -s %%X_FONTSDIR%%/fonts.cache-1 ]; then rm -f %%X_FONTSDIR%%/fonts.cache-1; fi
 @unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true

Property changes on: head/japanese/font-ipa/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/japanese/font-mplus-ipa/Makefile
===================================================================
--- head/japanese/font-mplus-ipa/Makefile	(revision 148142)
+++ head/japanese/font-mplus-ipa/Makefile	(revision 148143)
@@ -1,54 +1,58 @@
 # New ports collection makefile for:	IPA TrueType fonts
 # Date created:		18 July 2004
 # Whom:			NAKATA, Maho <maho@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20040814
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese TrueType fonts distributed by IPA
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n
+RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts/TrueType
 GRASS_FONTSDIR=	grass5/fonts
 
-PKGINSTALL_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR}
-PLIST_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${X11BASE}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${PREFIX}/${LOCAL_FONTSDIR} \
+USE_X_PREFIX=	yes
+
+PLIST_SUB=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
+		FONTSDIR_EXTRA=${PREFIX}/${X_FONTSDIR}/fonts.dir.ipa \
+		LOCAL_FONTSDIR=${LOCALBASE}/${LOCAL_FONTSDIR} \
 		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
 
-pre-install:
-	@${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/pkg-install.in \
-		> ${WRKDIR}/pkg-install
-	${CHMOD} +x ${WRKDIR}/pkg-install
-
 do-install:
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType
-	${MKDIR} ${X11BASE}/${X_FONTSDIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${X11BASE}/${X_FONTSDIR}/
+		${PREFIX}/${X_FONTSDIR}/
+	${MKDIR} ${PREFIX}/etc/fonts/conf.d
+	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
+		${PREFIX}/etc/fonts/conf.d
 
 post-install:
+	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>

Property changes on: head/japanese/font-mplus-ipa/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
===================================================================
--- head/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf	(nonexistent)
+++ head/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf	(revision 148143)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>IPAPMincho</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>IPAPGothic</family>
+			<family>IPAUIGothic</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>IPAGothic</family>
+			<family>IPAMincho</family>
+		</prefer>
+	</alias>
+	<match target="font">
+		<test name="family">
+			<string>IPAMincho</string>
+			<string>IPAGothic</string>
+			<string>IPAPMincho</string>
+			<string>IPAPGothic</string>
+			<string>IPAUIGothic</string>
+		</test>
+		<edit name="hintstyle">
+			<const>hintslight</const>
+		</edit>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>

Property changes on: head/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/japanese/font-mplus-ipa/pkg-plist
===================================================================
--- head/japanese/font-mplus-ipa/pkg-plist	(revision 148142)
+++ head/japanese/font-mplus-ipa/pkg-plist	(revision 148143)
@@ -1,26 +1,30 @@
 @comment $FreeBSD$
+etc/fonts/conf.d/2.ipa-ttfonts.conf
 @exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @exec mkdir -p %%X_FONTSDIR%%
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
+@exec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
 @unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
 @unexec rm -f %%X_FONTSDIR%%/ipag.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipam.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
+@unexec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
+@unexec if [ -s %%X_FONTSDIR%%/fonts.cache-1 ]; then rm -f %%X_FONTSDIR%%/fonts.cache-1; fi
 @unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true

Property changes on: head/japanese/font-mplus-ipa/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/japanese/ipa-ttfonts/Makefile
===================================================================
--- head/japanese/ipa-ttfonts/Makefile	(revision 148142)
+++ head/japanese/ipa-ttfonts/Makefile	(revision 148143)
@@ -1,54 +1,58 @@
 # New ports collection makefile for:	IPA TrueType fonts
 # Date created:		18 July 2004
 # Whom:			NAKATA, Maho <maho@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20040814
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese TrueType fonts distributed by IPA
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n
+RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts/TrueType
 GRASS_FONTSDIR=	grass5/fonts
 
-PKGINSTALL_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR}
-PLIST_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${X11BASE}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${PREFIX}/${LOCAL_FONTSDIR} \
+USE_X_PREFIX=	yes
+
+PLIST_SUB=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
+		FONTSDIR_EXTRA=${PREFIX}/${X_FONTSDIR}/fonts.dir.ipa \
+		LOCAL_FONTSDIR=${LOCALBASE}/${LOCAL_FONTSDIR} \
 		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
 
-pre-install:
-	@${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/pkg-install.in \
-		> ${WRKDIR}/pkg-install
-	${CHMOD} +x ${WRKDIR}/pkg-install
-
 do-install:
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType
-	${MKDIR} ${X11BASE}/${X_FONTSDIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${X11BASE}/${X_FONTSDIR}/
+		${PREFIX}/${X_FONTSDIR}/
+	${MKDIR} ${PREFIX}/etc/fonts/conf.d
+	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
+		${PREFIX}/etc/fonts/conf.d
 
 post-install:
+	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>

Property changes on: head/japanese/ipa-ttfonts/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf
===================================================================
--- head/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf	(nonexistent)
+++ head/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf	(revision 148143)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>IPAPMincho</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>IPAPGothic</family>
+			<family>IPAUIGothic</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>IPAGothic</family>
+			<family>IPAMincho</family>
+		</prefer>
+	</alias>
+	<match target="font">
+		<test name="family">
+			<string>IPAMincho</string>
+			<string>IPAGothic</string>
+			<string>IPAPMincho</string>
+			<string>IPAPGothic</string>
+			<string>IPAUIGothic</string>
+		</test>
+		<edit name="hintstyle">
+			<const>hintslight</const>
+		</edit>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>

Property changes on: head/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/japanese/ipa-ttfonts/pkg-plist
===================================================================
--- head/japanese/ipa-ttfonts/pkg-plist	(revision 148142)
+++ head/japanese/ipa-ttfonts/pkg-plist	(revision 148143)
@@ -1,26 +1,30 @@
 @comment $FreeBSD$
+etc/fonts/conf.d/2.ipa-ttfonts.conf
 @exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @exec mkdir -p %%X_FONTSDIR%%
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
 @exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
+@exec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
 @unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
 @unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
 @unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
 @unexec rm -f %%X_FONTSDIR%%/ipag.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipam.ttf
 @unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
+@unexec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
+@unexec if [ -s %%X_FONTSDIR%%/fonts.cache-1 ]; then rm -f %%X_FONTSDIR%%/fonts.cache-1; fi
 @unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true

Property changes on: head/japanese/ipa-ttfonts/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property