5 files changed, 38 insertions, 6 deletions

diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index 191caa4fa16d..61a14230c41a 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	font-ume
-PORTVERSION=	0.0.401
+PORTVERSION=	0.0.410
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	ume-font/22212
-DISTNAME=	umefont-401
+DISTNAME=	umefont-410
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Ume Japanese TrueType fonts
@@ -24,7 +24,7 @@ SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PORTDOCS=	readme.html
+PORTDOCS=	license.html
 
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
diff --git a/japanese/font-ume/distinfo b/japanese/font-ume/distinfo
index 828059d94614..7eeacf7c65fe 100644
--- a/japanese/font-ume/distinfo
+++ b/japanese/font-ume/distinfo
@@ -1,3 +1,3 @@
-MD5 (umefont-401.tar.gz) = ecf9517d8603578562cd5cc3335e025b
-SHA256 (umefont-401.tar.gz) = ea7e0bec4a6728bd63953e7429f5b1e3e26c50191ca73318b4872fc282e22a76
-SIZE (umefont-401.tar.gz) = 29760555
+MD5 (umefont-410.tar.gz) = 7dcc69e276591b03c93aaf88f53eec3b
+SHA256 (umefont-410.tar.gz) = 74f79efad5f44703f8fadf50f4fa835342be9f0fc3362ebe05529f4cb125eaa1
+SIZE (umefont-410.tar.gz) = 51399801
diff --git a/japanese/font-ume/files/20-unhint-ume.conf b/japanese/font-ume/files/20-unhint-ume.conf
index 54b9796d27db..3798f990290c 100644
--- a/japanese/font-ume/files/20-unhint-ume.conf
+++ b/japanese/font-ume/files/20-unhint-ume.conf
@@ -5,15 +5,21 @@
 	<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>
diff --git a/japanese/font-ume/files/62-fonts-ume.conf b/japanese/font-ume/files/62-fonts-ume.conf
index a9a6feaf2365..5251eb19b962 100644
--- a/japanese/font-ume/files/62-fonts-ume.conf
+++ b/japanese/font-ume/files/62-fonts-ume.conf
@@ -6,7 +6,9 @@
 		<family>serif</family>
 		<prefer>
 			<family>Ume Mincho</family>
+			<family>Ume Mincho S3</family>
 			<family>Ume P Mincho</family>
+			<family>Ume P Mincho S3</family>
 		</prefer>
 	</alias>
 	<alias>
@@ -16,10 +18,14 @@
 			<family>Ume Gothic C4</family>
 			<family>Ume Gothic C5</family>
 			<family>Ume Gothic O5</family>
+			<family>Ume Gothic S4</family>
+			<family>Ume Gothic S5</family>
 			<family>Ume P Gothic</family>
 			<family>Ume P Gothic C4</family>
 			<family>Ume P Gothic C5</family>
 			<family>Ume P Gothic O5</family>
+			<family>Ume P Gothic S4</family>
+			<family>Ume P Gothic S5</family>
 			<family>Ume UI Gothic</family>
 			<family>Ume UI Gothic O5</family>
 		</prefer>
@@ -28,10 +34,13 @@
 		<family>monospace</family>
 		<prefer>
 			<family>Ume Mincho</family>
+			<family>Ume Mincho S3</family>
 			<family>Ume Gothic</family>
 			<family>Ume Gothic C4</family>
 			<family>Ume Gothic C5</family>
 			<family>Ume Gothic O5</family>
+			<family>Ume Gothic S4</family>
+			<family>Ume Gothic S5</family>
 			<family>Ume UI Gothic</family>
 			<family>Ume UI Gothic O5</family>
 		</prefer>
diff --git a/japanese/font-ume/pkg-plist b/japanese/font-ume/pkg-plist
index 14788fa52ab2..c45a37d9dddc 100644
--- a/japanese/font-ume/pkg-plist
+++ b/japanese/font-ume/pkg-plist
@@ -3,12 +3,17 @@
 %%DATADIR%%/ume-pgc5.ttf
 %%DATADIR%%/ume-pgo4.ttf
 %%DATADIR%%/ume-pgo5.ttf
+%%DATADIR%%/ume-pgs4.ttf
+%%DATADIR%%/ume-pgs5.ttf
 %%DATADIR%%/ume-pmo3.ttf
+%%DATADIR%%/ume-pms3.ttf
 %%DATADIR%%/ume-tgc4.ttf
 %%DATADIR%%/ume-tgc5.ttf
 %%DATADIR%%/ume-tgo4.ttf
 %%DATADIR%%/ume-tgo5.ttf
+%%DATADIR%%/ume-tgs4.ttf
 %%DATADIR%%/ume-tmo3.ttf
+%%DATADIR%%/ume-tms3.ttf
 %%DATADIR%%/ume-ugo4.ttf
 %%DATADIR%%/ume-ugo5.ttf
 @dirrm %%DATADIR%%
@@ -16,12 +21,18 @@
 %%LOCAL_FONTSDIR%%/TTF/ume-pgc5.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-pgo4.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-pgo5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgs4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pgs5.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-pmo3.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-pms3.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-tgc4.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-tgc5.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-tgo4.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-tgo5.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgs4.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tgs5.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-tmo3.ttf
+%%LOCAL_FONTSDIR%%/TTF/ume-tms3.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-ugo4.ttf
 %%LOCAL_FONTSDIR%%/TTF/ume-ugo5.ttf
 @dirrmtry %%LOCAL_FONTSDIR%%/TTF
@@ -36,12 +47,18 @@ etc/fonts/conf.avail/62-fonts-ume.conf
 %%X_FONTSDIR%%/TTF/ume-pgc5.ttf
 %%X_FONTSDIR%%/TTF/ume-pgo4.ttf
 %%X_FONTSDIR%%/TTF/ume-pgo5.ttf
+%%X_FONTSDIR%%/TTF/ume-pgs4.ttf
+%%X_FONTSDIR%%/TTF/ume-pgs5.ttf
 %%X_FONTSDIR%%/TTF/ume-pmo3.ttf
+%%X_FONTSDIR%%/TTF/ume-pms3.ttf
 %%X_FONTSDIR%%/TTF/ume-tgc4.ttf
 %%X_FONTSDIR%%/TTF/ume-tgc5.ttf
 %%X_FONTSDIR%%/TTF/ume-tgo4.ttf
 %%X_FONTSDIR%%/TTF/ume-tgo5.ttf
+%%X_FONTSDIR%%/TTF/ume-tgs4.ttf
+%%X_FONTSDIR%%/TTF/ume-tgs5.ttf
 %%X_FONTSDIR%%/TTF/ume-tmo3.ttf
+%%X_FONTSDIR%%/TTF/ume-tms3.ttf
 %%X_FONTSDIR%%/TTF/ume-ugo4.ttf
 %%X_FONTSDIR%%/TTF/ume-ugo5.ttf
 @exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true