Index: head/japanese/font-mgenplus/Makefile
===================================================================
--- head/japanese/font-mgenplus/Makefile	(revision 419175)
+++ head/japanese/font-mgenplus/Makefile	(revision 419176)
@@ -1,46 +1,106 @@
 # $FreeBSD$
 
 PORTNAME=	mgenplus
 PORTVERSION=	20150602
 #PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP
 MASTER_SITE_SUBDIR=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}
-	cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${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 419175)
+++ head/japanese/font-mgenplus/files/pkg-install.in	(revision 419176)
@@ -1,119 +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
 		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-mgenplus/pkg-plist
===================================================================
--- head/japanese/font-mgenplus/pkg-plist	(revision 419175)
+++ head/japanese/font-mgenplus/pkg-plist	(revision 419176)
@@ -1,73 +1,73 @@
 etc/fonts/conf.avail/20-unhint-mgenplus.conf
 etc/fonts/conf.avail/62-fonts-mgenplus.conf
-%%FONTSDIR%%/mgenplus-1c-black.ttf
-%%FONTSDIR%%/mgenplus-1c-bold.ttf
-%%FONTSDIR%%/mgenplus-1c-heavy.ttf
-%%FONTSDIR%%/mgenplus-1c-light.ttf
-%%FONTSDIR%%/mgenplus-1c-medium.ttf
-%%FONTSDIR%%/mgenplus-1c-regular.ttf
-%%FONTSDIR%%/mgenplus-1c-thin.ttf
-%%FONTSDIR%%/mgenplus-1cp-black.ttf
-%%FONTSDIR%%/mgenplus-1cp-bold.ttf
-%%FONTSDIR%%/mgenplus-1cp-heavy.ttf
-%%FONTSDIR%%/mgenplus-1cp-light.ttf
-%%FONTSDIR%%/mgenplus-1cp-medium.ttf
-%%FONTSDIR%%/mgenplus-1cp-regular.ttf
-%%FONTSDIR%%/mgenplus-1cp-thin.ttf
-%%FONTSDIR%%/mgenplus-1m-bold.ttf
-%%FONTSDIR%%/mgenplus-1m-light.ttf
-%%FONTSDIR%%/mgenplus-1m-medium.ttf
-%%FONTSDIR%%/mgenplus-1m-regular.ttf
-%%FONTSDIR%%/mgenplus-1m-thin.ttf
-%%FONTSDIR%%/mgenplus-1mn-bold.ttf
-%%FONTSDIR%%/mgenplus-1mn-light.ttf
-%%FONTSDIR%%/mgenplus-1mn-medium.ttf
-%%FONTSDIR%%/mgenplus-1mn-regular.ttf
-%%FONTSDIR%%/mgenplus-1mn-thin.ttf
-%%FONTSDIR%%/mgenplus-1p-black.ttf
-%%FONTSDIR%%/mgenplus-1p-bold.ttf
-%%FONTSDIR%%/mgenplus-1p-heavy.ttf
-%%FONTSDIR%%/mgenplus-1p-light.ttf
-%%FONTSDIR%%/mgenplus-1p-medium.ttf
-%%FONTSDIR%%/mgenplus-1p-regular.ttf
-%%FONTSDIR%%/mgenplus-1p-thin.ttf
-%%FONTSDIR%%/mgenplus-1pp-black.ttf
-%%FONTSDIR%%/mgenplus-1pp-bold.ttf
-%%FONTSDIR%%/mgenplus-1pp-heavy.ttf
-%%FONTSDIR%%/mgenplus-1pp-light.ttf
-%%FONTSDIR%%/mgenplus-1pp-medium.ttf
-%%FONTSDIR%%/mgenplus-1pp-regular.ttf
-%%FONTSDIR%%/mgenplus-1pp-thin.ttf
-%%FONTSDIR%%/mgenplus-2c-black.ttf
-%%FONTSDIR%%/mgenplus-2c-bold.ttf
-%%FONTSDIR%%/mgenplus-2c-heavy.ttf
-%%FONTSDIR%%/mgenplus-2c-light.ttf
-%%FONTSDIR%%/mgenplus-2c-medium.ttf
-%%FONTSDIR%%/mgenplus-2c-regular.ttf
-%%FONTSDIR%%/mgenplus-2c-thin.ttf
-%%FONTSDIR%%/mgenplus-2cp-black.ttf
-%%FONTSDIR%%/mgenplus-2cp-bold.ttf
-%%FONTSDIR%%/mgenplus-2cp-heavy.ttf
-%%FONTSDIR%%/mgenplus-2cp-light.ttf
-%%FONTSDIR%%/mgenplus-2cp-medium.ttf
-%%FONTSDIR%%/mgenplus-2cp-regular.ttf
-%%FONTSDIR%%/mgenplus-2cp-thin.ttf
-%%FONTSDIR%%/mgenplus-2m-bold.ttf
-%%FONTSDIR%%/mgenplus-2m-light.ttf
-%%FONTSDIR%%/mgenplus-2m-medium.ttf
-%%FONTSDIR%%/mgenplus-2m-regular.ttf
-%%FONTSDIR%%/mgenplus-2m-thin.ttf
-%%FONTSDIR%%/mgenplus-2p-black.ttf
-%%FONTSDIR%%/mgenplus-2p-bold.ttf
-%%FONTSDIR%%/mgenplus-2p-heavy.ttf
-%%FONTSDIR%%/mgenplus-2p-light.ttf
-%%FONTSDIR%%/mgenplus-2p-medium.ttf
-%%FONTSDIR%%/mgenplus-2p-regular.ttf
-%%FONTSDIR%%/mgenplus-2p-thin.ttf
-%%FONTSDIR%%/mgenplus-2pp-black.ttf
-%%FONTSDIR%%/mgenplus-2pp-bold.ttf
-%%FONTSDIR%%/mgenplus-2pp-heavy.ttf
-%%FONTSDIR%%/mgenplus-2pp-light.ttf
-%%FONTSDIR%%/mgenplus-2pp-medium.ttf
-%%FONTSDIR%%/mgenplus-2pp-regular.ttf
-%%FONTSDIR%%/mgenplus-2pp-thin.ttf
+%%MGENPLUS_1C%%%%FONTSDIR%%/mgenplus-1c-black.ttf
+%%MGENPLUS_1C%%%%FONTSDIR%%/mgenplus-1c-bold.ttf
+%%MGENPLUS_1C%%%%FONTSDIR%%/mgenplus-1c-heavy.ttf
+%%MGENPLUS_1C%%%%FONTSDIR%%/mgenplus-1c-light.ttf
+%%MGENPLUS_1C%%%%FONTSDIR%%/mgenplus-1c-medium.ttf
+%%MGENPLUS_1C%%%%FONTSDIR%%/mgenplus-1c-regular.ttf
+%%MGENPLUS_1C%%%%FONTSDIR%%/mgenplus-1c-thin.ttf
+%%MGENPLUS_1CP%%%%FONTSDIR%%/mgenplus-1cp-black.ttf
+%%MGENPLUS_1CP%%%%FONTSDIR%%/mgenplus-1cp-bold.ttf
+%%MGENPLUS_1CP%%%%FONTSDIR%%/mgenplus-1cp-heavy.ttf
+%%MGENPLUS_1CP%%%%FONTSDIR%%/mgenplus-1cp-light.ttf
+%%MGENPLUS_1CP%%%%FONTSDIR%%/mgenplus-1cp-medium.ttf
+%%MGENPLUS_1CP%%%%FONTSDIR%%/mgenplus-1cp-regular.ttf
+%%MGENPLUS_1CP%%%%FONTSDIR%%/mgenplus-1cp-thin.ttf
+%%MGENPLUS_1M%%%%FONTSDIR%%/mgenplus-1m-bold.ttf
+%%MGENPLUS_1M%%%%FONTSDIR%%/mgenplus-1m-light.ttf
+%%MGENPLUS_1M%%%%FONTSDIR%%/mgenplus-1m-medium.ttf
+%%MGENPLUS_1M%%%%FONTSDIR%%/mgenplus-1m-regular.ttf
+%%MGENPLUS_1M%%%%FONTSDIR%%/mgenplus-1m-thin.ttf
+%%MGENPLUS_1MN%%%%FONTSDIR%%/mgenplus-1mn-bold.ttf
+%%MGENPLUS_1MN%%%%FONTSDIR%%/mgenplus-1mn-light.ttf
+%%MGENPLUS_1MN%%%%FONTSDIR%%/mgenplus-1mn-medium.ttf
+%%MGENPLUS_1MN%%%%FONTSDIR%%/mgenplus-1mn-regular.ttf
+%%MGENPLUS_1MN%%%%FONTSDIR%%/mgenplus-1mn-thin.ttf
+%%MGENPLUS_1P%%%%FONTSDIR%%/mgenplus-1p-black.ttf
+%%MGENPLUS_1P%%%%FONTSDIR%%/mgenplus-1p-bold.ttf
+%%MGENPLUS_1P%%%%FONTSDIR%%/mgenplus-1p-heavy.ttf
+%%MGENPLUS_1P%%%%FONTSDIR%%/mgenplus-1p-light.ttf
+%%MGENPLUS_1P%%%%FONTSDIR%%/mgenplus-1p-medium.ttf
+%%MGENPLUS_1P%%%%FONTSDIR%%/mgenplus-1p-regular.ttf
+%%MGENPLUS_1P%%%%FONTSDIR%%/mgenplus-1p-thin.ttf
+%%MGENPLUS_1PP%%%%FONTSDIR%%/mgenplus-1pp-black.ttf
+%%MGENPLUS_1PP%%%%FONTSDIR%%/mgenplus-1pp-bold.ttf
+%%MGENPLUS_1PP%%%%FONTSDIR%%/mgenplus-1pp-heavy.ttf
+%%MGENPLUS_1PP%%%%FONTSDIR%%/mgenplus-1pp-light.ttf
+%%MGENPLUS_1PP%%%%FONTSDIR%%/mgenplus-1pp-medium.ttf
+%%MGENPLUS_1PP%%%%FONTSDIR%%/mgenplus-1pp-regular.ttf
+%%MGENPLUS_1PP%%%%FONTSDIR%%/mgenplus-1pp-thin.ttf
+%%MGENPLUS_2C%%%%FONTSDIR%%/mgenplus-2c-black.ttf
+%%MGENPLUS_2C%%%%FONTSDIR%%/mgenplus-2c-bold.ttf
+%%MGENPLUS_2C%%%%FONTSDIR%%/mgenplus-2c-heavy.ttf
+%%MGENPLUS_2C%%%%FONTSDIR%%/mgenplus-2c-light.ttf
+%%MGENPLUS_2C%%%%FONTSDIR%%/mgenplus-2c-medium.ttf
+%%MGENPLUS_2C%%%%FONTSDIR%%/mgenplus-2c-regular.ttf
+%%MGENPLUS_2C%%%%FONTSDIR%%/mgenplus-2c-thin.ttf
+%%MGENPLUS_2CP%%%%FONTSDIR%%/mgenplus-2cp-black.ttf
+%%MGENPLUS_2CP%%%%FONTSDIR%%/mgenplus-2cp-bold.ttf
+%%MGENPLUS_2CP%%%%FONTSDIR%%/mgenplus-2cp-heavy.ttf
+%%MGENPLUS_2CP%%%%FONTSDIR%%/mgenplus-2cp-light.ttf
+%%MGENPLUS_2CP%%%%FONTSDIR%%/mgenplus-2cp-medium.ttf
+%%MGENPLUS_2CP%%%%FONTSDIR%%/mgenplus-2cp-regular.ttf
+%%MGENPLUS_2CP%%%%FONTSDIR%%/mgenplus-2cp-thin.ttf
+%%MGENPLUS_2M%%%%FONTSDIR%%/mgenplus-2m-bold.ttf
+%%MGENPLUS_2M%%%%FONTSDIR%%/mgenplus-2m-light.ttf
+%%MGENPLUS_2M%%%%FONTSDIR%%/mgenplus-2m-medium.ttf
+%%MGENPLUS_2M%%%%FONTSDIR%%/mgenplus-2m-regular.ttf
+%%MGENPLUS_2M%%%%FONTSDIR%%/mgenplus-2m-thin.ttf
+%%MGENPLUS_2P%%%%FONTSDIR%%/mgenplus-2p-black.ttf
+%%MGENPLUS_2P%%%%FONTSDIR%%/mgenplus-2p-bold.ttf
+%%MGENPLUS_2P%%%%FONTSDIR%%/mgenplus-2p-heavy.ttf
+%%MGENPLUS_2P%%%%FONTSDIR%%/mgenplus-2p-light.ttf
+%%MGENPLUS_2P%%%%FONTSDIR%%/mgenplus-2p-medium.ttf
+%%MGENPLUS_2P%%%%FONTSDIR%%/mgenplus-2p-regular.ttf
+%%MGENPLUS_2P%%%%FONTSDIR%%/mgenplus-2p-thin.ttf
+%%MGENPLUS_2PP%%%%FONTSDIR%%/mgenplus-2pp-black.ttf
+%%MGENPLUS_2PP%%%%FONTSDIR%%/mgenplus-2pp-bold.ttf
+%%MGENPLUS_2PP%%%%FONTSDIR%%/mgenplus-2pp-heavy.ttf
+%%MGENPLUS_2PP%%%%FONTSDIR%%/mgenplus-2pp-light.ttf
+%%MGENPLUS_2PP%%%%FONTSDIR%%/mgenplus-2pp-medium.ttf
+%%MGENPLUS_2PP%%%%FONTSDIR%%/mgenplus-2pp-regular.ttf
+%%MGENPLUS_2PP%%%%FONTSDIR%%/mgenplus-2pp-thin.ttf