- Improve fontconfig support.

- Clean up fonts.dir handling.
- Use $PORTDOCS.

18 files changed, 302 insertions, 424 deletions

diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index 32b801b0f3d..7f56ae2c521 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sazanami-ttf
 PORTVERSION=	20040629
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	efont/10087
@@ -21,55 +21,48 @@ RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-FONTSDIR=	lib/X11/fonts/TrueType
-LOCALFONTSDIR=	share/fonts
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR} \
 		LOCALFONTSDIR=${LOCALBASE}/${LOCALFONTSDIR}
 
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
+		DATADIR=share/${PORTNAME}
 WRKSRC=		${WRKDIR}/sazanami-${PORTVERSION}
 
-DOC_FILES=	README \
-		doc/oradano/README.txt doc/misaki/misakib8.txt \
-		doc/mplus/LICENSE_J doc/shinonome/LICENSE \
-		doc/ayu/README.txt doc/kappa/README
+LOCAL_FONTSDIR=	share/fonts
+X_FONTSDIR=	lib/X11/fonts
+
+PORTDOCS=	README doc
 
 do-install:
-.if !exists(${PREFIX}/${FONTSDIR})
-	@${ECHO} "*********************************************************"
-	@${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path"
-	@${ECHO} "and load 'xtt' module in /etc/XF86Config."
-	@${ECHO} "*********************************************************"
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.endif
-	${INSTALL_DATA} ${WRKSRC}/sazanami-gothic.ttf \
-			${WRKSRC}/sazanami-mincho.ttf \
-			${FILESDIR}/fonts.dir.sazanami \
-			${FILESDIR}/fonts.alias.sazanami \
-			${PREFIX}/${FONTSDIR}
-	${MKDIR} ${LOCALBASE}/${LOCALFONTSDIR}/TrueType
+	${MKDIR} ${DATADIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
-		${PREFIX}/${FONTSDIR}/sazanami-gothic.ttf \
-		${LOCALBASE}/${LOCALFONTSDIR}/TrueType/sazanami-gothic.ttf
+		${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
 	${LN} -s -f \
-		${PREFIX}/${FONTSDIR}/sazanami-mincho.ttf \
-		${LOCALBASE}/${LOCALFONTSDIR}/TrueType/sazanami-mincho.ttf
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${FILESDIR}/3.sazanami-ttf.conf \
-			${PREFIX}/etc/fonts/conf.d
+		${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami-ttf.conf \
+		${FILESDIR}/62-fonts-sazanami-ttf.conf \
+		${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-sazanami-ttf.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+	${LN} -s -f ../conf.avail/62-fonts-sazanami-ttf.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for F in ${DOC_FILES:Mdoc/*}
-	${MKDIR} ${DOCSDIR}/${F:S,^doc/,,:H}
-	${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}/${F:S,^doc/,,:H}
-.endfor
-.for F in ${DOC_FILES:Ndoc/*}
-	${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
-	${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
+	${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/font-sazanami/files/20-unhint-sazanami-ttf.conf b/japanese/font-sazanami/files/20-unhint-sazanami-ttf.conf
new file mode 100644
index 00000000000..74fb41ee209
--- /dev/null
+++ b/japanese/font-sazanami/files/20-unhint-sazanami-ttf.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<match target="font">
+		<test name="family">
+			<string>Sazanami Mincho</string>
+			<string>Sazanami Gothic</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/font-sazanami/files/3.sazanami-ttf.conf b/japanese/font-sazanami/files/62-fonts-sazanami-ttf.conf
index 94dea7fdcc8..741690d0e5f 100644
--- a/japanese/font-sazanami/files/3.sazanami-ttf.conf
+++ b/japanese/font-sazanami/files/62-fonts-sazanami-ttf.conf
@@ -21,16 +21,4 @@
 			<family>Sazanami Mincho</family>
 		</prefer>
 	</alias>
-	<match target="font">
-		<test name="family">
-			<string>Sazanami Mincho</string>
-			<string>Sazanami Gothic</string>
-		</test>
-		<edit name="hintstyle">
-			<const>hintslight</const>
-		</edit>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-	</match>
 </fontconfig>
diff --git a/japanese/font-sazanami/files/fonts.alias.sazanami b/japanese/font-sazanami/files/fonts.alias.sazanami
deleted file mode 100644
index 09543a695ee..00000000000
--- a/japanese/font-sazanami/files/fonts.alias.sazanami
+++ /dev/null
@@ -1,40 +0,0 @@
--sazanami-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/font-sazanami/files/fonts.dir.sazanami b/japanese/font-sazanami/files/fonts.dir.sazanami
deleted file mode 100644
index 26bd1750cd5..00000000000
--- a/japanese/font-sazanami/files/fonts.dir.sazanami
+++ /dev/null
@@ -1,61 +0,0 @@
-60
-sazanami-mincho.ttf -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:sazanami-mincho.ttf -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:sazanami-mincho.ttf -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:sazanami-mincho.ttf -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:sazanami-mincho.ttf -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:sazanami-mincho.ttf -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
-sazanami-gothic.ttf -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:sazanami-gothic.ttf -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:sazanami-gothic.ttf -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:sazanami-gothic.ttf -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:sazanami-gothic.ttf -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:sazanami-gothic.ttf -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/font-sazanami/files/pkg-install.in b/japanese/font-sazanami/files/pkg-install.in
new file mode 100644
index 00000000000..ea9f4d3c3bf
--- /dev/null
+++ b/japanese/font-sazanami/files/pkg-install.in
@@ -0,0 +1,90 @@
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+
+catfontsdir ()
+{
+    while read _IN
+    do
+      case "${_IN}" in
+      *-sazanami-*|[0-9]*|"") ;;
+      *)       echo ${_IN} ;;
+      esac
+    done
+}
+
+ROMA=""
+BOLD="ds=y"
+ITAL="ai=0.15"
+OBLI="ai=0.15"
+RITA="ai=0.08"
+ROBL="ai=0.08"
+
+make_xlfd()
+{
+	_enc=$1
+	_file=$2
+	_vendor=$3
+	_fname=$4
+	_poc=$5
+
+	case "${_poc}:${_enc}" in
+	p:jisx0201.1976-*)	PFIX="fp=y:bw=0.5" ;;
+	c:jisx0201.1976-*)	PFIX="fp=n:bw=0.5" ;;
+	p:*)			PFIX="fp=y" ;;
+	c:*)			PFIX="fp=n" ;;
+	esac
+
+	set --	"${ROMA}"	medium-r \
+		${BOLD}		bold-r \
+		${ITAL}		medium-i \
+		${ITAL}:${BOLD} bold-i \
+		${OBLI}		medium-o \
+		${OBLI}:${BOLD}	bold-o \
+		${RITA}		medium-ri \
+		${RITA}:${BOLD}	bold-ri \
+		${ROBL}		medium-ro \
+		${ROBL}:${BOLD}	bold-ro
+	while [ $# != 0 ]; do
+		_prefix="${PFIX}:$1"; shift
+		_variant=$1; shift
+		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+			$_prefix $_file $_vendor $_fname $_variant $_poc $_enc
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+}
+
+addentries ()
+{
+	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
+	do
+		make_xlfd $ENC sazanami-mincho.ttf sazanami mincho c
+		make_xlfd $ENC sazanami-mincho.ttf sazanami mincho p
+		make_xlfd $ENC sazanami-gothic.ttf sazanami gothic c
+		make_xlfd $ENC sazanami-gothic.ttf sazanami gothic p
+
+	done
+}
+
+nfonts ()
+{
+    _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
+}
+
+case "$2" in
+POST-INSTALL)
+	cd ${X_FONTSDIR}
+	touch fonts.dir
+	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+	;;
+DEINSTALL)
+	cd ${X_FONTSDIR}
+	catfontsdir < fonts.dir > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+	;;
+esac
diff --git a/japanese/font-sazanami/pkg-deinstall b/japanese/font-sazanami/pkg-deinstall
deleted file mode 100644
index 2c3c37bd3db..00000000000
--- a/japanese/font-sazanami/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-sazanami-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e '/^-sazanami-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-rm -f fonts.dir.tmp
diff --git a/japanese/font-sazanami/pkg-install b/japanese/font-sazanami/pkg-install
deleted file mode 100644
index 2bb25fbce6a..00000000000
--- a/japanese/font-sazanami/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
-  echo "Please add ${FONTDIR} to your /etc/XF86Config file"
-  exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-sazanami-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.sazanami | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.sazanami >> fonts.dir
-touch fonts.alias
-sed -e '/^-sazanami-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-cat fonts.alias.sazanami >> fonts.alias
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist
index cd108e77453..441ee68d97a 100644
--- a/japanese/font-sazanami/pkg-plist
+++ b/japanese/font-sazanami/pkg-plist
@@ -1,30 +1,20 @@
 @comment $FreeBSD$
-etc/fonts/conf.d/3.sazanami-ttf.conf
-%%FONTSDIR%%/fonts.alias.sazanami
-%%FONTSDIR%%/fonts.dir.sazanami
-%%FONTSDIR%%/sazanami-mincho.ttf
-%%FONTSDIR%%/sazanami-gothic.ttf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/oradano/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/misaki/misakib8.txt
-%%PORTDOCS%%%%DOCSDIR%%/mplus/LICENSE_J
-%%PORTDOCS%%%%DOCSDIR%%/shinonome/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/ayu/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/kappa/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/oradano
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/misaki
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mplus
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/shinonome
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ayu
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/kappa
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
-@exec mkdir -p %%LOCALFONTSDIR%%/TrueType
-@exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf
-@unexec /bin/rmdir %%LOCALFONTSDIR%%/TrueType 2> /dev/null  || true
-@unexec /bin/rmdir %%LOCALFONTSDIR%% 2> /dev/null  || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
-@unexec if [ -s %D/%%FONTSDIR%%/fonts.cache-1 ]; then rm -f %D/%%FONTSDIR%%/fonts.cache-1; fi
+%%DATADIR%%/sazanami-mincho.ttf
+%%DATADIR%%/sazanami-gothic.ttf
+%%LOCAL_FONTSDIR%%/TrueType/sazanami-mincho.ttf
+%%LOCAL_FONTSDIR%%/TrueType/sazanami-gothic.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+@dirrmtry %%LOCAL_FONTSDIR%%
+etc/fonts/conf.avail/20-unhint-sazanami-ttf.conf
+etc/fonts/conf.avail/62-fonts-sazanami-ttf.conf
+@exec ln -s -f ../conf.avail/20-unhint-sazanami-ttf.conf %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+@exec ln -s -f ../conf.avail/62-fonts-sazanami-ttf.conf %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
+%%X_FONTSDIR%%/TrueType/sazanami-mincho.ttf
+%%X_FONTSDIR%%/TrueType/sazanami-gothic.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
+@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TrueType
+@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi
diff --git a/japanese/sazanami-ttf/Makefile b/japanese/sazanami-ttf/Makefile
index 32b801b0f3d..7f56ae2c521 100644
--- a/japanese/sazanami-ttf/Makefile
+++ b/japanese/sazanami-ttf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sazanami-ttf
 PORTVERSION=	20040629
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	efont/10087
@@ -21,55 +21,48 @@ RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-FONTSDIR=	lib/X11/fonts/TrueType
-LOCALFONTSDIR=	share/fonts
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR} \
 		LOCALFONTSDIR=${LOCALBASE}/${LOCALFONTSDIR}
 
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
+		DATADIR=share/${PORTNAME}
 WRKSRC=		${WRKDIR}/sazanami-${PORTVERSION}
 
-DOC_FILES=	README \
-		doc/oradano/README.txt doc/misaki/misakib8.txt \
-		doc/mplus/LICENSE_J doc/shinonome/LICENSE \
-		doc/ayu/README.txt doc/kappa/README
+LOCAL_FONTSDIR=	share/fonts
+X_FONTSDIR=	lib/X11/fonts
+
+PORTDOCS=	README doc
 
 do-install:
-.if !exists(${PREFIX}/${FONTSDIR})
-	@${ECHO} "*********************************************************"
-	@${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path"
-	@${ECHO} "and load 'xtt' module in /etc/XF86Config."
-	@${ECHO} "*********************************************************"
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.endif
-	${INSTALL_DATA} ${WRKSRC}/sazanami-gothic.ttf \
-			${WRKSRC}/sazanami-mincho.ttf \
-			${FILESDIR}/fonts.dir.sazanami \
-			${FILESDIR}/fonts.alias.sazanami \
-			${PREFIX}/${FONTSDIR}
-	${MKDIR} ${LOCALBASE}/${LOCALFONTSDIR}/TrueType
+	${MKDIR} ${DATADIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
-		${PREFIX}/${FONTSDIR}/sazanami-gothic.ttf \
-		${LOCALBASE}/${LOCALFONTSDIR}/TrueType/sazanami-gothic.ttf
+		${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
 	${LN} -s -f \
-		${PREFIX}/${FONTSDIR}/sazanami-mincho.ttf \
-		${LOCALBASE}/${LOCALFONTSDIR}/TrueType/sazanami-mincho.ttf
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${FILESDIR}/3.sazanami-ttf.conf \
-			${PREFIX}/etc/fonts/conf.d
+		${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami-ttf.conf \
+		${FILESDIR}/62-fonts-sazanami-ttf.conf \
+		${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-sazanami-ttf.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+	${LN} -s -f ../conf.avail/62-fonts-sazanami-ttf.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for F in ${DOC_FILES:Mdoc/*}
-	${MKDIR} ${DOCSDIR}/${F:S,^doc/,,:H}
-	${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}/${F:S,^doc/,,:H}
-.endfor
-.for F in ${DOC_FILES:Ndoc/*}
-	${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
-	${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
+	${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/sazanami-ttf/files/20-unhint-sazanami-ttf.conf b/japanese/sazanami-ttf/files/20-unhint-sazanami-ttf.conf
new file mode 100644
index 00000000000..74fb41ee209
--- /dev/null
+++ b/japanese/sazanami-ttf/files/20-unhint-sazanami-ttf.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<match target="font">
+		<test name="family">
+			<string>Sazanami Mincho</string>
+			<string>Sazanami Gothic</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/sazanami-ttf/files/3.sazanami-ttf.conf b/japanese/sazanami-ttf/files/62-fonts-sazanami-ttf.conf
index 94dea7fdcc8..741690d0e5f 100644
--- a/japanese/sazanami-ttf/files/3.sazanami-ttf.conf
+++ b/japanese/sazanami-ttf/files/62-fonts-sazanami-ttf.conf
@@ -21,16 +21,4 @@
 			<family>Sazanami Mincho</family>
 		</prefer>
 	</alias>
-	<match target="font">
-		<test name="family">
-			<string>Sazanami Mincho</string>
-			<string>Sazanami Gothic</string>
-		</test>
-		<edit name="hintstyle">
-			<const>hintslight</const>
-		</edit>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-	</match>
 </fontconfig>
diff --git a/japanese/sazanami-ttf/files/fonts.alias.sazanami b/japanese/sazanami-ttf/files/fonts.alias.sazanami
deleted file mode 100644
index 09543a695ee..00000000000
--- a/japanese/sazanami-ttf/files/fonts.alias.sazanami
+++ /dev/null
@@ -1,40 +0,0 @@
--sazanami-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-mincho-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-mincho-bold-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--sazanami-gothic-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-o-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
--sazanami-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1 -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/sazanami-ttf/files/fonts.dir.sazanami b/japanese/sazanami-ttf/files/fonts.dir.sazanami
deleted file mode 100644
index 26bd1750cd5..00000000000
--- a/japanese/sazanami-ttf/files/fonts.dir.sazanami
+++ /dev/null
@@ -1,61 +0,0 @@
-60
-sazanami-mincho.ttf -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:sazanami-mincho.ttf -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:sazanami-mincho.ttf -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:sazanami-mincho.ttf -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:sazanami-mincho.ttf -sazanami-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:sazanami-mincho.ttf -sazanami-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-mincho.ttf -sazanami-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-mincho.ttf -sazanami-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
-sazanami-gothic.ttf -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:sazanami-gothic.ttf -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:sazanami-gothic.ttf -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:sazanami-gothic.ttf -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:sazanami-gothic.ttf -sazanami-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:sazanami-gothic.ttf -sazanami-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:sazanami-gothic.ttf -sazanami-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:sazanami-gothic.ttf -sazanami-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/sazanami-ttf/files/pkg-install.in b/japanese/sazanami-ttf/files/pkg-install.in
new file mode 100644
index 00000000000..ea9f4d3c3bf
--- /dev/null
+++ b/japanese/sazanami-ttf/files/pkg-install.in
@@ -0,0 +1,90 @@
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+
+catfontsdir ()
+{
+    while read _IN
+    do
+      case "${_IN}" in
+      *-sazanami-*|[0-9]*|"") ;;
+      *)       echo ${_IN} ;;
+      esac
+    done
+}
+
+ROMA=""
+BOLD="ds=y"
+ITAL="ai=0.15"
+OBLI="ai=0.15"
+RITA="ai=0.08"
+ROBL="ai=0.08"
+
+make_xlfd()
+{
+	_enc=$1
+	_file=$2
+	_vendor=$3
+	_fname=$4
+	_poc=$5
+
+	case "${_poc}:${_enc}" in
+	p:jisx0201.1976-*)	PFIX="fp=y:bw=0.5" ;;
+	c:jisx0201.1976-*)	PFIX="fp=n:bw=0.5" ;;
+	p:*)			PFIX="fp=y" ;;
+	c:*)			PFIX="fp=n" ;;
+	esac
+
+	set --	"${ROMA}"	medium-r \
+		${BOLD}		bold-r \
+		${ITAL}		medium-i \
+		${ITAL}:${BOLD} bold-i \
+		${OBLI}		medium-o \
+		${OBLI}:${BOLD}	bold-o \
+		${RITA}		medium-ri \
+		${RITA}:${BOLD}	bold-ri \
+		${ROBL}		medium-ro \
+		${ROBL}:${BOLD}	bold-ro
+	while [ $# != 0 ]; do
+		_prefix="${PFIX}:$1"; shift
+		_variant=$1; shift
+		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+			$_prefix $_file $_vendor $_fname $_variant $_poc $_enc
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+}
+
+addentries ()
+{
+	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
+	do
+		make_xlfd $ENC sazanami-mincho.ttf sazanami mincho c
+		make_xlfd $ENC sazanami-mincho.ttf sazanami mincho p
+		make_xlfd $ENC sazanami-gothic.ttf sazanami gothic c
+		make_xlfd $ENC sazanami-gothic.ttf sazanami gothic p
+
+	done
+}
+
+nfonts ()
+{
+    _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
+}
+
+case "$2" in
+POST-INSTALL)
+	cd ${X_FONTSDIR}
+	touch fonts.dir
+	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+	;;
+DEINSTALL)
+	cd ${X_FONTSDIR}
+	catfontsdir < fonts.dir > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+	;;
+esac
diff --git a/japanese/sazanami-ttf/pkg-deinstall b/japanese/sazanami-ttf/pkg-deinstall
deleted file mode 100644
index 2c3c37bd3db..00000000000
--- a/japanese/sazanami-ttf/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-sazanami-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e '/^-sazanami-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-rm -f fonts.dir.tmp
diff --git a/japanese/sazanami-ttf/pkg-install b/japanese/sazanami-ttf/pkg-install
deleted file mode 100644
index 2bb25fbce6a..00000000000
--- a/japanese/sazanami-ttf/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
-  echo "Please add ${FONTDIR} to your /etc/XF86Config file"
-  exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-sazanami-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.sazanami | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.sazanami >> fonts.dir
-touch fonts.alias
-sed -e '/^-sazanami-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-cat fonts.alias.sazanami >> fonts.alias
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/sazanami-ttf/pkg-plist b/japanese/sazanami-ttf/pkg-plist
index cd108e77453..441ee68d97a 100644
--- a/japanese/sazanami-ttf/pkg-plist
+++ b/japanese/sazanami-ttf/pkg-plist
@@ -1,30 +1,20 @@
 @comment $FreeBSD$
-etc/fonts/conf.d/3.sazanami-ttf.conf
-%%FONTSDIR%%/fonts.alias.sazanami
-%%FONTSDIR%%/fonts.dir.sazanami
-%%FONTSDIR%%/sazanami-mincho.ttf
-%%FONTSDIR%%/sazanami-gothic.ttf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/oradano/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/misaki/misakib8.txt
-%%PORTDOCS%%%%DOCSDIR%%/mplus/LICENSE_J
-%%PORTDOCS%%%%DOCSDIR%%/shinonome/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/ayu/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/kappa/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/oradano
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/misaki
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mplus
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/shinonome
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ayu
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/kappa
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
-@exec mkdir -p %%LOCALFONTSDIR%%/TrueType
-@exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf
-@exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf
-@unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf
-@unexec /bin/rmdir %%LOCALFONTSDIR%%/TrueType 2> /dev/null  || true
-@unexec /bin/rmdir %%LOCALFONTSDIR%% 2> /dev/null  || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
-@unexec if [ -s %D/%%FONTSDIR%%/fonts.cache-1 ]; then rm -f %D/%%FONTSDIR%%/fonts.cache-1; fi
+%%DATADIR%%/sazanami-mincho.ttf
+%%DATADIR%%/sazanami-gothic.ttf
+%%LOCAL_FONTSDIR%%/TrueType/sazanami-mincho.ttf
+%%LOCAL_FONTSDIR%%/TrueType/sazanami-gothic.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+@dirrmtry %%LOCAL_FONTSDIR%%
+etc/fonts/conf.avail/20-unhint-sazanami-ttf.conf
+etc/fonts/conf.avail/62-fonts-sazanami-ttf.conf
+@exec ln -s -f ../conf.avail/20-unhint-sazanami-ttf.conf %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+@exec ln -s -f ../conf.avail/62-fonts-sazanami-ttf.conf %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
+%%X_FONTSDIR%%/TrueType/sazanami-mincho.ttf
+%%X_FONTSDIR%%/TrueType/sazanami-gothic.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
+@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TrueType
+@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi