6 files changed, 21 insertions, 6 deletions

diff --git a/japanese/font-takao/Makefile b/japanese/font-takao/Makefile
index cdf50ef025e7..233a4db7b4bc 100644
--- a/japanese/font-takao/Makefile
+++ b/japanese/font-takao/Makefile
@@ -5,10 +5,10 @@
 #
 
 PORTNAME=	font-takao
-PORTVERSION=	003.01.20100214.1
+PORTVERSION=	003.02.01
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://launchpadlibrarian.net/39193744/
-DISTNAME=	takao-fonts-otf-${PORTVERSION}
+MASTER_SITES=	http://launchpadlibrarian.net/40218948/
+DISTNAME=	takao-fonts-ttf-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	An improved IPA Japanese fonts
@@ -30,6 +30,9 @@ PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt \
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
+post-extract:
+	cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.otf ${DATADIR}
diff --git a/japanese/font-takao/distinfo b/japanese/font-takao/distinfo
index 1b5d76176073..552344473567 100644
--- a/japanese/font-takao/distinfo
+++ b/japanese/font-takao/distinfo
@@ -1,3 +1,3 @@
-MD5 (takao-fonts-otf-003.01.20100214.1.tar.gz) = 0ddeac06eb9576b2d99a1fc7240cf71c
-SHA256 (takao-fonts-otf-003.01.20100214.1.tar.gz) = 8450b84fb784e96c5d28ac7bd44514dad1fc968c8156b57b06ec91530f65a71a
-SIZE (takao-fonts-otf-003.01.20100214.1.tar.gz) = 10178591
+MD5 (takao-fonts-ttf-003.02.01.tar.gz) = 3cdbdd60744bd2a359fadcb5144e2d48
+SHA256 (takao-fonts-ttf-003.02.01.tar.gz) = d8ef67e2bdad6c8f420b8e9ec7cdc5c47d9731cbb78164af43aec5d56d8f24f1
+SIZE (takao-fonts-ttf-003.02.01.tar.gz) = 29678930
diff --git a/japanese/font-takao/files/20-unhint-takao.conf b/japanese/font-takao/files/20-unhint-takao.conf
index 13dcc73edcdb..19d5e83c2ded 100644
--- a/japanese/font-takao/files/20-unhint-takao.conf
+++ b/japanese/font-takao/files/20-unhint-takao.conf
@@ -8,6 +8,8 @@
 			<string>TakaoGothic</string>
 			<string>TakaoPMincho</string>
 			<string>TakaoPGothic</string>
+			<string>TakaoExMincho</string>
+			<string>TakaoExGothic</string>
 		</test>
 		<edit name="autohint">
 			<bool>false</bool>
diff --git a/japanese/font-takao/files/62-fonts-takao.conf b/japanese/font-takao/files/62-fonts-takao.conf
index d92a02c78270..6eb879d9d872 100644
--- a/japanese/font-takao/files/62-fonts-takao.conf
+++ b/japanese/font-takao/files/62-fonts-takao.conf
@@ -6,12 +6,14 @@
 		<family>serif</family>
 		<prefer>
 			<family>TakaoPMincho</family>
+			<family>TakaoExMincho</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
 			<family>TakaoPGothic</family>
+			<family>TakaoExGothic</family>
 		</prefer>
 	</alias>
 	<alias>
diff --git a/japanese/font-takao/files/pkg-install.in b/japanese/font-takao/files/pkg-install.in
index a9cca0a92123..f2ccc314072a 100644
--- a/japanese/font-takao/files/pkg-install.in
+++ b/japanese/font-takao/files/pkg-install.in
@@ -61,9 +61,11 @@ addentries ()
 		make_xlfd $ENC TakaoGothic.otf ipa TakaoGothic c
 		make_xlfd $ENC TakaoPGothic.otf ipa TakaoPGothic p
 		make_xlfd $ENC TakaoPGothic.otf ipa TakaoGothic p
+		make_xlfd $ENC TakaoExGothic.otf ipa TakaoExGothic p
 		make_xlfd $ENC TakaoMincho.otf ipa TakaoMincho c
 		make_xlfd $ENC TakaoPMincho.otf ipa TakaoPMincho p
 		make_xlfd $ENC TakaoPMincho.otf ipa TakaoMincho p
+		make_xlfd $ENC TakaoExMincho.otf ipa TakaoExMincho p
 	done
 }
 
diff --git a/japanese/font-takao/pkg-plist b/japanese/font-takao/pkg-plist
index f7f9d2cfb05f..7a2daa3bfc39 100644
--- a/japanese/font-takao/pkg-plist
+++ b/japanese/font-takao/pkg-plist
@@ -1,13 +1,17 @@
 @comment $FreeBSD$
 %%DATADIR%%/TakaoPMincho.otf
 %%DATADIR%%/TakaoMincho.otf
+%%DATADIR%%/TakaoExMincho.otf
 %%DATADIR%%/TakaoPGothic.otf
 %%DATADIR%%/TakaoGothic.otf
+%%DATADIR%%/TakaoExGothic.otf
 @dirrm %%DATADIR%%
 %%LOCAL_FONTSDIR%%/OTF/TakaoGothic.otf
 %%LOCAL_FONTSDIR%%/OTF/TakaoPGothic.otf
+%%LOCAL_FONTSDIR%%/OTF/TakaoExGothic.otf
 %%LOCAL_FONTSDIR%%/OTF/TakaoMincho.otf
 %%LOCAL_FONTSDIR%%/OTF/TakaoPMincho.otf
+%%LOCAL_FONTSDIR%%/OTF/TakaoExMincho.otf
 @dirrmtry %%LOCAL_FONTSDIR%%/OTF
 @dirrmtry %%LOCAL_FONTSDIR%%
 etc/fonts/conf.avail/20-unhint-takao.conf
@@ -18,8 +22,10 @@ etc/fonts/conf.avail/62-fonts-takao.conf
 @unexec rm -f %D/etc/fonts/conf.d/62-fonts-takao.conf
 %%X_FONTSDIR%%/OTF/TakaoGothic.otf
 %%X_FONTSDIR%%/OTF/TakaoPGothic.otf
+%%X_FONTSDIR%%/OTF/TakaoExGothic.otf
 %%X_FONTSDIR%%/OTF/TakaoMincho.otf
 %%X_FONTSDIR%%/OTF/TakaoPMincho.otf
+%%X_FONTSDIR%%/OTF/TakaoExMincho.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