5 files changed, 31 insertions, 33 deletions

diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index 8b5814b6c5ce..eeea628b1b34 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sazanami-ttf
+PORTNAME=	font-sazanami
 PORTVERSION=	20040629
-PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	efont/10087
-DISTNAME=	${PORTNAME:S/-ttf$//}-${PORTVERSION}
+DISTNAME=	${PORTNAME:C/font-//}-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Free Japanese TrueType fonts named 'Sazanami'
+COMMENT=	Sazanami Japanese TrueType fonts
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
@@ -34,28 +33,27 @@ X_FONTSDIR=	lib/X11/fonts
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
-	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f \
-		${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
-	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+		${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
 	${LN} -s -f \
-		${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami-ttf.conf \
-		${FILESDIR}/62-fonts-sazanami-ttf.conf \
+		${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-sazanami.conf \
+		${FILESDIR}/62-fonts-sazanami.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
+	${LN} -s -f ../conf.avail/20-unhint-sazanami.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-sazanami.conf
+	${LN} -s -f ../conf.avail/62-fonts-sazanami.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-sazanami.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
-	${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+	${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
 	${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.conf
index 74fb41ee209d..74fb41ee209d 100644
--- a/japanese/font-sazanami/files/20-unhint-sazanami-ttf.conf
+++ b/japanese/font-sazanami/files/20-unhint-sazanami.conf
diff --git a/japanese/font-sazanami/files/62-fonts-sazanami-ttf.conf b/japanese/font-sazanami/files/62-fonts-sazanami.conf
index 741690d0e5fd..741690d0e5fd 100644
--- a/japanese/font-sazanami/files/62-fonts-sazanami-ttf.conf
+++ b/japanese/font-sazanami/files/62-fonts-sazanami.conf
diff --git a/japanese/font-sazanami/files/pkg-install.in b/japanese/font-sazanami/files/pkg-install.in
index 957a4baf7298..2abccc27ac7e 100644
--- a/japanese/font-sazanami/files/pkg-install.in
+++ b/japanese/font-sazanami/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
 
 catfontsdir ()
 {
diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist
index a18f0b83fe48..6440878a0cd3 100644
--- a/japanese/font-sazanami/pkg-plist
+++ b/japanese/font-sazanami/pkg-plist
@@ -2,20 +2,20 @@
 %%DATADIR%%/sazanami-mincho.ttf
 %%DATADIR%%/sazanami-gothic.ttf
 @dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/sazanami-mincho.ttf
-%%LOCAL_FONTSDIR%%/TrueType/sazanami-gothic.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/sazanami-mincho.ttf
+%%LOCAL_FONTSDIR%%/TTF/sazanami-gothic.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
 @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
+etc/fonts/conf.avail/20-unhint-sazanami.conf
+etc/fonts/conf.avail/62-fonts-sazanami.conf
+@exec ln -s -f ../conf.avail/20-unhint-sazanami.conf %D/etc/fonts/conf.d/20-unhint-sazanami-ttf.conf
+@exec ln -s -f ../conf.avail/62-fonts-sazanami.conf %D/etc/fonts/conf.d/62-fonts-sazanami-ttf.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-sazanami.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-sazanami.conf
+%%X_FONTSDIR%%/TTF/sazanami-mincho.ttf
+%%X_FONTSDIR%%/TTF/sazanami-gothic.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true; fi