Index: head/japanese/font-ume/Makefile
===================================================================
--- head/japanese/font-ume/Makefile	(revision 429974)
+++ head/japanese/font-ume/Makefile	(revision 429975)
@@ -1,46 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	ume
-PORTVERSION=	0.0.470
-PORTREVISION=	3
+PORTVERSION=	0.0.660
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP/${PORTNAME}-font/22212
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	umefont_${PORTVERSION:E}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Ume Japanese TrueType fonts
 
+LICENSE=	PD
+LICENSE_FILE=	${WRKSRC}/license.html
+
 USES=		fonts:fc tar:xz
 FONTNAME=	TTF
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
-PORTDOCS=	license.html
 
-OPTIONS_DEFINE=	DOCS
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
 	    ../../../${DATADIR_REL}/*.ttf .
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
 	    ${FILESDIR}/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
 	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/japanese/font-ume/distinfo
===================================================================
--- head/japanese/font-ume/distinfo	(revision 429974)
+++ head/japanese/font-ume/distinfo	(revision 429975)
@@ -1,2 +1,3 @@
-SHA256 (umefont_470.tar.xz) = 9197f2a42c9e8a7e7de774571377bb007ccc0d0e6573cca6b5ecdc819c879129
-SIZE (umefont_470.tar.xz) = 6431820
+TIMESTAMP = 1483100776
+SHA256 (umefont_660.tar.xz) = 272d0f533417130ab32ece69efae1a1edeab3b21d2a1638a159e19b4cbaf1b30
+SIZE (umefont_660.tar.xz) = 5284680
Index: head/japanese/font-ume/files/20-unhint-ume.conf
===================================================================
--- head/japanese/font-ume/files/20-unhint-ume.conf	(revision 429974)
+++ head/japanese/font-ume/files/20-unhint-ume.conf	(revision 429975)
@@ -1,66 +1,69 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
 		<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 Hy Gothic</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>
 	</match>
 </fontconfig>
Index: head/japanese/font-ume/files/62-fonts-ume.conf
===================================================================
--- head/japanese/font-ume/files/62-fonts-ume.conf	(revision 429974)
+++ head/japanese/font-ume/files/62-fonts-ume.conf	(revision 429975)
@@ -1,48 +1,50 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<alias>
 		<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>
 		<family>sans-serif</family>
 		<prefer>
 			<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 Hy Gothic</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>
 	</alias>
 	<alias>
 		<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 Hy Gothic</family>
 			<family>Ume UI Gothic</family>
 			<family>Ume UI Gothic O5</family>
 		</prefer>
 	</alias>
 </fontconfig>
Index: head/japanese/font-ume/files/pkg-install.in
===================================================================
--- head/japanese/font-ume/files/pkg-install.in	(revision 429974)
+++ head/japanese/font-ume/files/pkg-install.in	(revision 429975)
@@ -1,102 +1,103 @@
 #!/bin/sh
 # $FreeBSD$
 
 catfontsdir ()
 {
     while read _IN
     do
       case "${_IN}" in
       *-ume-*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
     done
 }
 
 ROMA=""
 BOLD="ds=y"
 ITAL="ai=0.15"
 OBLI="ai=0.15"
 RITA="ai=0.08"
 ROBL="ai=0.08"
 
 make_xlfd()
 {
 	_enc=$1
 	_file=$2
 	_vendor=$3
 	_fname=$4
 	_poc=$5
 
 	case "${_poc}:${_enc}" in
 	p:jisx0201.1976-*)	PFIX="bw=0.5" ;;
 	c:jisx0201.1976-*)	PFIX="bw=0.5" ;;
 	p:*)			PFIX="" ;;
 	c:*)			PFIX="" ;;
 	esac
 
 	set --	"${ROMA}"	medium-r \
 		${BOLD}		bold-r \
 		${ITAL}		medium-i \
 		${ITAL}:${BOLD} bold-i \
 		${OBLI}		medium-o \
 		${OBLI}:${BOLD}	bold-o \
 		${RITA}		medium-ri \
 		${RITA}:${BOLD}	bold-ri \
 		${ROBL}		medium-ro \
 		${ROBL}:${BOLD}	bold-ro
 	while [ $# != 0 ]; do
 		_prefix="${PFIX}:$1"; shift
 		_variant=$1; shift
 		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
 			$_prefix $_file $_vendor $_fname $_variant $_poc $_enc
 	done | sed -e 's,::,:,g' -e 's,^:,,'
 }
 
 addentries ()
 {
 	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
 	do
+		make_xlfd $ENC ume-hgo4.ttf ume gothic_hy p
 		make_xlfd $ENC ume-pgc4.ttf ume gothic_c4 p
 		make_xlfd $ENC ume-pgc5.ttf ume gothic_c5 p
 		make_xlfd $ENC ume-pgo5.ttf ume gothic_o5 p
 		make_xlfd $ENC ume-pgo4.ttf ume gothic p
 		make_xlfd $ENC ume-tgc4.ttf ume gothic_c4 c
 		make_xlfd $ENC ume-tgc5.ttf ume gothic_c5 c
 		make_xlfd $ENC ume-tgo5.ttf ume gothic_o5 c
 		make_xlfd $ENC ume-tgo4.ttf ume gothic c
 		make_xlfd $ENC ume-ugo4.ttf ume ui_gothic c
 		make_xlfd $ENC ume-ugo5.ttf ume ui_gothic_o5 c
 		make_xlfd $ENC ume-tmo3.ttf ume mincho c
 		make_xlfd $ENC ume-pmo3.ttf ume mincho p
 	done
 }
 
 nfonts ()
 {
     _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
 }
 
 case "$2" in
 POST-INSTALL)
 	cd %%FONTSDIR%%
 	touch fonts.dir
 	exec < fonts.dir; rm -f fonts.dir
 	(catfontsdir; addentries) > fonts.dir
 	_num=`nfonts fonts.dir`
 	exec < fonts.dir; rm -f fonts.dir
 	(echo "${_num}"; cat) > fonts.dir
 	chmod 0444 fonts.dir
 	;;
 DEINSTALL)
 	cd %%FONTSDIR%%
 	exec < fonts.dir; rm -f fonts.dir
 	catfontsdir > fonts.dir
 	_num=`nfonts fonts.dir`
 	exec < fonts.dir; rm -f fonts.dir
 	(echo "${_num}"; cat) > fonts.dir
 	chmod 0444 fonts.dir
 	if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
 		rm -f fonts.dir
 	fi
 	;;
 esac
Index: head/japanese/font-ume/pkg-plist
===================================================================
--- head/japanese/font-ume/pkg-plist	(revision 429974)
+++ head/japanese/font-ume/pkg-plist	(revision 429975)
@@ -1,40 +1,42 @@
+%%DATADIR%%/ume-hgo4.ttf
 %%DATADIR%%/ume-pgc4.ttf
 %%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-tgs5.ttf
 %%DATADIR%%/ume-tmo3.ttf
 %%DATADIR%%/ume-tms3.ttf
 %%DATADIR%%/ume-ugo4.ttf
 %%DATADIR%%/ume-ugo5.ttf
 etc/fonts/conf.avail/20-unhint-ume.conf
 etc/fonts/conf.avail/62-fonts-ume.conf
 etc/fonts/conf.d/20-unhint-ume.conf
 etc/fonts/conf.d/62-fonts-ume.conf
+%%FONTSDIR%%/ume-hgo4.ttf
 %%FONTSDIR%%/ume-pgc4.ttf
 %%FONTSDIR%%/ume-pgc5.ttf
 %%FONTSDIR%%/ume-pgo4.ttf
 %%FONTSDIR%%/ume-pgo5.ttf
 %%FONTSDIR%%/ume-pgs4.ttf
 %%FONTSDIR%%/ume-pgs5.ttf
 %%FONTSDIR%%/ume-pmo3.ttf
 %%FONTSDIR%%/ume-pms3.ttf
 %%FONTSDIR%%/ume-tgc4.ttf
 %%FONTSDIR%%/ume-tgc5.ttf
 %%FONTSDIR%%/ume-tgo4.ttf
 %%FONTSDIR%%/ume-tgo5.ttf
 %%FONTSDIR%%/ume-tgs4.ttf
 %%FONTSDIR%%/ume-tgs5.ttf
 %%FONTSDIR%%/ume-tmo3.ttf
 %%FONTSDIR%%/ume-tms3.ttf
 %%FONTSDIR%%/ume-ugo4.ttf
 %%FONTSDIR%%/ume-ugo5.ttf