Index: head/japanese/font-hackgen/Makefile
===================================================================
--- head/japanese/font-hackgen/Makefile	(revision 567088)
+++ head/japanese/font-hackgen/Makefile	(revision 567089)
@@ -1,76 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	hackgen
 PORTVERSION=	2.2.3
 #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 HACKGEN_CONS_PL \
-				HACKGEN35 HACKGEN35_CONS HACKGEN35_CONS_PL
-OPTIONS_DEFAULT=		HACKGEN HACKGEN_CONS HACKGEN_CONS_PL \
-				HACKGEN35 HACKGEN35_CONS HACKGEN35_CONS_PL
+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
-HACKGEN_CONS_PL_DESC=		HackGen Console for Powerline
 HACKGEN35_DESC=			HackGen35
 HACKGEN35_CONS_DESC=		HackGen35 Console
-HACKGEN35_CONS_PL_DESC=		HackGen35 Console for Powerline
 
 .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:MHACKGEN_CONS_PL}
-HACKGEN_FONTS+=	HackGenConsole-Regular-forPowerline \
-		HackGenConsole-Bold-forPowerline
-.endif
 .if ${PORT_OPTIONS:MHACKGEN35}
 HACKGEN_FONTS+=	HackGen35-Regular HackGen35-Bold
 .endif
 .if ${PORT_OPTIONS:MHACKGEN35_CONS}
 HACKGEN_FONTS+=	HackGen35Console-Regular HackGen35Console-Bold
-.endif
-.if ${PORT_OPTIONS:MHACKGEN35_CONS_PL}
-HACKGEN_FONTS+=	HackGen35Console-Regular-forPowerline \
-		HackGen35Console-Bold-forPowerline
 .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>
Index: head/japanese/font-hackgen/files/20-unhint-hackgen.conf
===================================================================
--- head/japanese/font-hackgen/files/20-unhint-hackgen.conf	(revision 567088)
+++ head/japanese/font-hackgen/files/20-unhint-hackgen.conf	(revision 567089)
@@ -1,48 +1,36 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
 		<or>
 			<test name="family">
 				<string>HackGen-Regular</string>
 			</test>
 			<test name="family">
 				<string>HackGen-Bold</string>
 			</test>
 			<test name="family">
 				<string>HackGenConsole-Regular</string>
 			</test>
 			<test name="family">
 				<string>HackGenConsole-Bold</string>
 			</test>
 			<test name="family">
-				<string>HackGenConsole-Regular-forPowerline</string>
-			</test>
-			<test name="family">
-				<string>HackGenConsole-Bold-forPowerline</string>
-			</test>
-			<test name="family">
 				<string>HackGen35-Regular</string>
 			</test>
 			<test name="family">
 				<string>HackGen35-Bold</string>
 			</test>
 			<test name="family">
 				<string>HackGen35Console-Regular</string>
 			</test>
 			<test name="family">
 				<string>HackGen35Console-Bold</string>
-			</test>
-			<test name="family">
-				<string>HackGen35Console-Regular-forPowerline</string>
-			</test>
-			<test name="family">
-				<string>HackGen35Console-Bold-forPowerline</string>
 			</test>
 		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
 	</match>
 </fontconfig>
Index: head/japanese/font-hackgen/files/62-fonts-hackgen.conf
===================================================================
--- head/japanese/font-hackgen/files/62-fonts-hackgen.conf	(revision 567088)
+++ head/japanese/font-hackgen/files/62-fonts-hackgen.conf	(revision 567089)
@@ -1,22 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<alias>
 		<family>monospace</family>
 		<prefer>
 			<family>HackGen-Regular</family>
 			<family>HackGen-Bold</family>
 			<family>HackGenConsole-Regular</family>
 			<family>HackGenConsole-Bold</family>
-			<family>HackGenConsole-Regular-forPowerline</family>
-			<family>HackGenConsole-Bold-forPowerline</family>
 			<family>HackGen35-Regular</family>
 			<family>HackGen35-Bold</family>
 			<family>HackGen35Console-Regular</family>
 			<family>HackGen35Console-Bold</family>
-			<family>HackGen35Console-Regular-forPowerline</family>
-			<family>HackGen35Console-Bold-forPowerline</family>
 		</prefer>
 	</alias>
 </fontconfig>
Index: head/japanese/font-hackgen/pkg-plist
===================================================================
--- head/japanese/font-hackgen/pkg-plist	(revision 567088)
+++ head/japanese/font-hackgen/pkg-plist	(revision 567089)
@@ -1,16 +1,12 @@
 etc/fonts/conf.avail/20-unhint-hackgen.conf
 etc/fonts/conf.avail/62-fonts-hackgen.conf
 etc/fonts/conf.d/20-unhint-hackgen.conf
 etc/fonts/conf.d/62-fonts-hackgen.conf
 %%HACKGEN%%%%FONTSDIR%%/HackGen-Regular.ttf
 %%HACKGEN%%%%FONTSDIR%%/HackGen-Bold.ttf
 %%HACKGEN_CONS%%%%FONTSDIR%%/HackGenConsole-Regular.ttf
 %%HACKGEN_CONS%%%%FONTSDIR%%/HackGenConsole-Bold.ttf
-%%HACKGEN_CONS_PL%%%%FONTSDIR%%/HackGenConsole-Regular-forPowerline.ttf
-%%HACKGEN_CONS_PL%%%%FONTSDIR%%/HackGenConsole-Bold-forPowerline.ttf
 %%HACKGEN35%%%%FONTSDIR%%/HackGen35-Regular.ttf
 %%HACKGEN35%%%%FONTSDIR%%/HackGen35-Bold.ttf
 %%HACKGEN35_CONS%%%%FONTSDIR%%/HackGen35Console-Regular.ttf
 %%HACKGEN35_CONS%%%%FONTSDIR%%/HackGen35Console-Bold.ttf
-%%HACKGEN35_CONS_PL%%%%FONTSDIR%%/HackGen35Console-Regular-forPowerline.ttf
-%%HACKGEN35_CONS_PL%%%%FONTSDIR%%/HackGen35Console-Bold-forPowerline.ttf