Ports for Japanese fonts have been reorganized in the following way:

japanese/ipa-ttfonts -> japanese/font-mplus-ipa
japanese/ipa-ttfonts -> japanese/font-ipa
japanese/kochi-ttfonts -> japanese/font-kochi
japanese/mplusfonts -> japanese/font-mplus
japanese/sazanami-ttf -> japanese/font-sazanami
japanese/shinonome -> japanese/font-shinonome
japanese/umefont -> japanese/font-ume
japanese/vlgothic -> japanese/font-vlgothic

While basically these are port name changes for consistency,
installation directories are also changed:

font files -> ${PREFIX}/share/${PORTNAME}/*
symlinks -> ${PREFIX}/share/fonts/{TTF,OTF,fontname,...}/*
symlinks -> ${PREFIX}/lib/X11/fonts/{TTF,OTF,misc,fontname,...}/*

A user-visible one is that the directory name "TrueType" is replaced
with "TTF".

6 files changed, 32 insertions, 35 deletions

diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index d9889af7e169..b0e27728b581 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -5,22 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	kochi-ttfonts
+PORTNAME=	font-kochi
 PORTVERSION=	20030809
-PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://downloads.sourceforge.jp/efont/5411/ \
 		${MASTER_SITE_PORTS_JP}
-DISTFILES=	kochi-substitute-${PORTVERSION}.tar.bz2
+DISTNAME=	kochi-substitute-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Free Japanese TrueType fonts named 'Kochi'
+COMMENT=	Kochi Japanese TrueType font
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
-
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
@@ -37,28 +35,27 @@ PORTDOCS=	README.ja COPYING docs
 
 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-kochittfonts.conf \
-		${FILESDIR}/62-fonts-kochittfonts.conf \
+		${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-kochi.conf \
+		${FILESDIR}/62-fonts-kochi.conf \
 		${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-kochittfonts.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-kochittfonts.conf
-	${LN} -s -f ../conf.avail/62-fonts-kochittfonts.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-kochittfonts.conf
+	${LN} -s -f ../conf.avail/20-unhint-kochi.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-kochi.conf
+	${LN} -s -f ../conf.avail/62-fonts-kochi.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-kochi.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-kochi/files/20-unhint-kochittfonts.conf b/japanese/font-kochi/files/20-unhint-kochi.conf
index 262064b7132d..262064b7132d 100644
--- a/japanese/font-kochi/files/20-unhint-kochittfonts.conf
+++ b/japanese/font-kochi/files/20-unhint-kochi.conf
diff --git a/japanese/font-kochi/files/62-fonts-kochittfonts.conf b/japanese/font-kochi/files/62-fonts-kochi.conf
index 99f3ff0746bc..99f3ff0746bc 100644
--- a/japanese/font-kochi/files/62-fonts-kochittfonts.conf
+++ b/japanese/font-kochi/files/62-fonts-kochi.conf
diff --git a/japanese/font-kochi/files/pkg-install.in b/japanese/font-kochi/files/pkg-install.in
index e054af6696b9..97ab380f2c71 100644
--- a/japanese/font-kochi/files/pkg-install.in
+++ b/japanese/font-kochi/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-kochi/pkg-descr b/japanese/font-kochi/pkg-descr
index ef9292d08935..e9231235661d 100644
--- a/japanese/font-kochi/pkg-descr
+++ b/japanese/font-kochi/pkg-descr
@@ -1,3 +1,3 @@
 Free Japanese TrueType fonts named 'Kochi Mincho' and 'Kochi Gothic'. 
 
-WWW: http://www.on.cs.keio.ac.jp/~yasu/jp_fonts.html
+WWW:	http://wiki.fdiary.net/font/?kochi-alternative
diff --git a/japanese/font-kochi/pkg-plist b/japanese/font-kochi/pkg-plist
index abe8bc150fad..5bcd6a9bdd4c 100644
--- a/japanese/font-kochi/pkg-plist
+++ b/japanese/font-kochi/pkg-plist
@@ -2,20 +2,20 @@
 %%DATADIR%%/kochi-mincho-subst.ttf
 %%DATADIR%%/kochi-gothic-subst.ttf
 @dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
-%%LOCAL_FONTSDIR%%/TrueType/kochi-gothic-subst.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/kochi-mincho-subst.ttf
+%%LOCAL_FONTSDIR%%/TTF/kochi-gothic-subst.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
 @dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-kochittfonts.conf
-etc/fonts/conf.avail/62-fonts-kochittfonts.conf
-@exec ln -s -f ../conf.avail/20-unhint-kochittfonts.conf %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
-@exec ln -s -f ../conf.avail/62-fonts-kochittfonts.conf %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
-%%X_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
-%%X_FONTSDIR%%/TrueType/kochi-gothic-subst.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-kochi.conf
+etc/fonts/conf.avail/62-fonts-kochi.conf
+@exec ln -s -f ../conf.avail/20-unhint-kochi.conf %D/etc/fonts/conf.d/20-unhint-kochi.conf
+@exec ln -s -f ../conf.avail/62-fonts-kochi.conf %D/etc/fonts/conf.d/62-fonts-kochi.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-kochi.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-kochi.conf
+%%X_FONTSDIR%%/TTF/kochi-mincho-subst.ttf
+%%X_FONTSDIR%%/TTF/kochi-gothic-subst.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