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

7 files changed, 63 insertions, 169 deletions

diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 6b7aea5a8407..a4d360edd81d 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -1,25 +1,21 @@
-# New ports collection makefile for:	IPA TrueType fonts
-# Date created:		18 July 2004
-# Whom:			NAKATA, Maho <maho@FreeBSD.org>
-#
+# New ports collection makefile for:	font-ipa
+# Date created:		26 April 2009
+# Whom:			hrs
 # $FreeBSD$
 #
 
-PORTNAME=	ipa-ttfonts
-PORTVERSION=	1.0.20060520.p1
-PORTREVISION=	2
-PORTEPOCH=	2
+PORTNAME=	font-ipa
+PORTVERSION=	00301
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	hrs
-DISTNAME=	mixfont-mplus-ipa-TrueType-20060520p1
+MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/
+DISTNAME=	IPAfont${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPA Japanese TrueType fonts with M-plus outline font
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_BZIP2=	yes
+USE_ZIP=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -27,39 +23,37 @@ SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS=	Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
-		Mplus-LICENSE_J.txt README.txt
+PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt \
+		Readme${PORTVERSION}.txt
 
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
-	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
-		${DATADIR}
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+	${INSTALL_DATA} ${WRKSRC}/*.otf ${DATADIR}
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF
 	${LN} -s -f \
-		${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
-	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+		${DATADIR}/ipa*.otf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/OTF/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/OTF
 	${LN} -s -f \
-		${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
-		${LOCALBASE}/${X_FONTSDIR}/TrueType/
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
-		${FILESDIR}/62-fonts-ipattfonts.conf \
+		${DATADIR}/ipa*.otf \
+		${LOCALBASE}/${X_FONTSDIR}/OTF/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-ipa.conf \
+		${FILESDIR}/62-fonts-ipa.conf \
 		${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-ipattfonts.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-	${LN} -s -f ../conf.avail/62-fonts-ipattfonts.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-ipattfonts.conf
+	${LN} -s -f ../conf.avail/20-unhint-ipa.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-ipa.conf
+	${LN} -s -f ../conf.avail/62-fonts-ipa.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-ipa.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
-	${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
+	${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/OTF
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/font-ipa/distinfo b/japanese/font-ipa/distinfo
index 5d37643203d8..833f2562c89f 100644
--- a/japanese/font-ipa/distinfo
+++ b/japanese/font-ipa/distinfo
@@ -1,3 +1,3 @@
-MD5 (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = fba1e3d9eed12c364ea56ec18025d826
-SHA256 (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = c1cb93f64c1aa3287078ff7a7afa06d37279af83f7592a64dee669de7dd1f923
-SIZE (mixfont-mplus-ipa-TrueType-20060520p1.tar.bz2) = 16767116
+MD5 (IPAfont00301.zip) = 30507ad52137a0fe9fa29e90c349ff55
+SHA256 (IPAfont00301.zip) = f3df7527dec37e1d8fcd34c5e0b46797372321f4a0ba15b902a145f78bd7e4cc
+SIZE (IPAfont00301.zip) = 10255237
diff --git a/japanese/font-ipa/files/20-unhint-ipattfonts.conf b/japanese/font-ipa/files/20-unhint-ipa.conf
index d5d14d634b35..e64965400774 100644
--- a/japanese/font-ipa/files/20-unhint-ipattfonts.conf
+++ b/japanese/font-ipa/files/20-unhint-ipa.conf
@@ -8,13 +8,6 @@
 			<string>IPAGothic</string>
 			<string>IPAPMincho</string>
 			<string>IPAPGothic</string>
-			<string>IPAUIGothic</string>
-			<family>M+1P+IPAG</family>
-			<family>M+2P+IPAG</family>
-			<family>M+1P+IPAG circle</family>
-			<family>M+2P+IPAG circle</family>
-			<family>M+1VM+IPAG circle</family>
-			<family>M+2VM+IPAG circle</family>
 		</test>
 		<edit name="autohint">
 			<bool>false</bool>
diff --git a/japanese/font-ipa/files/62-fonts-ipattfonts.conf b/japanese/font-ipa/files/62-fonts-ipa.conf
index 6f433bc8d232..e6669158b188 100644
--- a/japanese/font-ipa/files/62-fonts-ipattfonts.conf
+++ b/japanese/font-ipa/files/62-fonts-ipa.conf
@@ -12,11 +12,6 @@
 		<family>sans-serif</family>
 		<prefer>
 			<family>IPAPGothic</family>
-			<family>IPAUIGothic</family>
-			<family>M+1P+IPAG</family>
-			<family>M+2P+IPAG</family>
-			<family>M+1P+IPAG circle</family>
-			<family>M+2P+IPAG circle</family>
 		</prefer>
 	</alias>
 	<alias>
@@ -24,8 +19,6 @@
 		<prefer>
 			<family>IPAGothic</family>
 			<family>IPAMincho</family>
-			<family>M+1VM+IPAG circle</family>
-			<family>M+2VM+IPAG circle</family>
 		</prefer>
 	</alias>
 </fontconfig>
diff --git a/japanese/font-ipa/files/pkg-install.in b/japanese/font-ipa/files/pkg-install.in
index 6a1cdc6f8554..5532f169b572 100644
--- a/japanese/font-ipa/files/pkg-install.in
+++ b/japanese/font-ipa/files/pkg-install.in
@@ -1,13 +1,14 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/OTF
 
 catfontsdir ()
 {
     while read _IN
     do
       case "${_IN}" in
+      *-ipa-IPAUI*|*-ipa-[MU]*)	echo ${_IN} ;;
       *-ipa-*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
@@ -58,22 +59,14 @@ addentries ()
 {
 	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
 	do
-		make_xlfd $ENC ipag.ttf ipa IPAGothic c
-		make_xlfd $ENC ipag.ttf ipa gothic c
-		make_xlfd $ENC ipagp.ttf ipa IPAPGothic p
-		make_xlfd $ENC ipagp.ttf ipa gothic p
-		make_xlfd $ENC ipagui.ttf ipa IPAUIGothic c
-		make_xlfd $ENC ipagui.ttf ipa UIGothic c
-		make_xlfd $ENC ipam.ttf ipa IPAMincho c
-		make_xlfd $ENC ipam.ttf ipa mincho c
-		make_xlfd $ENC ipamp.ttf ipa IPAPMincho p
-		make_xlfd $ENC ipamp.ttf ipa mincho p
-		make_xlfd $ENC M+2VM+IPAG-circle.ttf ipa M+2VM+IPAG_circle c
-		make_xlfd $ENC M+1VM+IPAG-circle.ttf ipa M+1VM+IPAG_circle c
-		make_xlfd $ENC M+1P+IPAG.ttf ipa M+1P+IPAG p
-		make_xlfd $ENC M+1P+IPAG-circle.ttf ipa M+1P+IPAG_circle p
-		make_xlfd $ENC M+2P+IPAG.ttf ipa M+2P+IPAG p
-		make_xlfd $ENC M+2P+IPAG-circle.ttf ipa M+2P+IPAG_circle p
+		make_xlfd $ENC ipag.otf ipa IPAGothic c
+		make_xlfd $ENC ipag.otf ipa gothic c
+		make_xlfd $ENC ipagp.otf ipa IPAPGothic p
+		make_xlfd $ENC ipagp.otf ipa gothic p
+		make_xlfd $ENC ipam.otf ipa IPAMincho c
+		make_xlfd $ENC ipam.otf ipa mincho c
+		make_xlfd $ENC ipamp.otf ipa IPAPMincho p
+		make_xlfd $ENC ipamp.otf ipa mincho p
 	done
 }
 
diff --git a/japanese/font-ipa/pkg-descr b/japanese/font-ipa/pkg-descr
index 6a4e55edc148..da48e72b8067 100644
--- a/japanese/font-ipa/pkg-descr
+++ b/japanese/font-ipa/pkg-descr
@@ -1,5 +1,4 @@
 Japanese TrueType fonts distributed by Infomation-technology Promotion
-Agency (IPA) Japan.  M+ outline font and Bitstream Vera Sans Mono font
-composite versions included.
+Agency (IPA) Japan.
 
-WWW: http://mix-mplus-ipa.sourceforge.jp/
+WWW:	http://ossipedia.ipa.go.jp/ipafont/index.html
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index c759c2934668..42e35c74d8e1 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -1,105 +1,27 @@
 @comment $FreeBSD$
-%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd
-%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd
-%%DATADIR%%/ppd/Makefile.in
-%%DATADIR%%/ppd/Makefile.am
-%%DATADIR%%/opvp/Makefile.in
-%%DATADIR%%/opvp/Makefile.am
-%%DATADIR%%/opvp/HPPageColor.c
-%%DATADIR%%/opfc-ModuleHP.spec
-%%DATADIR%%/mkinstalldirs
-%%DATADIR%%/missing
-%%DATADIR%%/ltmain.sh
-%%DATADIR%%/libopvp/pdapi.h
-%%DATADIR%%/libopvp/opvp_rpc_server.h
-%%DATADIR%%/libopvp/opvp_rpc_server.c
-%%DATADIR%%/libopvp/opvp_rpc_reqno.h
-%%DATADIR%%/libopvp/opvp_rpc_core.h
-%%DATADIR%%/libopvp/opvp_rpc_core.c
-%%DATADIR%%/libopvp/opvp_driver.h
-%%DATADIR%%/libopvp/opvp_common.h
-%%DATADIR%%/libopvp/doc/rpc040223.pdf
-%%DATADIR%%/libopvp/doc/Makefile.in
-%%DATADIR%%/libopvp/doc/Makefile.am
-%%DATADIR%%/libopvp/README.jp
-%%DATADIR%%/libopvp/Makefile.in
-%%DATADIR%%/libopvp/Makefile.am
-%%DATADIR%%/libopvp/COPYING
-%%DATADIR%%/install-sh
-%%DATADIR%%/fonts/ipamp.ttf
-%%DATADIR%%/fonts/ipam.ttf
-%%DATADIR%%/fonts/ipagui.ttf
-%%DATADIR%%/fonts/ipagp.ttf
-%%DATADIR%%/fonts/ipag.ttf
-%%DATADIR%%/fonts/Makefile.in
-%%DATADIR%%/fonts/Makefile.am
-%%DATADIR%%/fonts/M+2VM+IPAG-circle.ttf
-%%DATADIR%%/fonts/M+2P+IPAG.ttf
-%%DATADIR%%/fonts/M+2P+IPAG-circle.ttf
-%%DATADIR%%/fonts/M+1VM+IPAG-circle.ttf
-%%DATADIR%%/fonts/M+1P+IPAG.ttf
-%%DATADIR%%/fonts/M+1P+IPAG-circle.ttf
-%%DATADIR%%/fonts/COPYING.font.ja
-%%DATADIR%%/doc/ProjectOverview.pdf
-%%DATADIR%%/doc/Makefile.in
-%%DATADIR%%/doc/Makefile.am
-%%DATADIR%%/depcomp
-%%DATADIR%%/configure.in
-%%DATADIR%%/configure
-%%DATADIR%%/config.sub
-%%DATADIR%%/config.h.in
-%%DATADIR%%/config.guess
-%%DATADIR%%/compile
-%%DATADIR%%/aclocal.m4
-%%DATADIR%%/VERSION
-%%DATADIR%%/README.jp
-%%DATADIR%%/README
-%%DATADIR%%/NEWS
-%%DATADIR%%/Makefile.in
-%%DATADIR%%/Makefile.am
-%%DATADIR%%/INSTALL
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/COPYING
-%%DATADIR%%/AUTHORS
-@dirrm %%DATADIR%%/ppd
-@dirrm %%DATADIR%%/opvp
-@dirrm %%DATADIR%%/libopvp/doc
-@dirrm %%DATADIR%%/libopvp
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/doc
+%%DATADIR%%/ipamp.otf
+%%DATADIR%%/ipam.otf
+%%DATADIR%%/ipagp.otf
+%%DATADIR%%/ipag.otf
 @dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-%%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+%%LOCAL_FONTSDIR%%/OTF/ipag.otf
+%%LOCAL_FONTSDIR%%/OTF/ipagp.otf
+%%LOCAL_FONTSDIR%%/OTF/ipam.otf
+%%LOCAL_FONTSDIR%%/OTF/ipamp.otf
+@dirrmtry %%LOCAL_FONTSDIR%%/OTF
 @dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.avail/20-unhint-ipattfonts.conf
-etc/fonts/conf.avail/62-fonts-ipattfonts.conf
-@exec ln -s -f ../conf.avail/20-unhint-ipattfonts.conf %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@exec ln -s -f ../conf.avail/62-fonts-ipattfonts.conf %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
-@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
-%%X_FONTSDIR%%/TrueType/ipag.ttf
-%%X_FONTSDIR%%/TrueType/ipagp.ttf
-%%X_FONTSDIR%%/TrueType/ipagui.ttf
-%%X_FONTSDIR%%/TrueType/ipam.ttf
-%%X_FONTSDIR%%/TrueType/ipamp.ttf
-%%X_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
-%%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.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-ipa.conf
+etc/fonts/conf.avail/62-fonts-ipa.conf
+@exec ln -s -f ../conf.avail/20-unhint-ipa.conf %D/etc/fonts/conf.d/20-unhint-ipat.conf
+@exec ln -s -f ../conf.avail/62-fonts-ipa.conf %D/etc/fonts/conf.d/62-fonts-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipa.conf
+%%X_FONTSDIR%%/OTF/ipag.otf
+%%X_FONTSDIR%%/OTF/ipagp.otf
+%%X_FONTSDIR%%/OTF/ipam.otf
+%%X_FONTSDIR%%/OTF/ipamp.otf
+@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/OTF || true
+@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/OTF || true
+@unexec rm -f %D/%%X_FONTSDIR%%/OTF/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/OTF
+@unexec if [ -d %D/%%X_FONTSDIR%%/OTF ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/OTF || true; fi