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".

5 files changed, 52 insertions, 53 deletions

diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index 342b8172d11e..191caa4fa16d 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	umefont
+PORTNAME=	font-ume
 PORTVERSION=	0.0.401
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	ume-font/22212
-DISTNAME=	${PORTNAME}-401
+DISTNAME=	umefont-401
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Ume Font, A Free Japanese TrueType font
+COMMENT=	Ume Japanese TrueType fonts
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
@@ -31,28 +31,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-umefont.conf \
-		${FILESDIR}/62-fonts-umefont.conf \
+		${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-ume.conf \
+		${FILESDIR}/62-fonts-ume.conf \
 		${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-umefont.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-umefont.conf
-	${LN} -s -f ../conf.avail/62-fonts-umefont.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-umefont.conf
+	${LN} -s -f ../conf.avail/20-unhint-ume.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-ume.conf
+	${LN} -s -f ../conf.avail/62-fonts-ume.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-ume.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${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-ume/files/20-unhint-umefont.conf b/japanese/font-ume/files/20-unhint-ume.conf
index 54b9796d27db..54b9796d27db 100644
--- a/japanese/font-ume/files/20-unhint-umefont.conf
+++ b/japanese/font-ume/files/20-unhint-ume.conf
diff --git a/japanese/font-ume/files/62-fonts-umefont.conf b/japanese/font-ume/files/62-fonts-ume.conf
index a9a6feaf2365..a9a6feaf2365 100644
--- a/japanese/font-ume/files/62-fonts-umefont.conf
+++ b/japanese/font-ume/files/62-fonts-ume.conf
diff --git a/japanese/font-ume/files/pkg-install.in b/japanese/font-ume/files/pkg-install.in
index 524cbf6befa7..ae681a45ad70 100644
--- a/japanese/font-ume/files/pkg-install.in
+++ b/japanese/font-ume/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-ume/pkg-plist b/japanese/font-ume/pkg-plist
index 2a02c72f553f..14788fa52ab2 100644
--- a/japanese/font-ume/pkg-plist
+++ b/japanese/font-ume/pkg-plist
@@ -12,40 +12,40 @@
 %%DATADIR%%/ume-ugo4.ttf
 %%DATADIR%%/ume-ugo5.ttf
 @dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgc4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgc5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pgo5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-pmo3.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgc4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgc5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tgo5.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-tmo3.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-ugo4.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ume-ugo5.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/TTF/ume-pgc4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgc5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgo4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgo5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pmo3.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgc4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgc5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgo4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgo5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tmo3.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-ugo4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-ugo5.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
 @dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-umefont.conf
-etc/fonts/conf.avail/62-fonts-umefont.conf
-@exec ln -s -f ../conf.avail/20-unhint-umefont.conf %D/etc/fonts/conf.d/20-unhint-umefont.conf
-@exec ln -s -f ../conf.avail/62-fonts-umefont.conf %D/etc/fonts/conf.d/62-fonts-umefont.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-umefont.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-umefont.conf
-%%X_FONTSDIR%%/TrueType/ume-pgc4.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgc5.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-pgo5.ttf
-%%X_FONTSDIR%%/TrueType/ume-pmo3.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgc4.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgc5.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-tgo5.ttf
-%%X_FONTSDIR%%/TrueType/ume-tmo3.ttf
-%%X_FONTSDIR%%/TrueType/ume-ugo4.ttf
-%%X_FONTSDIR%%/TrueType/ume-ugo5.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-ume.conf
+etc/fonts/conf.avail/62-fonts-ume.conf
+@exec ln -s -f ../conf.avail/20-unhint-ume.conf %D/etc/fonts/conf.d/20-unhint-ume.conf
+@exec ln -s -f ../conf.avail/62-fonts-ume.conf %D/etc/fonts/conf.d/62-fonts-ume.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ume.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ume.conf
+%%X_FONTSDIR%%/TTF/ume-pgc4.ttf
+%%X_FONTSDIR%%/TTF/ume-pgc5.ttf
+%%X_FONTSDIR%%/TTF/ume-pgo4.ttf
+%%X_FONTSDIR%%/TTF/ume-pgo5.ttf
+%%X_FONTSDIR%%/TTF/ume-pmo3.ttf
+%%X_FONTSDIR%%/TTF/ume-tgc4.ttf
+%%X_FONTSDIR%%/TTF/ume-tgc5.ttf
+%%X_FONTSDIR%%/TTF/ume-tgo4.ttf
+%%X_FONTSDIR%%/TTF/ume-tgo5.ttf
+%%X_FONTSDIR%%/TTF/ume-tmo3.ttf
+%%X_FONTSDIR%%/TTF/ume-ugo4.ttf
+%%X_FONTSDIR%%/TTF/ume-ugo5.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