diff --git a/japanese/font-hackgen-nerd/Makefile b/japanese/font-hackgen-nerd/Makefile
index 2e8a239e64ca..66de2e61ba6f 100644
--- a/japanese/font-hackgen-nerd/Makefile
+++ b/japanese/font-hackgen-nerd/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	hackgen-nerd
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	https://github.com/yuru7/HackGen/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	HackGenNerd_v${DISTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	HackGenNerd is a composite font of Hack and GenJyuu-Gothic
 
 LICENSE=	OFL11
 
 USES=		fonts:fc zip
 FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 OPTIONS_MULTI=			FONT_FAMILY
 OPTIONS_MULTI_FONT_FAMILY=	HACKGENERD HACKGENERD_CONS HACKGEN35NERD HACKGEN35NERD_CONS
 OPTIONS_DEFAULT=		HACKGENERD HACKGENERD_CONS HACKGEN35NERD HACKGEN35NERD_CONS
 OPTIONS_SUB=			yes
 HACKGENERD_DESC=			HackGenNerd
 HACKGENERD_CONS_DESC=		HackGenNerd Console
 HACKGEN35NERD_DESC=			HackGen35Nerd
 HACKGEN35NERD_CONS_DESC=		HackGen35Nerd Console
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHACKGENERD}
 HACKGEN_FONTS+=	HackGenNerd-Regular HackGenNerd-Bold
 .endif
 .if ${PORT_OPTIONS:MHACKGENERD_CONS}
 HACKGEN_FONTS+=	HackGenNerdConsole-Regular HackGenNerdConsole-Bold
 .endif
 .if ${PORT_OPTIONS:MHACKGEN35NERD}
 HACKGEN_FONTS+=	HackGen35Nerd-Regular HackGen35Nerd-Bold
 .endif
 .if ${PORT_OPTIONS:MHACKGEN35NERD_CONS}
 HACKGEN_FONTS+=	HackGen35NerdConsole-Regular HackGen35NerdConsole-Bold
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for FONT in ${HACKGEN_FONTS}
 	${INSTALL_DATA} ${WRKSRC}/${FONT}.ttf ${STAGEDIR}${FONTSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \
 	    ${FILESDIR}/62-fonts-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
 	${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf
 
 .include <bsd.port.mk>
diff --git a/japanese/font-hackgen-nerd/distinfo b/japanese/font-hackgen-nerd/distinfo
index 047ccc4aab4d..5dcdef46fa10 100644
--- a/japanese/font-hackgen-nerd/distinfo
+++ b/japanese/font-hackgen-nerd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626492607
-SHA256 (HackGenNerd_v2.4.0.zip) = 4e2c66e8739c10b5f8f0535ab615c3de4ede6fd292c713e74897cf1fc433bc09
-SIZE (HackGenNerd_v2.4.0.zip) = 44032715
+TIMESTAMP = 1627908474
+SHA256 (HackGenNerd_v2.4.1.zip) = 90e7de7516ba044420362c59240f02986ebd85bf8b3aafcac98bce2a41e3b06e
+SIZE (HackGenNerd_v2.4.1.zip) = 44034925
diff --git a/japanese/font-hackgen-nerd/files/pkg-install.in b/japanese/font-hackgen-nerd/files/pkg-install.in
index 4d81d2f01d04..361b0b0c62c6 100644
--- a/japanese/font-hackgen-nerd/files/pkg-install.in
+++ b/japanese/font-hackgen-nerd/files/pkg-install.in
@@ -1,104 +1,104 @@
 #!/bin/sh
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
-      *-misc-hackgen*-*|[0-9]*|"") ;;
+      *-misc-hackgen*nerd*-*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
     done
 }
 
 ROMA=""
 BOLD="ds=y"
 RITA="ai=0.08"
 ROBL="ai=0.08"
 
 make_xlfd()
 {
 	_enc=$1
 	_file=$2
 	_vendor=$3
 	_fname=$4
 	_poc=$5
 	_weight=$6
 
 	case "${_poc}:${_enc}" in
 	p:jisx0201.1976-*)	PFIX="bw=0.5" ;;
 	c:jisx0201.1976-*)	PFIX="bw=0.5" ;;
 	p:*)			PFIX="" ;;
 	c:*)			PFIX="" ;;
 	esac
 
 	set --	""	${_weight}-r \
 		${RITA}	${_weight}-ri \
 		${ROBL}	${_weight}-ro
 	while [ $# != 0 ]; do
 		_prefix="${PFIX}:$1"; shift
 		_variant=$1; shift
 		[ ${index_type} = "scale" -a ${_prefix} != ":" ] && continue
 		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 jisx0208.1997-0 jisx0213.2004-1
 	do
-		make_xlfd $ENC HackGen-Regular.ttf misc "hackgen" m medium
-		make_xlfd $ENC HackGen-Bold.ttf misc "hackgen" m bold
-		make_xlfd $ENC HackGenConsole-Regular.ttf misc "hackgenconsole" m medium
-		make_xlfd $ENC HackGenConsole-Bold.ttf misc "hackgenconsole" m bold
-		make_xlfd $ENC HackGen35-Regular.ttf misc "hackgen35" m medium
-		make_xlfd $ENC HackGen35-Bold.ttf misc "hackgen35" m bold
-		make_xlfd $ENC HackGen35Console-Regular.ttf misc "hackgen35console" m medium
-		make_xlfd $ENC HackgEn35Console-Bold.ttf misc "hackgen35console" m bold
+		make_xlfd $ENC HackGenNerd-Regular.ttf misc "hackgennerd" m medium
+		make_xlfd $ENC HackGenNerd-Bold.ttf misc "hackgennerd" m bold
+		make_xlfd $ENC HackGenNerdConsole-Regular.ttf misc "hackgennerdconsole" m medium
+		make_xlfd $ENC HackGenNerdConsole-Bold.ttf misc "hackgennerdconsole" m bold
+		make_xlfd $ENC HackGen35Nerd-Regular.ttf misc "hackgen35nerd" m medium
+		make_xlfd $ENC HackGen35Nerd-Bold.ttf misc "hackgen35nerd" m bold
+		make_xlfd $ENC HackGen35NerdConsole-Regular.ttf misc "hackgen35nerdconsole" m medium
+		make_xlfd $ENC HackgEn35NerdConsole-Bold.ttf misc "hackgen35nerdconsole" m bold
 	done
 }
 
 nfonts()
 {
     _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
 }
 
 install_fontsdir()
 {
 	index_type=${1:-"dir"}
 	index="fonts.${index_type}"
 	tmpfile="${index}.tmp"
 	touch ${index}
 	(catfontsdir < ${index}; addentries ${index_type}) > ${tmpfile}
 	nfonts < ${tmpfile} > ${index}
 	cat ${tmpfile} >> ${index}
 	rm -f ${tmpfile}
 }
 
 deinstall_fontsdir()
 {
 	index_type=${1:-"dir"}
 	index="fonts.${index_type}"
 	tmpfile="${index}.tmp"
 	catfontsdir < ${index} > ${tmpfile}
 	nfonts < ${tmpfile} > ${index}
 	cat ${tmpfile} >> ${index}
 	rm -f ${tmpfile}
 	if [ -r ${index} -a $(wc -l < ${index}) = 1 ]; then
 		rm -f ${index}
 	fi
 }
 
 case "$2" in
 POST-INSTALL)
 	cd %%FONTSDIR%%
 	install_fontsdir dir
 	install_fontsdir scale
 	;;
 POST-DEINSTALL)
 	cd %%FONTSDIR%%
 	deinstall_fontsdir dir
 	deinstall_fontsdir scale
 	;;
 esac
diff --git a/japanese/font-hackgen/Makefile b/japanese/font-hackgen/Makefile
index e22b60ef7131..5ffe20c2b38d 100644
--- a/japanese/font-hackgen/Makefile
+++ b/japanese/font-hackgen/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	hackgen
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	https://github.com/yuru7/HackGen/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	HackGen_v${DISTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	HackGen is a composite font of Hack and GenJyuu-Gothic
 
 LICENSE=	OFL11
 
 USES=		fonts:fc zip
 FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 OPTIONS_MULTI=			FONT_FAMILY
 OPTIONS_MULTI_FONT_FAMILY=	HACKGEN HACKGEN_CONS HACKGEN35 HACKGEN35_CONS
 OPTIONS_DEFAULT=		HACKGEN HACKGEN_CONS HACKGEN35 HACKGEN35_CONS
 OPTIONS_SUB=			yes
 HACKGEN_DESC=			HackGen
 HACKGEN_CONS_DESC=		HackGen Console
 HACKGEN35_DESC=			HackGen35
 HACKGEN35_CONS_DESC=		HackGen35 Console
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHACKGEN}
 HACKGEN_FONTS+=	HackGen-Regular HackGen-Bold
 .endif
 .if ${PORT_OPTIONS:MHACKGEN_CONS}
 HACKGEN_FONTS+=	HackGenConsole-Regular HackGenConsole-Bold
 .endif
 .if ${PORT_OPTIONS:MHACKGEN35}
 HACKGEN_FONTS+=	HackGen35-Regular HackGen35-Bold
 .endif
 .if ${PORT_OPTIONS:MHACKGEN35_CONS}
 HACKGEN_FONTS+=	HackGen35Console-Regular HackGen35Console-Bold
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for FONT in ${HACKGEN_FONTS}
 	${INSTALL_DATA} ${WRKSRC}/${FONT}.ttf ${STAGEDIR}${FONTSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \
 	    ${FILESDIR}/62-fonts-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
 	${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf
 
 .include <bsd.port.mk>
diff --git a/japanese/font-hackgen/distinfo b/japanese/font-hackgen/distinfo
index 309deb25dbfc..6a2625ea7b02 100644
--- a/japanese/font-hackgen/distinfo
+++ b/japanese/font-hackgen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626492523
-SHA256 (HackGen_v2.4.0.zip) = 96af1e091e1540b97ad8829a6c1b80a24fb2aa1763f5a6f69365683eaf4d7220
-SIZE (HackGen_v2.4.0.zip) = 40449121
+TIMESTAMP = 1627908199
+SHA256 (HackGen_v2.4.1.zip) = dde9fd6fcbdcb206a6dceac717894c5dfbd00d59e5938ce3dd1b61c4c23d0afa
+SIZE (HackGen_v2.4.1.zip) = 40449091
diff --git a/japanese/font-hackgen/files/pkg-install.in b/japanese/font-hackgen/files/pkg-install.in
index 4d81d2f01d04..5e5e8d76dc92 100644
--- a/japanese/font-hackgen/files/pkg-install.in
+++ b/japanese/font-hackgen/files/pkg-install.in
@@ -1,104 +1,104 @@
 #!/bin/sh
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
-      *-misc-hackgen*-*|[0-9]*|"") ;;
+      *-misc-hackgen(|35)(|console)-*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
     done
 }
 
 ROMA=""
 BOLD="ds=y"
 RITA="ai=0.08"
 ROBL="ai=0.08"
 
 make_xlfd()
 {
 	_enc=$1
 	_file=$2
 	_vendor=$3
 	_fname=$4
 	_poc=$5
 	_weight=$6
 
 	case "${_poc}:${_enc}" in
 	p:jisx0201.1976-*)	PFIX="bw=0.5" ;;
 	c:jisx0201.1976-*)	PFIX="bw=0.5" ;;
 	p:*)			PFIX="" ;;
 	c:*)			PFIX="" ;;
 	esac
 
 	set --	""	${_weight}-r \
 		${RITA}	${_weight}-ri \
 		${ROBL}	${_weight}-ro
 	while [ $# != 0 ]; do
 		_prefix="${PFIX}:$1"; shift
 		_variant=$1; shift
 		[ ${index_type} = "scale" -a ${_prefix} != ":" ] && continue
 		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 jisx0208.1997-0 jisx0213.2004-1
 	do
 		make_xlfd $ENC HackGen-Regular.ttf misc "hackgen" m medium
 		make_xlfd $ENC HackGen-Bold.ttf misc "hackgen" m bold
 		make_xlfd $ENC HackGenConsole-Regular.ttf misc "hackgenconsole" m medium
 		make_xlfd $ENC HackGenConsole-Bold.ttf misc "hackgenconsole" m bold
 		make_xlfd $ENC HackGen35-Regular.ttf misc "hackgen35" m medium
 		make_xlfd $ENC HackGen35-Bold.ttf misc "hackgen35" m bold
 		make_xlfd $ENC HackGen35Console-Regular.ttf misc "hackgen35console" m medium
 		make_xlfd $ENC HackgEn35Console-Bold.ttf misc "hackgen35console" m bold
 	done
 }
 
 nfonts()
 {
     _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
 }
 
 install_fontsdir()
 {
 	index_type=${1:-"dir"}
 	index="fonts.${index_type}"
 	tmpfile="${index}.tmp"
 	touch ${index}
 	(catfontsdir < ${index}; addentries ${index_type}) > ${tmpfile}
 	nfonts < ${tmpfile} > ${index}
 	cat ${tmpfile} >> ${index}
 	rm -f ${tmpfile}
 }
 
 deinstall_fontsdir()
 {
 	index_type=${1:-"dir"}
 	index="fonts.${index_type}"
 	tmpfile="${index}.tmp"
 	catfontsdir < ${index} > ${tmpfile}
 	nfonts < ${tmpfile} > ${index}
 	cat ${tmpfile} >> ${index}
 	rm -f ${tmpfile}
 	if [ -r ${index} -a $(wc -l < ${index}) = 1 ]; then
 		rm -f ${index}
 	fi
 }
 
 case "$2" in
 POST-INSTALL)
 	cd %%FONTSDIR%%
 	install_fontsdir dir
 	install_fontsdir scale
 	;;
 POST-DEINSTALL)
 	cd %%FONTSDIR%%
 	deinstall_fontsdir dir
 	deinstall_fontsdir scale
 	;;
 esac