Update to 20110514. M+ TESTFLIGHT 039 + IPA Gothic 003.03.

4 files changed, 57 insertions, 48 deletions

diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 71249bc5bdf6..dce002a4fdfd 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	font-migmix
-PORTVERSION=	1.0.20100626
+PORTVERSION=	1.0.20110514
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	mix-mplus-ipa/48024
-DISTFILES=	MigMix-1P-1M-20100626${EXTRACT_SUFX} \
-		MigMix-2P-2M-20100626${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	mix-mplus-ipa/51977
+DISTFILES=	MigMix-1M-20110514${EXTRACT_SUFX} \
+		MigMix-2M-20110514${EXTRACT_SUFX} \
+		MigMix-1P-20110514${EXTRACT_SUFX} \
+		MigMix-2P-20110514${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mixed Japanese font with IPA Gothic and M-plus outline
@@ -26,21 +28,24 @@ SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt Readme_IPAfont00302.txt \
-		README_E README_J LICENSE_E LICENSE_J README.txt
+PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
+		README_E README_J LICENSE_E LICENSE_J MigMix-README.txt
 
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
 do-install:
-	cd ${WRKDIR}/MigMix-1P-1M-20100626/ && \
-		${INSTALL_DATA} IPAfont00302/*.txt \
-			mplus-TESTFLIGHT-030/* \
-			README.txt \
+	cd ${WRKDIR}/MigMix-1M-20110514/ && \
+		${INSTALL_DATA} ipag00303/*.txt \
+			mplus-TESTFLIGHT-039/* \
+			MigMix-README.txt \
 			${WRKDIR}
 	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/MigMix-1P-1M-20100626/*.ttf \
-		${WRKDIR}/MigMix-2P-2M-20100626/*.ttf \
+	${INSTALL_DATA} \
+		${WRKDIR}/MigMix-1M-20110514/*.ttf \
+		${WRKDIR}/MigMix-2M-20110514/*.ttf \
+		${WRKDIR}/MigMix-1P-20110514/*.ttf \
+		${WRKDIR}/MigMix-2P-20110514/*.ttf \
 		${DATADIR}
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/MigMix*.ttf \
diff --git a/japanese/font-migmix/distinfo b/japanese/font-migmix/distinfo
index 5d8c5bd1b6ff..484165a73909 100644
--- a/japanese/font-migmix/distinfo
+++ b/japanese/font-migmix/distinfo
@@ -1,4 +1,8 @@
-SHA256 (MigMix-1P-1M-20100626.zip) = 444f49d6ddfee3a10d1fca48e988d7df661f49713642e299d4bfb38f1004f443
-SIZE (MigMix-1P-1M-20100626.zip) = 12448485
-SHA256 (MigMix-2P-2M-20100626.zip) = 4c24b4ee18a36fd41de3986c7b7af69fde6fb5eee43b0ddcd24c187901a95f35
-SIZE (MigMix-2P-2M-20100626.zip) = 12448872
+SHA256 (MigMix-1M-20110514.zip) = b2bf5c1abfe5683c7acaa409246a4284aa688e5fe883072ca7dc4d5e5a01921c
+SIZE (MigMix-1M-20110514.zip) = 4246331
+SHA256 (MigMix-2M-20110514.zip) = 4f0940aa5f66a8867ff042effebdea64760fd82a2af30beb20751efdfbe4052c
+SIZE (MigMix-2M-20110514.zip) = 4245919
+SHA256 (MigMix-1P-20110514.zip) = 78485ed34a9b44cb406f973ba35f7969534f5087433fab043746b1ce1971d286
+SIZE (MigMix-1P-20110514.zip) = 4337562
+SHA256 (MigMix-2P-20110514.zip) = 411b3eb7a13513ed225c62a63859c3aec74c66677202e9d707c0fe6d13b85d92
+SIZE (MigMix-2P-20110514.zip) = 4339442
diff --git a/japanese/font-migmix/files/pkg-install.in b/japanese/font-migmix/files/pkg-install.in
index b3308487f1b5..5b4706dc756e 100644
--- a/japanese/font-migmix/files/pkg-install.in
+++ b/japanese/font-migmix/files/pkg-install.in
@@ -71,14 +71,14 @@ addentries ()
 {
 	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
 	do
-		make_xlfd $ENC MigMix-1M-Bold.ttf ipa "migmix 1m" c bold
-		make_xlfd $ENC MigMix-1M-Regular.ttf ipa "migmix 1m" c medium
-		make_xlfd $ENC MigMix-1P-Bold.ttf ipa "migmix 1p" p bold
-		make_xlfd $ENC MigMix-1P-Regular.ttf ipa "migmix 1p" p medium
-		make_xlfd $ENC MigMix-2M-Bold.ttf ipa "migmix 2m" c bold
-		make_xlfd $ENC MigMix-2M-Regular.ttf ipa "migmix 2m" c medium
-		make_xlfd $ENC MigMix-2P-Bold.ttf ipa "migmix 2p" p bold
-		make_xlfd $ENC MigMix-2P-Regular.ttf ipa "migmix 2p" p medium
+		make_xlfd $ENC MigMix-1M-bold.ttf ipa "migmix 1m" c bold
+		make_xlfd $ENC MigMix-1M-regular.ttf ipa "migmix 1m" c medium
+		make_xlfd $ENC MigMix-1P-bold.ttf ipa "migmix 1p" p bold
+		make_xlfd $ENC MigMix-1P-regular.ttf ipa "migmix 1p" p medium
+		make_xlfd $ENC MigMix-2M-bold.ttf ipa "migmix 2m" c bold
+		make_xlfd $ENC MigMix-2M-regular.ttf ipa "migmix 2m" c medium
+		make_xlfd $ENC MigMix-2P-bold.ttf ipa "migmix 2p" p bold
+		make_xlfd $ENC MigMix-2P-regular.ttf ipa "migmix 2p" p medium
 	done
 }
 
diff --git a/japanese/font-migmix/pkg-plist b/japanese/font-migmix/pkg-plist
index 08491c76c487..a8bc280a89f1 100644
--- a/japanese/font-migmix/pkg-plist
+++ b/japanese/font-migmix/pkg-plist
@@ -1,35 +1,35 @@
 @comment $FreeBSD$
-%%DATADIR%%/MigMix-1M-Bold.ttf
-%%DATADIR%%/MigMix-1M-Regular.ttf
-%%DATADIR%%/MigMix-1P-Bold.ttf
-%%DATADIR%%/MigMix-1P-Regular.ttf
-%%DATADIR%%/MigMix-2M-Bold.ttf
-%%DATADIR%%/MigMix-2M-Regular.ttf
-%%DATADIR%%/MigMix-2P-Bold.ttf
-%%DATADIR%%/MigMix-2P-Regular.ttf
+%%DATADIR%%/MigMix-1M-bold.ttf
+%%DATADIR%%/MigMix-1M-regular.ttf
+%%DATADIR%%/MigMix-1P-bold.ttf
+%%DATADIR%%/MigMix-1P-regular.ttf
+%%DATADIR%%/MigMix-2M-bold.ttf
+%%DATADIR%%/MigMix-2M-regular.ttf
+%%DATADIR%%/MigMix-2P-bold.ttf
+%%DATADIR%%/MigMix-2P-regular.ttf
 @dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TTF/MigMix-1M-Bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/MigMix-1M-Regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/MigMix-1P-Bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/MigMix-1P-Regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/MigMix-2M-Bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/MigMix-2M-Regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/MigMix-2P-Bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/MigMix-2P-Regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-1M-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-1M-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-1P-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-1P-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-2M-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-2M-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-2P-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/MigMix-2P-regular.ttf
 @dirrmtry %%LOCAL_FONTSDIR%%/TTF
 @dirrmtry %%LOCAL_FONTSDIR%%
 etc/fonts/conf.avail/20-unhint-migmix.conf
 etc/fonts/conf.avail/62-fonts-migmix.conf
 etc/fonts/conf.d/20-unhint-migmix.conf
 etc/fonts/conf.d/62-fonts-migmix.conf
-%%X_FONTSDIR%%/TTF/MigMix-1M-Bold.ttf
-%%X_FONTSDIR%%/TTF/MigMix-1M-Regular.ttf
-%%X_FONTSDIR%%/TTF/MigMix-1P-Bold.ttf
-%%X_FONTSDIR%%/TTF/MigMix-1P-Regular.ttf
-%%X_FONTSDIR%%/TTF/MigMix-2M-Bold.ttf
-%%X_FONTSDIR%%/TTF/MigMix-2M-Regular.ttf
-%%X_FONTSDIR%%/TTF/MigMix-2P-Bold.ttf
-%%X_FONTSDIR%%/TTF/MigMix-2P-Regular.ttf
+%%X_FONTSDIR%%/TTF/MigMix-1M-bold.ttf
+%%X_FONTSDIR%%/TTF/MigMix-1M-regular.ttf
+%%X_FONTSDIR%%/TTF/MigMix-1P-bold.ttf
+%%X_FONTSDIR%%/TTF/MigMix-1P-regular.ttf
+%%X_FONTSDIR%%/TTF/MigMix-2M-bold.ttf
+%%X_FONTSDIR%%/TTF/MigMix-2M-regular.ttf
+%%X_FONTSDIR%%/TTF/MigMix-2P-bold.ttf
+%%X_FONTSDIR%%/TTF/MigMix-2P-regular.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