- Update to 3.2.4 [1]

- Drop @dirrm* from pkg-plist [1]
- Drop redundant post-install [2]
- Only remove fonts.dir lines belonging to the port [2]
- Avoid writing under ~/.config/fontforge during build [2]

PR:		195845
Differential Revision:	https://reviews.freebsd.org/D1745
Submitted by:	Koichiro IWAO (maintainer) [1]
Approved by:	Koichiro IWAO (maintainer) [2]
Approved by:	bapt (mentor)

4 files changed, 7 insertions, 16 deletions

diff --git a/japanese/font-ricty/Makefile b/japanese/font-ricty/Makefile
index 545bfd63d36e..edb60ddafb1f 100644
--- a/japanese/font-ricty/Makefile
+++ b/japanese/font-ricty/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ricty
-PORTVERSION=	3.2.3
-PORTREVISION=	1
+PORTVERSION=	3.2.4
 CATEGORIES=	japanese x11-fonts
 PKGNAMEPREFIX=	ja-font-
 
@@ -18,9 +17,8 @@ BUILD_DEPENDS=	${LOCALBASE}/${X_FONTSDIR}/OTF/Inconsolata.otf:${PORTSDIR}/x11-fo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yascentur
-GH_COMMIT=	${GH_TAGNAME}
 GH_PROJECT=	Ricty
-GH_TAGNAME=	0fd7047
+GH_COMMIT=	c22daa9
 
 NO_PACKAGE=	redistribution is not allowed
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -55,7 +53,7 @@ RUN_DEPENDS+=	${DATADIR}/RictyDiscord-Regular.ttf:${PORTSDIR}/japanese/font-rict
 .endif
 
 do-build:
-	cd ${WRKSRC} &&\
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${SH} ${WRKSRC}/ricty_generator.sh \
 			${PREFIX}/${X_FONTSDIR}/OTF/Inconsolata.otf \
 			${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-regular.ttf \
@@ -99,8 +97,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-post-install:
-	${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF
-	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include <bsd.port.mk>
diff --git a/japanese/font-ricty/distinfo b/japanese/font-ricty/distinfo
index e9809f7a4f65..96cdd31e5a8e 100644
--- a/japanese/font-ricty/distinfo
+++ b/japanese/font-ricty/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ricty-3.2.3.tar.gz) = cd51e941c59a13a5b42302e5b135db7fead06ddf69ca700453bf16a4eeadb95d
-SIZE (ricty-3.2.3.tar.gz) = 14708
+SHA256 (ricty-3.2.4.tar.gz) = c226ace2933bdf15b31318298486c494e0e53f422b91feb09ae5ec56d51ed9b4
+SIZE (ricty-3.2.4.tar.gz) = 256833
diff --git a/japanese/font-ricty/files/pkg-install.in b/japanese/font-ricty/files/pkg-install.in
index 735b741eda0a..69d6bb12c68b 100644
--- a/japanese/font-ricty/files/pkg-install.in
+++ b/japanese/font-ricty/files/pkg-install.in
@@ -7,7 +7,8 @@ catfontsdir ()
     while read _IN
     do
       case "${_IN}" in
-      *-Ricty*) ;;
+%%RICTY%%   *-Ricty-*) ;;
+%%DISCORD%% *-Ricty\ Discord-*) ;;
       *)       echo ${_IN} ;;
       esac
     done
diff --git a/japanese/font-ricty/pkg-plist b/japanese/font-ricty/pkg-plist
index ba1e335a0e12..bd580393f3a4 100644
--- a/japanese/font-ricty/pkg-plist
+++ b/japanese/font-ricty/pkg-plist
@@ -2,13 +2,10 @@
 %%RICTY%%%%DATADIR%%/Ricty-Regular.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf
-@dirrm %%DATADIR%%
 %%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
-@dirrmtry %%LOCAL_FONTSDIR%%/TTF
-@dirrmtry %%LOCAL_FONTSDIR%%
 %%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
@@ -22,4 +19,3 @@
 %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
 %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
 @fc %%X_FONTSDIR%%/TTF
-@dirrmtry %%X_FONTSDIR%%/TTF