6 files changed, 48 insertions, 81 deletions

diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 6b7aea5a8407..5ffe0034af8c 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -1,21 +1,19 @@
-# 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-mplus-ipa fonts
+# Date created:		26 April 2009
+# Whom:			hrs
 #
 # $FreeBSD$
 #
 
-PORTNAME=	ipa-ttfonts
+PORTNAME=	font-mplus-ipa
 PORTVERSION=	1.0.20060520.p1
-PORTREVISION=	2
-PORTEPOCH=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
 DISTNAME=	mixfont-mplus-ipa-TrueType-20060520p1
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	IPA Japanese TrueType fonts with M-plus outline font
+COMMENT=	Mixed Japanese font with IPA, M-plus outline, and Bitstream Vera
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
@@ -38,28 +36,26 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
 	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
 		${DATADIR}
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
-	${LN} -s -f \
-		${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
-	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
-	${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 \
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
+	${LN} -s -f ${DATADIR}/fonts/M+*.ttf ${DATADIR}/fonts/ipagui.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+	${LN} -s -f ${DATADIR}/fonts/M+*.ttf ${DATADIR}/fonts/ipagui.ttf \
+			${LOCALBASE}/${X_FONTSDIR}/TTF/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus-ipa.conf \
+		${FILESDIR}/62-fonts-mplus-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-mplus-ipa.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
+	${LN} -s -f ../conf.avail/62-fonts-mplus-ipa.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-mplus-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 -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-mplus-ipa/files/20-unhint-ipattfonts.conf b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
index d5d14d634b35..1a1142a6f107 100644
--- a/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf
+++ b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
@@ -4,10 +4,6 @@
 <fontconfig>
 	<match target="font">
 		<test name="family">
-			<string>IPAMincho</string>
-			<string>IPAGothic</string>
-			<string>IPAPMincho</string>
-			<string>IPAPGothic</string>
 			<string>IPAUIGothic</string>
 			<family>M+1P+IPAG</family>
 			<family>M+2P+IPAG</family>
diff --git a/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
index 6f433bc8d232..1c0bb82ef3d8 100644
--- a/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf
+++ b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
@@ -3,15 +3,8 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>IPAPMincho</family>
-		</prefer>
-	</alias>
-	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>IPAPGothic</family>
 			<family>IPAUIGothic</family>
 			<family>M+1P+IPAG</family>
 			<family>M+2P+IPAG</family>
@@ -22,8 +15,6 @@
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>IPAGothic</family>
-			<family>IPAMincho</family>
 			<family>M+1VM+IPAG circle</family>
 			<family>M+2VM+IPAG circle</family>
 		</prefer>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index 6a1cdc6f8554..2f9a85233b1f 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,14 +1,14 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
 
 catfontsdir ()
 {
     while read _IN
     do
       case "${_IN}" in
-      *-ipa-*|[0-9]*|"") ;;
+      *-ipa-[MU]*|*-ipa-IPAUI*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
     done
@@ -58,16 +58,8 @@ 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
diff --git a/japanese/font-mplus-ipa/pkg-descr b/japanese/font-mplus-ipa/pkg-descr
index 6a4e55edc148..bdf364f64ab8 100644
--- a/japanese/font-mplus-ipa/pkg-descr
+++ b/japanese/font-mplus-ipa/pkg-descr
@@ -1,5 +1,5 @@
+This package includes a mixed font consisting of an old version of
 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, M+ outline font, and Bitstream Vera Sans Mono font.
 
 WWW: http://mix-mplus-ipa.sourceforge.jp/
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index c759c2934668..e11428640188 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -68,38 +68,30 @@
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/doc
 @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%%/TTF/ipagui.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG-circle.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
 @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-mplus-ipa.conf
+etc/fonts/conf.avail/62-fonts-mplus-ipa.conf
+@exec ln -s -f ../conf.avail/20-unhint-mplus-ipa.conf %D/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
+@exec ln -s -f ../conf.avail/62-fonts-mplus-ipa.conf %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
+%%X_FONTSDIR%%/TTF/ipagui.ttf
+%%X_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/TTF/M+2P+IPAG.ttf
+%%X_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
+%%X_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/TTF/M+1P+IPAG.ttf
+%%X_FONTSDIR%%/TTF/M+1P+IPAG-circle.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