- Update WWW

- Update MASTER_SITES since author quit using GitHub
- Remove DOCS since documents are no longer distributed
- Define LICENSE, DIST_SUBDIR
- Bump PORTREVISION for plist change (DOCS)

PR:		210867
Submitted by:	Koichiro IWAO (maintainer)

3 files changed, 19 insertions, 13 deletions

diff --git a/japanese/font-ricty/Makefile b/japanese/font-ricty/Makefile
index aff3016053c4..1af4b87fc190 100644
--- a/japanese/font-ricty/Makefile
+++ b/japanese/font-ricty/Makefile
@@ -3,22 +3,25 @@
 
 PORTNAME=	ricty
 PORTVERSION=	3.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	http://www.rs.tus.ac.jp/yyusa/ricty/
 PKGNAMEPREFIX=	ja-font-
+DISTFILES=	ricty_generator-${PORTVERSION}.sh ricty_discord_converter.pe
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	# nothing
 
 MAINTAINER?=	meta+ports@vmeta.jp
 COMMENT?=	Ricty - fonts for programming
 
+LICENSE=	OFL11
+
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/inconsolata/Inconsolata.otf:x11-fonts/inconsolata-ttf \
 		${LOCALBASE}/share/fonts/TTF/migu-1m-regular.ttf:japanese/font-migu \
 		${LOCALBASE}/share/fonts/TTF/migu-1m-bold.ttf:japanese/font-migu \
 		fontforge:print/fontforge
 
 USES=		fonts:fc
-USE_GITHUB=	yes
-GH_ACCOUNT=	yascentur
-GH_PROJECT=	Ricty
 
 NO_PACKAGE=	redistribution is not allowed
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -28,10 +31,9 @@ SUB_FILES=	pkg-install
 FONTNAME=	TTF
 
 .if !defined(PKGNAMESUFFIX)
-OPTIONS_DEFINE=	DISCORD DOCS
+OPTIONS_DEFINE=	DISCORD
 DISCORD_DESC=	Install Ricty-Discord
 OPTIONS_DEFAULT=	DISCORD
-PORTDOCS=	README.md
 .endif
 
 .include <bsd.port.options.mk>
@@ -48,6 +50,11 @@ SUB_LIST+=	DISCORD="" RICTY=\#
 RUN_DEPENDS+=	${DATADIR}/RictyDiscord-Regular.ttf:japanese/font-ricty-discord
 .endif
 
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/ricty_generator-${PORTVERSION}.sh ${WRKSRC}/ricty_generator.sh
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/ricty_discord_converter.pe ${WRKSRC}/ricty_discord_patch.pe
+
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${SH} ${WRKSRC}/ricty_generator.sh \
@@ -83,9 +90,5 @@ do-install:
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}discord.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}discord.conf
 .endif
-.if ${PORT_OPTIONS:MDOCS} && defined(PORTDOCS)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/font-ricty/distinfo b/japanese/font-ricty/distinfo
index a554e319cf2b..062939ec6564 100644
--- a/japanese/font-ricty/distinfo
+++ b/japanese/font-ricty/distinfo
@@ -1,2 +1,5 @@
-SHA256 (yascentur-Ricty-3.2.4_GH0.tar.gz) = 1cdd909bc51c1b0cebcbec26470b391056d356b34518c0f3c924711d561b912e
-SIZE (yascentur-Ricty-3.2.4_GH0.tar.gz) = 256796
+TIMESTAMP = 1467789963
+SHA256 (ricty/ricty_generator-3.2.4.sh) = ede28e1d10bce84c545ca24b7d609d16e178c9a62daad3e0164f520285509141
+SIZE (ricty/ricty_generator-3.2.4.sh) = 20237
+SHA256 (ricty/ricty_discord_converter.pe) = 1958e6920aab27715dbe7bb9708db28bc0909d4eefbfe5c8919ce2b843e3c59e
+SIZE (ricty/ricty_discord_converter.pe) = 12196
diff --git a/japanese/font-ricty/pkg-descr b/japanese/font-ricty/pkg-descr
index fc9aea214069..05c84b7b9472 100644
--- a/japanese/font-ricty/pkg-descr
+++ b/japanese/font-ricty/pkg-descr
@@ -1,4 +1,4 @@
 Ricty is a Japanese TrueType font, consisting of
 Inconsolata and Migu 1M.
 
-WWW: http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html
+WWW: http://www.rs.tus.ac.jp/yyusa/ricty.html