Index: head/japanese/font-cica/Makefile
===================================================================
--- head/japanese/font-cica/Makefile	(revision 464596)
+++ head/japanese/font-cica/Makefile	(revision 464597)
@@ -1,48 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	cica
 PORTVERSION=	2.1.0
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	https://github.com/miiton/Cica/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	Cica_v${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cica Japanese monospaced fonts for programming
 
 USES=		fonts:fc zip
 FONTNAME=	cica
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 WRKSRC=		${WRKDIR}/${DISTNAME}
 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-${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
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -name Cica-Bold.ttf \
 		-o -name Cica-BoldItalic.ttf \
 		-o -name Cica-Regular.ttf \
 		-o -name Cica-RegularItalic.ttf )"
 
 .include <bsd.port.mk>
Index: head/japanese/font-cica/files/pkg-install.in
===================================================================
--- head/japanese/font-cica/files/pkg-install.in	(revision 464596)
+++ head/japanese/font-cica/files/pkg-install.in	(revision 464597)
@@ -1,108 +1,108 @@
 #!/bin/sh
 # $FreeBSD$
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
       *-adobe-cica-*|[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,^:,,'
 
 	_prefix="${PFIX}:"
 	[ ${index_type} = "scale" -a ${_prefix} != ":" ] && return
 	_file=$(echo $_file | sed -e 's,\.ttf$,Italic&,')
 	for _variant in ${_weight}-i ${_weight}-o; do
 		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
 		       $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc
 		[ ${index_type} = "scale" ] && break
 	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 Cica-Regular.ttf adobe "cica" c medium
-		make_xlfd $ENC Cica-Bold.ttf adobe "cica" c bold
+		make_xlfd $ENC Cica-Regular.ttf adobe "cica" m medium
+		make_xlfd $ENC Cica-Bold.ttf adobe "cica" 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
Index: head/japanese/font-genjyuugothic/Makefile
===================================================================
--- head/japanese/font-genjyuugothic/Makefile	(revision 464596)
+++ head/japanese/font-genjyuugothic/Makefile	(revision 464597)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	genjyuugothic
 PORTVERSION=	20150607
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP/users/8/8636
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	GenJyuuGothic Japanese TrueType fonts
 
 LICENSE=	OFL11
 
 USES=		7z fonts:fc
 FONTNAME=	${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 NO_WRKSUBDIR=	yes
 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-${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
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! -name *\.ttf"
 
 .include <bsd.port.mk>
Index: head/japanese/font-genjyuugothic/files/pkg-install.in
===================================================================
--- head/japanese/font-genjyuugothic/files/pkg-install.in	(revision 464596)
+++ head/japanese/font-genjyuugothic/files/pkg-install.in	(revision 464597)
@@ -1,124 +1,124 @@
 #!/bin/sh
 # $FreeBSD$
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
       *"-adobe-gen jyuu gothic"*|[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} GenJyuuGothic-ExtraLight.ttf adobe "gen jyuu gothic" p thin
 		make_xlfd ${ENC} GenJyuuGothic-Light.ttf adobe "gen jyuu gothic" p extralight
 		make_xlfd ${ENC} GenJyuuGothic-Normal.ttf adobe "gen jyuu gothic" p light
 		make_xlfd ${ENC} GenJyuuGothic-Regular.ttf adobe "gen jyuu gothic" p book
 		make_xlfd ${ENC} GenJyuuGothic-Medium.ttf adobe "gen jyuu gothic" p medium
 		make_xlfd ${ENC} GenJyuuGothic-Bold.ttf adobe "gen jyuu gothic" p bold
 		make_xlfd ${ENC} GenJyuuGothic-Heavy.ttf adobe "gen jyuu gothic" p black
 
 		make_xlfd ${ENC} GenJyuuGothic-P-ExtraLight.ttf adobe "gen jyuu gothic p" p thin
 		make_xlfd ${ENC} GenJyuuGothic-P-Light.ttf adobe "gen jyuu gothic p" p extralight
 		make_xlfd ${ENC} GenJyuuGothic-P-Normal.ttf adobe "gen jyuu gothic p" p light
 		make_xlfd ${ENC} GenJyuuGothic-P-Regular.ttf adobe "gen jyuu gothic p" p book
 		make_xlfd ${ENC} GenJyuuGothic-P-Medium.ttf adobe "gen jyuu gothic p" p medium
 		make_xlfd ${ENC} GenJyuuGothic-P-Bold.ttf adobe "gen jyuu gothic p" p bold
 		make_xlfd ${ENC} GenJyuuGothic-P-Heavy.ttf adobe "gen jyuu gothic p" p black
 
-		make_xlfd ${ENC} GenJyuuGothic-Monospace-ExtraLight.ttf adobe "gen jyuu gothic monospace" c thin
-		make_xlfd ${ENC} GenJyuuGothic-Monospace-Light.ttf adobe "gen jyuu gothic monospace" c extralight
-		make_xlfd ${ENC} GenJyuuGothic-Monospace-Normal.ttf adobe "gen jyuu gothic monospace" c light
-		make_xlfd ${ENC} GenJyuuGothic-Monospace-Regular.ttf adobe "gen jyuu gothic monospace" c book
-		make_xlfd ${ENC} GenJyuuGothic-Monospace-Medium.ttf adobe "gen jyuu gothic monospace" c medium
-		make_xlfd ${ENC} GenJyuuGothic-Monospace-Bold.ttf adobe "gen jyuu gothic monospace" c bold
-		make_xlfd ${ENC} GenJyuuGothic-Monospace-Heavy.ttf adobe "gen jyuu gothic monospace" c black
+		make_xlfd ${ENC} GenJyuuGothic-Monospace-ExtraLight.ttf adobe "gen jyuu gothic monospace" m thin
+		make_xlfd ${ENC} GenJyuuGothic-Monospace-Light.ttf adobe "gen jyuu gothic monospace" m extralight
+		make_xlfd ${ENC} GenJyuuGothic-Monospace-Normal.ttf adobe "gen jyuu gothic monospace" m light
+		make_xlfd ${ENC} GenJyuuGothic-Monospace-Regular.ttf adobe "gen jyuu gothic monospace" m book
+		make_xlfd ${ENC} GenJyuuGothic-Monospace-Medium.ttf adobe "gen jyuu gothic monospace" m medium
+		make_xlfd ${ENC} GenJyuuGothic-Monospace-Bold.ttf adobe "gen jyuu gothic monospace" m bold
+		make_xlfd ${ENC} GenJyuuGothic-Monospace-Heavy.ttf adobe "gen jyuu gothic monospace" m black
 	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
Index: head/japanese/font-genshingothic/Makefile
===================================================================
--- head/japanese/font-genshingothic/Makefile	(revision 464596)
+++ head/japanese/font-genshingothic/Makefile	(revision 464597)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	genshingothic
 PORTVERSION=	20150607
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP/users/8/8634
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	GenShinGothic Japanese TrueType fonts
 
 LICENSE=	OFL11
 
 USES=		7z fonts:fc
 FONTNAME=	${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 NO_WRKSUBDIR=	yes
 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-${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
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! -name *\.ttf"
 
 .include <bsd.port.mk>
Index: head/japanese/font-genshingothic/files/pkg-install.in
===================================================================
--- head/japanese/font-genshingothic/files/pkg-install.in	(revision 464596)
+++ head/japanese/font-genshingothic/files/pkg-install.in	(revision 464597)
@@ -1,124 +1,124 @@
 #!/bin/sh
 # $FreeBSD$
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
       *"-adobe-gen shin gothic"*|[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} GenShinGothic-ExtraLight.ttf adobe "gen shin gothic" p thin
 		make_xlfd ${ENC} GenShinGothic-Light.ttf adobe "gen shin gothic" p extralight
 		make_xlfd ${ENC} GenShinGothic-Normal.ttf adobe "gen shin gothic" p light
 		make_xlfd ${ENC} GenShinGothic-Regular.ttf adobe "gen shin gothic" p book
 		make_xlfd ${ENC} GenShinGothic-Medium.ttf adobe "gen shin gothic" p medium
 		make_xlfd ${ENC} GenShinGothic-Bold.ttf adobe "gen shin gothic" p bold
 		make_xlfd ${ENC} GenShinGothic-Heavy.ttf adobe "gen shin gothic" p black
 
 		make_xlfd ${ENC} GenShinGothic-P-ExtraLight.ttf adobe "gen shin gothic p" p thin
 		make_xlfd ${ENC} GenShinGothic-P-Light.ttf adobe "gen shin gothic p" p extralight
 		make_xlfd ${ENC} GenShinGothic-P-Normal.ttf adobe "gen shin gothic p" p light
 		make_xlfd ${ENC} GenShinGothic-P-Regular.ttf adobe "gen shin gothic p" p book
 		make_xlfd ${ENC} GenShinGothic-P-Medium.ttf adobe "gen shin gothic p" p medium
 		make_xlfd ${ENC} GenShinGothic-P-Bold.ttf adobe "gen shin gothic p" p bold
 		make_xlfd ${ENC} GenShinGothic-P-Heavy.ttf adobe "gen shin gothic p" p black
 
-		make_xlfd ${ENC} GenShinGothic-Monospace-ExtraLight.ttf adobe "gen shin gothic monospace" c thin
-		make_xlfd ${ENC} GenShinGothic-Monospace-Light.ttf adobe "gen shin gothic monospace" c extralight
-		make_xlfd ${ENC} GenShinGothic-Monospace-Normal.ttf adobe "gen shin gothic monospace" c light
-		make_xlfd ${ENC} GenShinGothic-Monospace-Regular.ttf adobe "gen shin gothic monospace" c book
-		make_xlfd ${ENC} GenShinGothic-Monospace-Medium.ttf adobe "gen shin gothic monospace" c medium
-		make_xlfd ${ENC} GenShinGothic-Monospace-Bold.ttf adobe "gen shin gothic monospace" c bold
-		make_xlfd ${ENC} GenShinGothic-Monospace-Heavy.ttf adobe "gen shin gothic monospace" c black
+		make_xlfd ${ENC} GenShinGothic-Monospace-ExtraLight.ttf adobe "gen shin gothic monospace" m thin
+		make_xlfd ${ENC} GenShinGothic-Monospace-Light.ttf adobe "gen shin gothic monospace" m extralight
+		make_xlfd ${ENC} GenShinGothic-Monospace-Normal.ttf adobe "gen shin gothic monospace" m light
+		make_xlfd ${ENC} GenShinGothic-Monospace-Regular.ttf adobe "gen shin gothic monospace" m book
+		make_xlfd ${ENC} GenShinGothic-Monospace-Medium.ttf adobe "gen shin gothic monospace" m medium
+		make_xlfd ${ENC} GenShinGothic-Monospace-Bold.ttf adobe "gen shin gothic monospace" m bold
+		make_xlfd ${ENC} GenShinGothic-Monospace-Heavy.ttf adobe "gen shin gothic monospace" m black
 	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
Index: head/japanese/font-mgenplus/Makefile
===================================================================
--- head/japanese/font-mgenplus/Makefile	(revision 464596)
+++ head/japanese/font-mgenplus/Makefile	(revision 464597)
@@ -1,105 +1,105 @@
 # $FreeBSD$
 
 PORTNAME=	mgenplus
 PORTVERSION=	20150602
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP/users/8/8597
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Mgen+ Japanese TrueType fonts
 
 LICENSE=	OFL11
 
 USES=		7z fonts:fc
 FONTNAME=	${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 NO_WRKSUBDIR=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_MULTI=			FONT_FAMILY
 OPTIONS_MULTI_FONT_FAMILY=	MGENPLUS_1C MGENPLUS_1CP MGENPLUS_1M \
 				MGENPLUS_1MN MGENPLUS_1P MGENPLUS_1PP \
 				MGENPLUS_2C MGENPLUS_2CP MGENPLUS_2M \
 				MGENPLUS_2P MGENPLUS_2PP
 OPTIONS_DEFAULT=		MGENPLUS_1C MGENPLUS_1CP MGENPLUS_1M \
 				MGENPLUS_1MN MGENPLUS_1P MGENPLUS_1PP \
 				MGENPLUS_2C MGENPLUS_2CP MGENPLUS_2M \
 				MGENPLUS_2P MGENPLUS_2PP
 OPTIONS_SUB=			yes
 MGENPLUS_1C_DESC=		Mgen+ 1c
 MGENPLUS_1CP_DESC=		Mgen+ 1cp
 MGENPLUS_1M_DESC=		Mgen+ 1m
 MGENPLUS_1MN_DESC=		Mgen+ 1mn
 MGENPLUS_1P_DESC=		Mgen+ 1p
 MGENPLUS_1PP_DESC=		Mgen+ 1pp
 MGENPLUS_2C_DESC=		Mgen+ 2c
 MGENPLUS_2CP_DESC=		Mgen+ 2cp
 MGENPLUS_2M_DESC=		Mgen+ 2m
 MGENPLUS_2P_DESC=		Mgen+ 2p
 MGENPLUS_2PP_DESC=		Mgen+ 2pp
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMGENPLUS_1C}
 FAMILY=	1c
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_1CP}
 FAMILY+=1cp
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_1M}
 FAMILY+=1m
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_1MN}
 FAMILY+=1mn
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_1P}
 FAMILY+=1p
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_1PP}
 FAMILY+=1pp
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_2C}
 FAMILY+=2c
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_2CP}
 FAMILY+=2cp
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_2M}
 FAMILY+=2m
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_2P}
 FAMILY+=2p
 .endif
 .if ${PORT_OPTIONS:MMGENPLUS_2PP}
 FAMILY+=2pp
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for FAM in ${FAMILY}
 	${INSTALL_DATA} ${WRKSRC}/mgenplus-${FAM}-*.ttf \
 	    ${STAGEDIR}${FONTSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${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
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! -name *\.ttf"
 
 .include <bsd.port.mk>
Index: head/japanese/font-mgenplus/files/pkg-install.in
===================================================================
--- head/japanese/font-mgenplus/files/pkg-install.in	(revision 464596)
+++ head/japanese/font-mgenplus/files/pkg-install.in	(revision 464597)
@@ -1,121 +1,121 @@
 #!/bin/sh
 # $FreeBSD$
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
       *"-adobe-mgen+"*|[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
 
 	[ -r ${_file} ] || return
 
 	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
 		for FAM in 1c 1cp 1p 1pp 2c 2cp 2p 2pp
 		do
 			make_xlfd ${ENC} mgenplus-${FAM}-black.ttf adobe "mgen+ ${FAM}" p black
 			make_xlfd ${ENC} mgenplus-${FAM}-bold.ttf adobe "mgen+ ${FAM}" p bold
 			make_xlfd ${ENC} mgenplus-${FAM}-heavy.ttf adobe "mgen+ ${FAM}" p extrabold
 			make_xlfd ${ENC} mgenplus-${FAM}-light.ttf adobe "mgen+ ${FAM}" p extralight
 			make_xlfd ${ENC} mgenplus-${FAM}-medium.ttf adobe "mgen+ ${FAM}" p medium
 			make_xlfd ${ENC} mgenplus-${FAM}-regular.ttf adobe "mgen+ ${FAM}" p book
 			make_xlfd ${ENC} mgenplus-${FAM}-thin.ttf adobe "mgen+ ${FAM}" p thin
 		done
 		for FAM in 1m 1mn 2m
 		do
-			make_xlfd ${ENC} mgenplus-${FAM}-bold.ttf adobe "mgen+ ${FAM}" c bold
-			make_xlfd ${ENC} mgenplus-${FAM}-light.ttf adobe "mgen+ ${FAM}" c extralight
-			make_xlfd ${ENC} mgenplus-${FAM}-medium.ttf adobe "mgen+ ${FAM}" c medium
-			make_xlfd ${ENC} mgenplus-${FAM}-regular.ttf adobe "mgen+ ${FAM}" c book
-			make_xlfd ${ENC} mgenplus-${FAM}-thin.ttf adobe "mgen+ ${FAM}" c thin
+			make_xlfd ${ENC} mgenplus-${FAM}-bold.ttf adobe "mgen+ ${FAM}" m bold
+			make_xlfd ${ENC} mgenplus-${FAM}-light.ttf adobe "mgen+ ${FAM}" m extralight
+			make_xlfd ${ENC} mgenplus-${FAM}-medium.ttf adobe "mgen+ ${FAM}" m medium
+			make_xlfd ${ENC} mgenplus-${FAM}-regular.ttf adobe "mgen+ ${FAM}" m book
+			make_xlfd ${ENC} mgenplus-${FAM}-thin.ttf adobe "mgen+ ${FAM}" m thin
 		done
 	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
Index: head/japanese/font-nasu/Makefile
===================================================================
--- head/japanese/font-nasu/Makefile	(revision 464596)
+++ head/japanese/font-nasu/Makefile	(revision 464597)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	nasu
 PORTVERSION=	20141215
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP/users/7/7587
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	NasuFont-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Nasu Japanese TrueType fonts
 
 LICENSE=	APACHE20
 
 USES=		fonts:fc zip
 FONTNAME=	nasu
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 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-${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
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -name Nasu-Bold-20141215.ttf \
 		-o -name Nasu-Regular-20141215.ttf \
 		-o -name NasuM-Bold-20141215.ttf \
 		-o -name NasuM-Regular-20141215.ttf )"
 
 .include <bsd.port.mk>
Index: head/japanese/font-nasu/files/pkg-install.in
===================================================================
--- head/japanese/font-nasu/files/pkg-install.in	(revision 464596)
+++ head/japanese/font-nasu/files/pkg-install.in	(revision 464597)
@@ -1,105 +1,105 @@
 #!/bin/sh
 # $FreeBSD$
 
 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" c medium
-		make_xlfd $ENC NasuM-Bold-20141215.ttf adobe "nasum" c bold
+		make_xlfd $ENC NasuM-Regular-20141215.ttf adobe "nasum" m medium
+		make_xlfd $ENC NasuM-Bold-20141215.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
Index: head/japanese/font-rounded-mgenplus/Makefile
===================================================================
--- head/japanese/font-rounded-mgenplus/Makefile	(revision 464596)
+++ head/japanese/font-rounded-mgenplus/Makefile	(revision 464597)
@@ -1,109 +1,109 @@
 # $FreeBSD$
 
 PORTNAME=	rounded-mgenplus
 PORTVERSION=	20150602
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP/users/8/8598
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Rounded Mgen+ Japanese TrueType fonts
 
 LICENSE=	OFL11
 
 USES=		7z fonts:fc
 FONTNAME=	${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 NO_WRKSUBDIR=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=			DOCS
 OPTIONS_MULTI=			FONT_FAMILY
 OPTIONS_MULTI_FONT_FAMILY=	ROUNDED_MGENPLUS_1C ROUNDED_MGENPLUS_1CP \
 				ROUNDED_MGENPLUS_1M ROUNDED_MGENPLUS_1MN \
 				ROUNDED_MGENPLUS_1P ROUNDED_MGENPLUS_1PP \
 				ROUNDED_MGENPLUS_2C ROUNDED_MGENPLUS_2CP \
 				ROUNDED_MGENPLUS_2M ROUNDED_MGENPLUS_2P \
 				ROUNDED_MGENPLUS_2PP
 OPTIONS_DEFAULT=		ROUNDED_MGENPLUS_1C ROUNDED_MGENPLUS_1CP \
 				ROUNDED_MGENPLUS_1M ROUNDED_MGENPLUS_1MN \
 				ROUNDED_MGENPLUS_1P ROUNDED_MGENPLUS_1PP \
 				ROUNDED_MGENPLUS_2C ROUNDED_MGENPLUS_2CP \
 				ROUNDED_MGENPLUS_2M ROUNDED_MGENPLUS_2P \
 				ROUNDED_MGENPLUS_2PP
 OPTIONS_SUB=			yes
 ROUNDED_MGENPLUS_1C_DESC=	Rounded Mgen+ 1c
 ROUNDED_MGENPLUS_1CP_DESC=	Rounded Mgen+ 1cp
 ROUNDED_MGENPLUS_1M_DESC=	Rounded Mgen+ 1m
 ROUNDED_MGENPLUS_1MN_DESC=	Rounded Mgen+ 1mn
 ROUNDED_MGENPLUS_1P_DESC=	Rounded Mgen+ 1p
 ROUNDED_MGENPLUS_1PP_DESC=	Rounded Mgen+ 1pp
 ROUNDED_MGENPLUS_2C_DESC=	Rounded Mgen+ 2c
 ROUNDED_MGENPLUS_2CP_DESC=	Rounded Mgen+ 2cp
 ROUNDED_MGENPLUS_2M_DESC=	Rounded Mgen+ 2m
 ROUNDED_MGENPLUS_2P_DESC=	Rounded Mgen+ 2p
 ROUNDED_MGENPLUS_2PP_DESC=	Rounded Mgen+ 2pp
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_1C}
 FAMILY=	1c
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_1CP}
 FAMILY+=1cp
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_1M}
 FAMILY+=1m
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_1MN}
 FAMILY+=1mn
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_1P}
 FAMILY+=1p
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_1PP}
 FAMILY+=1pp
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_2C}
 FAMILY+=2c
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_2CP}
 FAMILY+=2cp
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_2M}
 FAMILY+=2m
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_2P}
 FAMILY+=2p
 .endif
 .if ${PORT_OPTIONS:MROUNDED_MGENPLUS_2PP}
 FAMILY+=2pp
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for FAM in ${FAMILY}
 	${INSTALL_DATA} ${WRKSRC}/rounded-mgenplus-${FAM}-*.ttf \
 	    ${STAGEDIR}${FONTSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${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
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! -name *\.ttf"
 
 .include <bsd.port.mk>
Index: head/japanese/font-rounded-mgenplus/files/pkg-install.in
===================================================================
--- head/japanese/font-rounded-mgenplus/files/pkg-install.in	(revision 464596)
+++ head/japanese/font-rounded-mgenplus/files/pkg-install.in	(revision 464597)
@@ -1,121 +1,121 @@
 #!/bin/sh
 # $FreeBSD$
 
 catfontsdir()
 {
     while read _IN
     do
       case "${_IN}" in
       *"-adobe-rounded mgen+"*|[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
 
 	[ -r ${_file} ] || return
 
 	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
 		for FAM in 1c 1cp 1p 1pp 2c 2cp 2p 2pp
 		do
 			make_xlfd ${ENC} rounded-mgenplus-${FAM}-black.ttf adobe "rounded mgen+ ${FAM}" p black
 			make_xlfd ${ENC} rounded-mgenplus-${FAM}-bold.ttf adobe "rounded mgen+ ${FAM}" p bold
 			make_xlfd ${ENC} rounded-mgenplus-${FAM}-heavy.ttf adobe "rounded mgen+ ${FAM}" p extrabold
 			make_xlfd ${ENC} rounded-mgenplus-${FAM}-light.ttf adobe "rounded mgen+ ${FAM}" p extralight
 			make_xlfd ${ENC} rounded-mgenplus-${FAM}-medium.ttf adobe "rounded mgen+ ${FAM}" p medium
 			make_xlfd ${ENC} rounded-mgenplus-${FAM}-regular.ttf adobe "rounded mgen+ ${FAM}" p book
 			make_xlfd ${ENC} rounded-mgenplus-${FAM}-thin.ttf adobe "rounded mgen+ ${FAM}" p thin
 		done
 		for FAM in 1m 1mn 2m
 		do
-			make_xlfd ${ENC} rounded-mgenplus-${FAM}-bold.ttf adobe "rounded mgen+ ${FAM}" c bold
-			make_xlfd ${ENC} rounded-mgenplus-${FAM}-light.ttf adobe "rounded mgen+ ${FAM}" c extralight
-			make_xlfd ${ENC} rounded-mgenplus-${FAM}-medium.ttf adobe "rounded mgen+ ${FAM}" c medium
-			make_xlfd ${ENC} rounded-mgenplus-${FAM}-regular.ttf adobe "rounded mgen+ ${FAM}" c book
-			make_xlfd ${ENC} rounded-mgenplus-${FAM}-thin.ttf adobe "rounded mgen+ ${FAM}" c thin
+			make_xlfd ${ENC} rounded-mgenplus-${FAM}-bold.ttf adobe "rounded mgen+ ${FAM}" m bold
+			make_xlfd ${ENC} rounded-mgenplus-${FAM}-light.ttf adobe "rounded mgen+ ${FAM}" m extralight
+			make_xlfd ${ENC} rounded-mgenplus-${FAM}-medium.ttf adobe "rounded mgen+ ${FAM}" m medium
+			make_xlfd ${ENC} rounded-mgenplus-${FAM}-regular.ttf adobe "rounded mgen+ ${FAM}" m book
+			make_xlfd ${ENC} rounded-mgenplus-${FAM}-thin.ttf adobe "rounded mgen+ ${FAM}" m thin
 		done
 	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