Update to 660.

6 files changed, 15 insertions, 11 deletions

diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index 190e19d3842b..c9976433677f 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -1,8 +1,7 @@
 # $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-
@@ -11,6 +10,9 @@ 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
@@ -19,9 +21,6 @@ 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}
@@ -39,8 +38,4 @@ do-install:
 	${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>
diff --git a/japanese/font-ume/distinfo b/japanese/font-ume/distinfo
index ef65e8b2f688..934d4a2b567a 100644
--- a/japanese/font-ume/distinfo
+++ b/japanese/font-ume/distinfo
@@ -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
diff --git a/japanese/font-ume/files/20-unhint-ume.conf b/japanese/font-ume/files/20-unhint-ume.conf
index aac8ccf667ec..ecde6c4ad654 100644
--- a/japanese/font-ume/files/20-unhint-ume.conf
+++ b/japanese/font-ume/files/20-unhint-ume.conf
@@ -35,6 +35,9 @@
 				<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">
diff --git a/japanese/font-ume/files/62-fonts-ume.conf b/japanese/font-ume/files/62-fonts-ume.conf
index 5251eb19b962..cdfa3d9845e3 100644
--- a/japanese/font-ume/files/62-fonts-ume.conf
+++ b/japanese/font-ume/files/62-fonts-ume.conf
@@ -20,6 +20,7 @@
 			<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>
@@ -41,6 +42,7 @@
 			<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>
diff --git a/japanese/font-ume/files/pkg-install.in b/japanese/font-ume/files/pkg-install.in
index 24562c0807fc..ee5650d2e8dd 100644
--- a/japanese/font-ume/files/pkg-install.in
+++ b/japanese/font-ume/files/pkg-install.in
@@ -56,6 +56,7 @@ 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
diff --git a/japanese/font-ume/pkg-plist b/japanese/font-ume/pkg-plist
index 63b4c42074fa..141d731be691 100644
--- a/japanese/font-ume/pkg-plist
+++ b/japanese/font-ume/pkg-plist
@@ -1,3 +1,4 @@
+%%DATADIR%%/ume-hgo4.ttf
 %%DATADIR%%/ume-pgc4.ttf
 %%DATADIR%%/ume-pgc5.ttf
 %%DATADIR%%/ume-pgo4.ttf
@@ -20,6 +21,7 @@ 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