- Fix a warning "Having multiple values in <test> isn't supported and may

  not work as expected" when using the latest x11-fonts/fontconfig [*].

- Update to the latest version (font-migu, font-ume, font-vlgothic).

- Style clean-ups.

PR:	ports/181701 [*]

31 files changed, 258 insertions, 128 deletions

diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index c2075d82e8be..4c589035b70f 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ipa
 PORTVERSION=	00303
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/
 PKGNAMEPREFIX=	ja-font-
diff --git a/japanese/font-ipa/files/20-unhint-ipa.conf b/japanese/font-ipa/files/20-unhint-ipa.conf
index e64965400774..4b978ada6611 100644
--- a/japanese/font-ipa/files/20-unhint-ipa.conf
+++ b/japanese/font-ipa/files/20-unhint-ipa.conf
@@ -3,12 +3,20 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>IPAMincho</string>
-			<string>IPAGothic</string>
-			<string>IPAPMincho</string>
-			<string>IPAPGothic</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>IPAMincho</string>
+			</test>
+			<test name="family">
+				<string>IPAGothic</string>
+			</test>
+			<test name="family">
+				<string>IPAPMincho</string>
+			</test>
+			<test name="family">
+				<string>IPAPGothic</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-ipaex/Makefile b/japanese/font-ipaex/Makefile
index 643c6a6b4156..cf1192c9724a 100644
--- a/japanese/font-ipaex/Makefile
+++ b/japanese/font-ipaex/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ipaex
 PORTVERSION=	00201
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/7bf84182a04a9632268dbcb03f100d05/
 PKGNAMEPREFIX=	ja-font-
diff --git a/japanese/font-ipaex/files/20-unhint-ipaex.conf b/japanese/font-ipaex/files/20-unhint-ipaex.conf
index 843c0d3ce001..5d63510fe9a7 100644
--- a/japanese/font-ipaex/files/20-unhint-ipaex.conf
+++ b/japanese/font-ipaex/files/20-unhint-ipaex.conf
@@ -3,10 +3,14 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>IPAexMincho</string>
-			<string>IPAexGothic</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>IPAexMincho</string>
+			</test>
+			<test name="family">
+				<string>IPAexGothic</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index 81438f02f3cd..6bb0dd36c14a 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kochi
 PORTVERSION=	20030809
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/efont/5411/
 PKGNAMEPREFIX=	ja-font-
diff --git a/japanese/font-kochi/files/20-unhint-kochi.conf b/japanese/font-kochi/files/20-unhint-kochi.conf
index 262064b7132d..821929d9ece2 100644
--- a/japanese/font-kochi/files/20-unhint-kochi.conf
+++ b/japanese/font-kochi/files/20-unhint-kochi.conf
@@ -3,10 +3,14 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>Kochi Mincho</string>
-			<string>Kochi Gothic</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>Kochi Mincho</string>
+			</test>
+			<test name="family">
+				<string>Kochi Gothic</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 9f0ea4629ef1..a31c07458b38 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	migmix
 PORTVERSION=	1.0.20130430
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/mix-mplus-ipa/58721
 PKGNAMEPREFIX=	ja-font-
diff --git a/japanese/font-migmix/files/20-unhint-migmix.conf b/japanese/font-migmix/files/20-unhint-migmix.conf
index 8564e91cdbe6..344e33ce0962 100644
--- a/japanese/font-migmix/files/20-unhint-migmix.conf
+++ b/japanese/font-migmix/files/20-unhint-migmix.conf
@@ -3,12 +3,20 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>MigMix 1M</string>
-			<string>MigMix 1P</string>
-			<string>MigMix 2M</string>
-			<string>MigMix 2P</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>MigMix 1M</string>
+			</test>
+			<test name="family">
+				<string>MigMix 1P</string>
+			</test>
+			<test name="family">
+				<string>MigMix 2M</string>
+			</test>
+			<test name="family">
+				<string>MigMix 2P</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-migu/Makefile b/japanese/font-migu/Makefile
index 655b705bc647..7d9932ec32df 100644
--- a/japanese/font-migu/Makefile
+++ b/japanese/font-migu/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	migu
-PORTVERSION=	1.0.20130430
-PORTREVISION=	1
+PORTVERSION=	1.0.20130617
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	mix-mplus-ipa/58720
+MASTER_SITE_SUBDIR=	mix-mplus-ipa/59022
 PKGNAMEPREFIX=	ja-font-
 DISTFILES=	${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SUFX} \
 		${PORTNAME}-1c-${PORTVERSION:E}${EXTRACT_SUFX} \
diff --git a/japanese/font-migu/distinfo b/japanese/font-migu/distinfo
index c54d837f1d80..9bc9f7af5613 100644
--- a/japanese/font-migu/distinfo
+++ b/japanese/font-migu/distinfo
@@ -1,8 +1,8 @@
-SHA256 (migu-1p-20130430.zip) = e455d560ff26c547e8870535a2b0c816bf37b8a0f2950ffa0c4249e98a0e9f9a
-SIZE (migu-1p-20130430.zip) = 4364204
-SHA256 (migu-1c-20130430.zip) = 367b7b0810ab75523a68b2efdf17944287dcca16889c1dd087a154fec00d9d2c
-SIZE (migu-1c-20130430.zip) = 4372878
-SHA256 (migu-1m-20130430.zip) = 97eefcf84f97b345a34a0db027c12926f01f6c3c4a255cf2622cd9443c2d22d5
-SIZE (migu-1m-20130430.zip) = 4268281
-SHA256 (migu-2m-20130430.zip) = baf88cff246c96251994e6042a9935fecc39855ffb9172d662416d5540a43b9d
-SIZE (migu-2m-20130430.zip) = 4266364
+SHA256 (migu-1p-20130617.zip) = 2c59928b41508a8f4871edc61cdb2259ee8bb078e915c11cda3ca3a54a3a5a19
+SIZE (migu-1p-20130617.zip) = 4365146
+SHA256 (migu-1c-20130617.zip) = 3defd9a68e4f3c406b0ccf3dbb978006fa03ccdd7ef6e822fa8115c7baf22a4e
+SIZE (migu-1c-20130617.zip) = 4373842
+SHA256 (migu-1m-20130617.zip) = c52025471b560e5aba73ec2327a160d6e514def05964056dbb1a8409e5870b45
+SIZE (migu-1m-20130617.zip) = 4268071
+SHA256 (migu-2m-20130617.zip) = 25092541e927bbebc094f9c1d7cfaec3e8e2c7a997c360c507a3433ed11e8278
+SIZE (migu-2m-20130617.zip) = 4266805
diff --git a/japanese/font-migu/files/20-unhint-migu.conf b/japanese/font-migu/files/20-unhint-migu.conf
index c427a8f62edc..1d02a4e836d6 100644
--- a/japanese/font-migu/files/20-unhint-migu.conf
+++ b/japanese/font-migu/files/20-unhint-migu.conf
@@ -3,12 +3,20 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>Migu 1C</string>
-			<string>Migu 1P</string>
-			<string>Migu 1M</string>
-			<string>Migu 2M</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>Migu 1C</string>
+			</test>
+			<test name="family">
+				<string>Migu 1P</string>
+			</test>
+			<test name="family">
+				<string>Migu 1M</string>
+			</test>
+			<test name="family">
+				<string>Migu 2M</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index ad29c20ea99d..1dfcf8f036ba 100644
--- a/japanese/font-mona-ipa/Makefile
+++ b/japanese/font-mona-ipa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mona-ipa
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.geocities.jp/ipa_mona/
 PKGNAMEPREFIX=	ja-font-
diff --git a/japanese/font-mona-ipa/files/20-unhint-mona-ipa.conf b/japanese/font-mona-ipa/files/20-unhint-mona-ipa.conf
index 75532095619b..84f0c85a1eab 100644
--- a/japanese/font-mona-ipa/files/20-unhint-mona-ipa.conf
+++ b/japanese/font-mona-ipa/files/20-unhint-mona-ipa.conf
@@ -3,13 +3,23 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>IPAMonaMincho</string>
-			<string>IPAMonaGothic</string>
-			<string>IPAMonaPMincho</string>
-			<string>IPAMonaPGothic</string>
-			<string>IPAMonaUIGothic</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>IPAMonaMincho</string>
+			</test>
+			<test name="family">
+				<string>IPAMonaGothic</string>
+			</test>
+			<test name="family">
+				<string>IPAMonaPMincho</string>
+			</test>
+			<test name="family">
+				<string>IPAMonaPGothic</string>
+			</test>
+			<test name="family">
+				<string>IPAMonaUIGothic</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-motoya-al/Makefile b/japanese/font-motoya-al/Makefile
index ec0560df659e..79e5c04c122d 100644
--- a/japanese/font-motoya-al/Makefile
+++ b/japanese/font-motoya-al/Makefile
@@ -1,11 +1,8 @@
-# New ports collection makefile for:	font-motoya-al
-# Date created:		7 January 2011
-# Whom:			hrs
 # $FreeBSD$
-#
 
 PORTNAME=	font-motoya-al
 PORTVERSION=	0.0.20100921
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL
 MASTER_SITE_SUBDIR=	hrs
@@ -29,6 +26,10 @@ PORTDOCS=	newsrelease20100921.pdf
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
@@ -47,7 +48,7 @@ do-install:
 		${PREFIX}/etc/fonts/conf.d/20-unhint-motoya-al.conf
 	${LN} -s -f ../conf.avail/62-fonts-motoya-al.conf \
 		${PREFIX}/etc/fonts/conf.d/62-fonts-motoya-al.conf
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/japanese/font-motoya-al/files/20-unhint-motoya-al.conf b/japanese/font-motoya-al/files/20-unhint-motoya-al.conf
index 421f6c828d9e..18db3ed906ef 100644
--- a/japanese/font-motoya-al/files/20-unhint-motoya-al.conf
+++ b/japanese/font-motoya-al/files/20-unhint-motoya-al.conf
@@ -3,10 +3,14 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>MotoyaLCeder</string>
-			<string>MotoyaLMaru</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>MotoyaLCeder</string>
+			</test>
+			<test name="family">
+				<string>MotoyaLMaru</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-motoya-al/pkg-descr b/japanese/font-motoya-al/pkg-descr
index 1af0c2e1bad1..b9e2a3470d59 100644
--- a/japanese/font-motoya-al/pkg-descr
+++ b/japanese/font-motoya-al/pkg-descr
@@ -3,5 +3,5 @@ Two free Japanese TrueType fonts (Apache License) by MOTOYA Co.,Ltd:
 - Motoya L Ceder W3
 - Motoya L Maru W3
 
-WWW:	http://www.motoyafont.jp/news/newsrelease20100921.pdf
-WWW:	https://android.googlesource.com/platform/frameworks/base/+/76d3b0f1bdf31b7315b636834f7da7211ca907e0
+WWW: http://www.motoyafont.jp/news/newsrelease20100921.pdf
+WWW: https://android.googlesource.com/platform/frameworks/base/+/76d3b0f1bdf31b7315b636834f7da7211ca907e0
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 2eeb60928516..2a30af706e9a 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mplus-ipa
 PORTVERSION=	1.0.20060520.p1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
diff --git a/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
index 26a7fa4c3fe2..0f36d995dd36 100644
--- a/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
+++ b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
@@ -3,14 +3,26 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>M+1P+IPAG</string>
-			<string>M+2P+IPAG</string>
-			<string>M+1P+IPAG circle</string>
-			<string>M+2P+IPAG circle</string>
-			<string>M+1VM+IPAG circle</string>
-			<string>M+2VM+IPAG circle</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>M+1P+IPAG</string>
+			</test>
+			<test name="family">
+				<string>M+2P+IPAG</string>
+			</test>
+			<test name="family">
+				<string>M+1P+IPAG circle</string>
+			</test>
+			<test name="family">
+				<string>M+2P+IPAG circle</string>
+			</test>
+			<test name="family">
+				<string>M+1VM+IPAG circle</string>
+			</test>
+			<test name="family">
+				<string>M+2VM+IPAG circle</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index cc5d1ad479a7..376e38c23598 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplus
 PORTVERSION=	2.2.4.055
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/${PORTNAME}-fonts/5030:bitmap \
 		SFJP/${PORTNAME}-fonts/6650:outline
diff --git a/japanese/font-mplus/files/20-unhint-mplus.conf b/japanese/font-mplus/files/20-unhint-mplus.conf
index 790a4e756b5f..1e0bcaafdb63 100644
--- a/japanese/font-mplus/files/20-unhint-mplus.conf
+++ b/japanese/font-mplus/files/20-unhint-mplus.conf
@@ -3,15 +3,29 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>M+ 1c</string>
-			<string>M+ 1m</string>
-			<string>M+ 1mn</string>
-			<string>M+ 1p</string>
-			<string>M+ 2c</string>
-			<string>M+ 2m</string>
-			<string>M+ 2p</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>M+ 1c</string>
+			</test>
+			<test name="family">
+				<string>M+ 1m</string>
+			</test>
+			<test name="family">
+				<string>M+ 1mn</string>
+			</test>
+			<test name="family">
+				<string>M+ 1p</string>
+			</test>
+			<test name="family">
+				<string>M+ 2c</string>
+			</test>
+			<test name="family">
+				<string>M+ 2m</string>
+			</test>
+			<test name="family">
+				<string>M+ 2p</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index 011718e0f1a6..1700aa7854f6 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sazanami
 PORTVERSION=	20040629
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/efont/10087
 PKGNAMEPREFIX=	ja-font-
diff --git a/japanese/font-sazanami/files/20-unhint-sazanami.conf b/japanese/font-sazanami/files/20-unhint-sazanami.conf
index 74fb41ee209d..8341d1bf7b8c 100644
--- a/japanese/font-sazanami/files/20-unhint-sazanami.conf
+++ b/japanese/font-sazanami/files/20-unhint-sazanami.conf
@@ -3,10 +3,14 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>Sazanami Mincho</string>
-			<string>Sazanami Gothic</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>Sazanami Mincho</string>
+			</test>
+			<test name="family">
+				<string>Sazanami Gothic</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index 5da6d410f67b..8921a797791d 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: shinonome
-# Date created:		June 15 2001
-# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
-#
+# Created by: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	font-shinonome
 PORTVERSION=	0.9.11.p1
@@ -53,6 +49,10 @@ FONTNAMES=\
 	shnmk16      shnmk16b     shnmk16i     shnmk16bi     \
 	shnmk16min   shnmk16minb  shnmk16mini  shnmk16minbi
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-build:
 	@${ECHO_CMD} -n "Compressing PCF fonts"
 	@cd ${WRKSRC} && for F in ${FONTNAMES}; do \
@@ -71,7 +71,7 @@ do-install:
 
 post-install:
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/japanese/font-takao/Makefile b/japanese/font-takao/Makefile
index ac21ffd070c7..75ed76642297 100644
--- a/japanese/font-takao/Makefile
+++ b/japanese/font-takao/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	takao
 PORTVERSION=	003.02.01
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://launchpadlibrarian.net/40218948/
 PKGNAMEPREFIX=	ja-font-
diff --git a/japanese/font-takao/files/20-unhint-takao.conf b/japanese/font-takao/files/20-unhint-takao.conf
index 19d5e83c2ded..daa9fb4c97d4 100644
--- a/japanese/font-takao/files/20-unhint-takao.conf
+++ b/japanese/font-takao/files/20-unhint-takao.conf
@@ -3,14 +3,26 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>TakaoMincho</string>
-			<string>TakaoGothic</string>
-			<string>TakaoPMincho</string>
-			<string>TakaoPGothic</string>
-			<string>TakaoExMincho</string>
-			<string>TakaoExGothic</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>TakaoMincho</string>
+			</test>
+			<test name="family">
+				<string>TakaoGothic</string>
+			</test>
+			<test name="family">
+				<string>TakaoPMincho</string>
+			</test>
+			<test name="family">
+				<string>TakaoPGothic</string>
+			</test>
+			<test name="family">
+				<string>TakaoExMincho</string>
+			</test>
+			<test name="family">
+				<string>TakaoExGothic</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index dcc809d9d54d..ab3545970527 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ume
-PORTVERSION=	0.0.452
+PORTVERSION=	0.0.455
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}-font/22212
diff --git a/japanese/font-ume/distinfo b/japanese/font-ume/distinfo
index 542d08fff4a4..2c0801ee79ac 100644
--- a/japanese/font-ume/distinfo
+++ b/japanese/font-ume/distinfo
@@ -1,2 +1,2 @@
-SHA256 (umefont_452.tar.xz) = c9d0acabbf57340b3aa614ce73b19b69dc6a2fb24c6f52d4eae37fcccee3a1c8
-SIZE (umefont_452.tar.xz) = 5649568
+SHA256 (umefont_455.tar.xz) = 73f9adb3c56188f28590f6f986c8ce2ad31d80dbe78ba8db2efe88cd7e7103ed
+SIZE (umefont_455.tar.xz) = 5615972
diff --git a/japanese/font-ume/files/20-unhint-ume.conf b/japanese/font-ume/files/20-unhint-ume.conf
index 3798f990290c..aac8ccf667ec 100644
--- a/japanese/font-ume/files/20-unhint-ume.conf
+++ b/japanese/font-ume/files/20-unhint-ume.conf
@@ -3,26 +3,62 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>Ume Mincho</string>
-			<string>Ume Mincho S3</string>
-			<string>Ume P Mincho</string>
-			<string>Ume P Mincho S3</string>
-			<string>Ume Gothic</string>
-			<string>Ume Gothic C4</string>
-			<string>Ume Gothic C5</string>
-			<string>Ume Gothic O5</string>
-			<string>Ume Gothic S4</string>
-			<string>Ume Gothic S5</string>
-			<string>Ume P Gothic</string>
-			<string>Ume P Gothic C4</string>
-			<string>Ume P Gothic C5</string>
-			<string>Ume P Gothic O5</string>
-			<string>Ume P Gothic S4</string>
-			<string>Ume P Gothic S5</string>
-			<string>Ume UI Gothic</string>
-			<string>Ume UI Gothic O5</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>Ume Mincho</string>
+			</test>
+			<test name="family">
+				<string>Ume Mincho S3</string>
+			</test>
+			<test name="family">
+				<string>Ume P Mincho</string>
+			</test>
+			<test name="family">
+				<string>Ume P Mincho S3</string>
+			</test>
+			<test name="family">
+				<string>Ume Gothic</string>
+			</test>
+			<test name="family">
+				<string>Ume Gothic C4</string>
+			</test>
+			<test name="family">
+				<string>Ume Gothic C5</string>
+			</test>
+			<test name="family">
+				<string>Ume Gothic O5</string>
+			</test>
+			<test name="family">
+				<string>Ume Gothic S4</string>
+			</test>
+			<test name="family">
+				<string>Ume Gothic S5</string>
+			</test>
+			<test name="family">
+				<string>Ume P Gothic</string>
+			</test>
+			<test name="family">
+				<string>Ume P Gothic C4</string>
+			</test>
+			<test name="family">
+				<string>Ume P Gothic C5</string>
+			</test>
+			<test name="family">
+				<string>Ume P Gothic O5</string>
+			</test>
+			<test name="family">
+				<string>Ume P Gothic S4</string>
+			</test>
+			<test name="family">
+				<string>Ume P Gothic S5</string>
+			</test>
+			<test name="family">
+				<string>Ume UI Gothic</string>
+			</test>
+			<test name="family">
+				<string>Ume UI Gothic O5</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index 14bc6ccfd878..ded81f209cd4 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	vlgothic
-PORTVERSION=	20130422
-PORTREVISION=	1
+PORTVERSION=	20130607
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SFJP/vlgothic/58671
+MASTER_SITES=	SFJP/vlgothic/58961
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	VLGothic-${PORTVERSION}
 
diff --git a/japanese/font-vlgothic/distinfo b/japanese/font-vlgothic/distinfo
index a906f26addff..c1a5590d0921 100644
--- a/japanese/font-vlgothic/distinfo
+++ b/japanese/font-vlgothic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VLGothic-20130422.tar.xz) = 05d68e0866d788dc69caf9a763937051f2ff0e510f85e7cd091cf21d5f428888
-SIZE (VLGothic-20130422.tar.xz) = 2213024
+SHA256 (VLGothic-20130607.tar.xz) = 4b8b69f6d050dcb79d6bd2f741ab3434d1313d58ff5ff10d1b3bb28aeb53f9f5
+SIZE (VLGothic-20130607.tar.xz) = 2215992
diff --git a/japanese/font-vlgothic/files/20-unhint-vlgothic.conf b/japanese/font-vlgothic/files/20-unhint-vlgothic.conf
index 30b3395591c7..868b0ece95eb 100644
--- a/japanese/font-vlgothic/files/20-unhint-vlgothic.conf
+++ b/japanese/font-vlgothic/files/20-unhint-vlgothic.conf
@@ -3,10 +3,14 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
-		<test name="family">
-			<string>VL Gothic</string>
-			<string>VL PGothic</string>
-		</test>
+		<or>
+			<test name="family">
+				<string>VL Gothic</string>
+			</test>
+			<test name="family">
+				<string>VL PGothic</string>
+			</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>