Index: head/japanese/font-ricty/Makefile
===================================================================
--- head/japanese/font-ricty/Makefile	(revision 381878)
+++ head/japanese/font-ricty/Makefile	(revision 381879)
@@ -1,100 +1,93 @@
 # Created by: masaki
 # $FreeBSD$
 
 PORTNAME=	ricty
 PORTVERSION=	3.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER?=	meta+ports@vmeta.jp
 COMMENT?=	Ricty - fonts for programming
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-BUILD_DEPENDS=	${LOCALBASE}/${X_FONTSDIR}/OTF/Inconsolata.otf:${PORTSDIR}/x11-fonts/inconsolata-ttf \
-		${LOCALBASE}/${X_FONTSDIR}/TTF/migu-1m-regular.ttf:${PORTSDIR}/japanese/font-migu \
-		${LOCALBASE}/${X_FONTSDIR}/TTF/migu-1m-bold.ttf:${PORTSDIR}/japanese/font-migu \
+BUILD_DEPENDS=	${LOCALBASE}/share/fonts/inconsolata/Inconsolata.otf:${PORTSDIR}/x11-fonts/inconsolata-ttf \
+		${LOCALBASE}/share/fonts/TTF/migu-1m-regular.ttf:${PORTSDIR}/japanese/font-migu \
+		${LOCALBASE}/share/fonts/TTF/migu-1m-bold.ttf:${PORTSDIR}/japanese/font-migu \
 		fontforge:${PORTSDIR}/print/fontforge
 
+USES=		fonts
 USE_GITHUB=	yes
 GH_ACCOUNT=	yascentur
 GH_PROJECT=	Ricty
 GH_COMMIT=	c22daa9
 
 NO_PACKAGE=	redistribution is not allowed
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
-SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
-		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
 
-LOCAL_FONTSDIR=	share/fonts
-X_FONTSDIR=	share/fonts
+FONTNAME=	TTF
 
 .if !defined(PKGNAMESUFFIX)
 OPTIONS_DEFINE=	DISCORD DOCS
 DISCORD_DESC=	Install Ricty-Discord
 OPTIONS_DEFAULT=	DISCORD
 PORTDOCS=	README.md
 .endif
 
 .include <bsd.port.options.mk>
 
 .if !defined(PKGNAMESUFFIX)
 PLIST_SUB+=	DISCORD="@comment " RICTY=""
 SUB_LIST+=	DISCORD=\# RICTY=""
 .else
 PLIST_SUB+=	DISCORD="" RICTY="@comment "
 SUB_LIST+=	DISCORD="" RICTY=\#
 .endif
 
 .if ${PORT_OPTIONS:MDISCORD}
 RUN_DEPENDS+=	${DATADIR}/RictyDiscord-Regular.ttf:${PORTSDIR}/japanese/font-ricty-discord
 .endif
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${SH} ${WRKSRC}/ricty_generator.sh \
-			${PREFIX}/${X_FONTSDIR}/OTF/Inconsolata.otf \
-			${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-regular.ttf \
-			${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-bold.ttf
+			${PREFIX}/share/fonts/inconsolata/Inconsolata.otf \
+			${PREFIX}/share/fonts/TTF/migu-1m-regular.ttf \
+			${PREFIX}/share/fonts/TTF/migu-1m-bold.ttf
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 .if !defined(PKGNAMESUFFIX)
 	${INSTALL_DATA} ${WRKSRC}/Ricty-*.ttf ${STAGEDIR}${DATADIR}
-	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Ricty-*.ttf .
-	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Ricty-*.ttf .
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+	    ../../../${DATADIR_REL}/Ricty-*.ttf .
 	${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
 .else
 	${INSTALL_DATA} ${WRKSRC}/RictyDiscord-*.ttf ${STAGEDIR}${DATADIR}
-	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/RictyDiscord-*.ttf .
-	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/RictyDiscord-*.ttf .
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+	    ../../../${DATADIR_REL}/RictyDiscord-*.ttf .
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}discord.conf \
 	    ${FILESDIR}/62-fonts-${PORTNAME}discord.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
 	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}discord.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}discord.conf
 	${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>
Index: head/japanese/font-ricty/pkg-plist
===================================================================
--- head/japanese/font-ricty/pkg-plist	(revision 381878)
+++ head/japanese/font-ricty/pkg-plist	(revision 381879)
@@ -1,21 +1,16 @@
 %%RICTY%%%%DATADIR%%/Ricty-Bold.ttf
 %%RICTY%%%%DATADIR%%/Ricty-Regular.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf
-%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf
-%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf
-%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
-%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
 %%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf
 %%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf
 %%RICTY%%etc/fonts/conf.d/20-unhint-ricty.conf
 %%RICTY%%etc/fonts/conf.d/62-fonts-ricty.conf
 %%DISCORD%%etc/fonts/conf.avail/20-unhint-rictydiscord.conf
 %%DISCORD%%etc/fonts/conf.avail/62-fonts-rictydiscord.conf
 %%DISCORD%%etc/fonts/conf.d/20-unhint-rictydiscord.conf
 %%DISCORD%%etc/fonts/conf.d/62-fonts-rictydiscord.conf
-%%RICTY%%%%X_FONTSDIR%%/TTF/Ricty-Bold.ttf
-%%RICTY%%%%X_FONTSDIR%%/TTF/Ricty-Regular.ttf
-%%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
-%%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%RICTY%%%%FONTSDIR%%/Ricty-Bold.ttf
+%%RICTY%%%%FONTSDIR%%/Ricty-Regular.ttf
+%%DISCORD%%%%FONTSDIR%%/RictyDiscord-Bold.ttf
+%%DISCORD%%%%FONTSDIR%%/RictyDiscord-Regular.ttf