Update to 20120411-2.

6 files changed, 21 insertions, 50 deletions

diff --git a/japanese/font-migu/Makefile b/japanese/font-migu/Makefile
index 32efb5f94d22..fe976e4c24ff 100644
--- a/japanese/font-migu/Makefile
+++ b/japanese/font-migu/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	font-migu
-PORTVERSION=	1.0.20111002
+PORTVERSION=	1.0.20120411
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	mix-mplus-ipa/53389
-DISTFILES=	migu-1p-20111002${EXTRACT_SUFX} \
-		migu-1c-20111002${EXTRACT_SUFX} \
-		migu-1m-20111002${EXTRACT_SUFX} \
-		migu-2m-20111002${EXTRACT_SUFX} \
-		migu-1vs-20111002${EXTRACT_SUFX} \
-		migu-2ds-20111002${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	mix-mplus-ipa/56156
+DISTFILES=	migu-1p-20120411-2${EXTRACT_SUFX} \
+		migu-1c-20120411-2${EXTRACT_SUFX} \
+		migu-1m-20120411-2${EXTRACT_SUFX} \
+		migu-2m-20120411-2${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Another Japanese font set based on MigMix
@@ -31,25 +29,23 @@ 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_ipag00303.txt \
-		README_E README_J LICENSE_E LICENSE_J migu-README.txt
+		README_E README_J migu-README.txt
 
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
 do-install:
-	cd ${WRKDIR}/migu-1p-20111002/ && \
+	cd ${WRKDIR}/migu-1p-20120411-2/ && \
 		${INSTALL_DATA} ipag00303/*.txt \
-			mplus-TESTFLIGHT-043/* \
+			mplus-TESTFLIGHT-048/* \
 			migu-README.txt \
 			${WRKDIR}
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} \
-		${WRKDIR}/migu-1p-20111002/*.ttf \
-		${WRKDIR}/migu-1c-20111002/*.ttf \
-		${WRKDIR}/migu-1m-20111002/*.ttf \
-		${WRKDIR}/migu-2m-20111002/*.ttf \
-		${WRKDIR}/migu-1vs-20111002/*.ttf \
-		${WRKDIR}/migu-2ds-20111002/*.ttf \
+		${WRKDIR}/migu-1p-20120411-2/*.ttf \
+		${WRKDIR}/migu-1c-20120411-2/*.ttf \
+		${WRKDIR}/migu-1m-20120411-2/*.ttf \
+		${WRKDIR}/migu-2m-20120411-2/*.ttf \
 		${DATADIR}
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/migu*.ttf \
diff --git a/japanese/font-migu/distinfo b/japanese/font-migu/distinfo
index 4e60c299e312..f9894fcbdde9 100644
--- a/japanese/font-migu/distinfo
+++ b/japanese/font-migu/distinfo
@@ -1,12 +1,8 @@
-SHA256 (migu-1p-20111002.zip) = b87d8ca914817c9af0c0550aafa814420eea92e539ad2c2671a50ead0419ab59
-SIZE (migu-1p-20111002.zip) = 4428331
-SHA256 (migu-1c-20111002.zip) = 95c4e2749794e0c4420e5dbd5ab7f6af927fb9e5c71b74ed717f546e14a6e65c
-SIZE (migu-1c-20111002.zip) = 4436245
-SHA256 (migu-1m-20111002.zip) = 347f987bd13591368e3af57735d19ff12b2e82eca9b142c07f76a84bab0a0395
-SIZE (migu-1m-20111002.zip) = 4334677
-SHA256 (migu-2m-20111002.zip) = d39cab84a5d9efb078b76a0608f7c4852d685591fa64654319f1a01fb01b85f8
-SIZE (migu-2m-20111002.zip) = 4332395
-SHA256 (migu-1vs-20111002.zip) = eb1e1762a2b2a5c6053204411e33348036f4a5a84f019bfbe72f00d26c75879e
-SIZE (migu-1vs-20111002.zip) = 4835445
-SHA256 (migu-2ds-20111002.zip) = 9d5dda971c7d62f477297f821f6be1b9dead525d7eed3203e8808c39281f4cb5
-SIZE (migu-2ds-20111002.zip) = 4647100
+SHA256 (migu-1p-20120411-2.zip) = eed439be7a5414080e5bd692ea85120afe2506e51db056db8178ea0955b2b76d
+SIZE (migu-1p-20120411-2.zip) = 4419857
+SHA256 (migu-1c-20120411-2.zip) = fe1083b085fbc732ea92c798cbb2ac0ab5ecd8c6ff6f002744f8604cedecfca7
+SIZE (migu-1c-20120411-2.zip) = 4428093
+SHA256 (migu-1m-20120411-2.zip) = 4d9f97decdf0e16c9ab2924f42025b625dc5bcd76292fb27a0d8aeab128a0bdd
+SIZE (migu-1m-20120411-2.zip) = 4326597
+SHA256 (migu-2m-20120411-2.zip) = ef5224ea5978605919fa56155b89b1f84f9d6251062652c40ff066b341dd1391
+SIZE (migu-2m-20120411-2.zip) = 4324280
diff --git a/japanese/font-migu/files/20-unhint-migu.conf b/japanese/font-migu/files/20-unhint-migu.conf
index 99c71d29d65b..c427a8f62edc 100644
--- a/japanese/font-migu/files/20-unhint-migu.conf
+++ b/japanese/font-migu/files/20-unhint-migu.conf
@@ -8,8 +8,6 @@
 			<string>Migu 1P</string>
 			<string>Migu 1M</string>
 			<string>Migu 2M</string>
-			<string>Migu 1VS</string>
-			<string>Migu 2DS</string>
 		</test>
 		<edit name="autohint">
 			<bool>false</bool>
diff --git a/japanese/font-migu/files/62-fonts-migu.conf b/japanese/font-migu/files/62-fonts-migu.conf
index a5e279ce890b..e0f4b5fe37fe 100644
--- a/japanese/font-migu/files/62-fonts-migu.conf
+++ b/japanese/font-migu/files/62-fonts-migu.conf
@@ -9,8 +9,6 @@
 			<family>Migu 1P</family>
 			<family>Migu 1M</family>
 			<family>Migu 2M</family>
-			<family>Migu 1VS</family>
-			<family>Migu 2DS</family>
 		</prefer>
 	</alias>
 	<alias>
diff --git a/japanese/font-migu/files/pkg-install.in b/japanese/font-migu/files/pkg-install.in
index ec6d06f16856..7477afe172fd 100644
--- a/japanese/font-migu/files/pkg-install.in
+++ b/japanese/font-migu/files/pkg-install.in
@@ -77,11 +77,6 @@ addentries ()
 		make_xlfd $ENC migu-1p-bold.ttf ipa "migu 1p" p bold
 		make_xlfd $ENC migu-1p-regular.ttf ipa "migu 1p" p medium
 
-		make_xlfd $ENC migu-1vs-bold.ttf ipa "migu 1vs" p bold
-		make_xlfd $ENC migu-1vs-regular.ttf ipa "migu 1vs" p medium
-		make_xlfd $ENC migu-2ds-bold.ttf ipa "migu 2ds" p bold
-		make_xlfd $ENC migu-2ds-regular.ttf ipa "migu 2ds" p medium
-
 		make_xlfd $ENC migu-1m-bold.ttf ipa "migu 1m" c bold
 		make_xlfd $ENC migu-1m-regular.ttf ipa "migu 1m" c medium
 		make_xlfd $ENC migu-2m-bold.ttf ipa "migu 2m" c bold
diff --git a/japanese/font-migu/pkg-plist b/japanese/font-migu/pkg-plist
index e562c3db8228..def6249042b2 100644
--- a/japanese/font-migu/pkg-plist
+++ b/japanese/font-migu/pkg-plist
@@ -7,10 +7,6 @@
 %%DATADIR%%/migu-1m-regular.ttf
 %%DATADIR%%/migu-2m-bold.ttf
 %%DATADIR%%/migu-2m-regular.ttf
-%%DATADIR%%/migu-1vs-bold.ttf
-%%DATADIR%%/migu-1vs-regular.ttf
-%%DATADIR%%/migu-2ds-bold.ttf
-%%DATADIR%%/migu-2ds-regular.ttf
 @dirrm %%DATADIR%%
 %%LOCAL_FONTSDIR%%/TTF/migu-1c-bold.ttf
 %%LOCAL_FONTSDIR%%/TTF/migu-1c-regular.ttf
@@ -20,10 +16,6 @@
 %%LOCAL_FONTSDIR%%/TTF/migu-1m-regular.ttf
 %%LOCAL_FONTSDIR%%/TTF/migu-2m-bold.ttf
 %%LOCAL_FONTSDIR%%/TTF/migu-2m-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1vs-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1vs-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-2ds-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-2ds-regular.ttf
 @dirrmtry %%LOCAL_FONTSDIR%%/TTF
 @dirrmtry %%LOCAL_FONTSDIR%%
 etc/fonts/conf.avail/20-unhint-migu.conf
@@ -38,10 +30,6 @@ etc/fonts/conf.d/62-fonts-migu.conf
 %%X_FONTSDIR%%/TTF/migu-1m-regular.ttf
 %%X_FONTSDIR%%/TTF/migu-2m-bold.ttf
 %%X_FONTSDIR%%/TTF/migu-2m-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-1vs-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-1vs-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-2ds-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-2ds-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