diff --git a/japanese/font-nasu/Makefile b/japanese/font-nasu/Makefile
index c0b7ac07c953..327b58218c33 100644
--- a/japanese/font-nasu/Makefile
+++ b/japanese/font-nasu/Makefile
@@ -1,44 +1,46 @@
 PORTNAME=	nasu
-PORTVERSION=	20141215
-PORTREVISION=	3
+PORTVERSION=	20200227
+#PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	OSDN_CHAMBER/7/7587
+MASTER_SITES=	OSDN_CHAMBER/25/25473
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	NasuFont-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Nasu Japanese TrueType fonts
 
 LICENSE=	APACHE20
 
 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
+SUB_LIST=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 WRKSRC=		${WRKDIR}/${DISTNAME:C/-//}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
 	${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
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! -name *\.ttf"
 
 .include <bsd.port.mk>
diff --git a/japanese/font-nasu/distinfo b/japanese/font-nasu/distinfo
index 71b41562a510..4cc1fac9976d 100644
--- a/japanese/font-nasu/distinfo
+++ b/japanese/font-nasu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465701479
-SHA256 (NasuFont-20141215.zip) = bacdb09369d841cc0203f292602622828677136e7765eeb8709ba2286e33e3b0
-SIZE (NasuFont-20141215.zip) = 12091492
+TIMESTAMP = 1617798697
+SHA256 (NasuFont-20200227.zip) = 93293e895342c46e8f1484cf717294f318fc4fd406e79e6163497989aa975a36
+SIZE (NasuFont-20200227.zip) = 12367344
diff --git a/japanese/font-nasu/files/pkg-install.in b/japanese/font-nasu/files/pkg-install.in
index 419e564c231b..bbbd7a3043f0 100644
--- a/japanese/font-nasu/files/pkg-install.in
+++ b/japanese/font-nasu/files/pkg-install.in
@@ -1,104 +1,104 @@
 #!/bin/sh
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
       *-adobe-nasu-*|*-adobe-nasum-*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
     done
 }
 
 ROMA=""
 BOLD="ds=y"
 ITAL="ai=0.15"
 OBLI="ai=0.15"
 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 \
 		${ITAL} ${_weight}-i \
 		${OBLI}	${_weight}-o \
 		${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 Nasu-Regular-20141215.ttf adobe "nasu" p medium
-		make_xlfd $ENC Nasu-Bold-20141215.ttf adobe "nasu" p bold
-		make_xlfd $ENC NasuM-Regular-20141215.ttf adobe "nasum" m medium
-		make_xlfd $ENC NasuM-Bold-20141215.ttf adobe "nasum" m bold
+		make_xlfd $ENC Nasu-Regular-%%PORTVERSION%%.ttf adobe "nasu" p medium
+		make_xlfd $ENC Nasu-Bold-%%PORTVERSION%%.ttf adobe "nasu" p bold
+		make_xlfd $ENC NasuM-Regular-%%PORTVERSION%%.ttf adobe "nasum" m medium
+		make_xlfd $ENC NasuM-Bold-%%PORTVERSION%%.ttf adobe "nasum" 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-nasu/pkg-plist b/japanese/font-nasu/pkg-plist
index 419ca1f40514..f7b4ee67c034 100644
--- a/japanese/font-nasu/pkg-plist
+++ b/japanese/font-nasu/pkg-plist
@@ -1,8 +1,8 @@
 etc/fonts/conf.avail/20-unhint-nasu.conf
 etc/fonts/conf.avail/62-fonts-nasu.conf
 etc/fonts/conf.d/20-unhint-nasu.conf
 etc/fonts/conf.d/62-fonts-nasu.conf
-%%FONTSDIR%%/Nasu-Bold-20141215.ttf
-%%FONTSDIR%%/Nasu-Regular-20141215.ttf
-%%FONTSDIR%%/NasuM-Bold-20141215.ttf
-%%FONTSDIR%%/NasuM-Regular-20141215.ttf
+%%FONTSDIR%%/Nasu-Bold-%%PORTVERSION%%.ttf
+%%FONTSDIR%%/Nasu-Regular-%%PORTVERSION%%.ttf
+%%FONTSDIR%%/NasuM-Bold-%%PORTVERSION%%.ttf
+%%FONTSDIR%%/NasuM-Regular-%%PORTVERSION%%.ttf