Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Jul 2016 14:59:15 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r419176 - in head/japanese/font-mgenplus: . files
Message-ID:  <201607271459.u6RExF0t059806@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Wed Jul 27 14:59:15 2016
New Revision: 419176
URL: https://svnweb.freebsd.org/changeset/ports/419176

Log:
  OPTIONSfy font family to be installed.

Modified:
  head/japanese/font-mgenplus/Makefile
  head/japanese/font-mgenplus/files/pkg-install.in
  head/japanese/font-mgenplus/pkg-plist

Modified: head/japanese/font-mgenplus/Makefile
==============================================================================
--- head/japanese/font-mgenplus/Makefile	Wed Jul 27 12:55:15 2016	(r419175)
+++ head/japanese/font-mgenplus/Makefile	Wed Jul 27 14:59:15 2016	(r419176)
@@ -24,10 +24,70 @@ 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 \

Modified: head/japanese/font-mgenplus/files/pkg-install.in
==============================================================================
--- head/japanese/font-mgenplus/files/pkg-install.in	Wed Jul 27 12:55:15 2016	(r419175)
+++ head/japanese/font-mgenplus/files/pkg-install.in	Wed Jul 27 14:59:15 2016	(r419176)
@@ -28,6 +28,8 @@ make_xlfd()
 	_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" ;;

Modified: head/japanese/font-mgenplus/pkg-plist
==============================================================================
--- head/japanese/font-mgenplus/pkg-plist	Wed Jul 27 12:55:15 2016	(r419175)
+++ head/japanese/font-mgenplus/pkg-plist	Wed Jul 27 14:59:15 2016	(r419176)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607271459.u6RExF0t059806>