Add HackgenNerd font.

7 files changed, 59 insertions, 58 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 059cbf50752b..444107308ca1 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -70,6 +70,7 @@
     SUBDIR += font-genjyuugothic
     SUBDIR += font-genshingothic
     SUBDIR += font-hackgen
+    SUBDIR += font-hackgen-nerd
     SUBDIR += font-ipa
     SUBDIR += font-ipa-uigothic
     SUBDIR += font-ipaex
diff --git a/japanese/font-hackgen-nerd/Makefile b/japanese/font-hackgen-nerd/Makefile
index 597686d68e11..fdb7e2b80e90 100644
--- a/japanese/font-hackgen-nerd/Makefile
+++ b/japanese/font-hackgen-nerd/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-PORTNAME=	hackgen
+PORTNAME=	hackgen-nerd
 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}
+DISTNAME=	HackGenNerd_v${DISTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
-COMMENT=	HackGen is a composite font of Hack and GenJyuu-Gothic
+COMMENT=	HackGenNerd is a composite font of Hack and GenJyuu-Gothic
 
 LICENSE=	OFL11
 
@@ -23,27 +23,27 @@ SUB_FILES=	pkg-install
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 OPTIONS_MULTI=			FONT_FAMILY
-OPTIONS_MULTI_FONT_FAMILY=	HACKGEN HACKGEN_CONS HACKGEN35 HACKGEN35_CONS
-OPTIONS_DEFAULT=		HACKGEN HACKGEN_CONS HACKGEN35 HACKGEN35_CONS
+OPTIONS_MULTI_FONT_FAMILY=	HACKGENERD HACKGENERD_CONS HACKGEN35NERD HACKGEN35NERD_CONS
+OPTIONS_DEFAULT=		HACKGENERD HACKGENERD_CONS HACKGEN35NERD HACKGEN35NERD_CONS
 OPTIONS_SUB=			yes
-HACKGEN_DESC=			HackGen
-HACKGEN_CONS_DESC=		HackGen Console
-HACKGEN35_DESC=			HackGen35
-HACKGEN35_CONS_DESC=		HackGen35 Console
+HACKGENERD_DESC=			HackGenNerd
+HACKGENERD_CONS_DESC=		HackGenNerd Console
+HACKGEN35NERD_DESC=			HackGen35Nerd
+HACKGEN35NERD_CONS_DESC=		HackGen35Nerd Console
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MHACKGEN}
-HACKGEN_FONTS+=	HackGen-Regular HackGen-Bold
+.if ${PORT_OPTIONS:MHACKGENERD}
+HACKGEN_FONTS+=	HackGenNerd-Regular HackGenNerd-Bold
 .endif
-.if ${PORT_OPTIONS:MHACKGEN_CONS}
-HACKGEN_FONTS+=	HackGenConsole-Regular HackGenConsole-Bold
+.if ${PORT_OPTIONS:MHACKGENERD_CONS}
+HACKGEN_FONTS+=	HackGenNerdConsole-Regular HackGenNerdConsole-Bold
 .endif
-.if ${PORT_OPTIONS:MHACKGEN35}
-HACKGEN_FONTS+=	HackGen35-Regular HackGen35-Bold
+.if ${PORT_OPTIONS:MHACKGEN35NERD}
+HACKGEN_FONTS+=	HackGen35Nerd-Regular HackGen35Nerd-Bold
 .endif
-.if ${PORT_OPTIONS:MHACKGEN35_CONS}
-HACKGEN_FONTS+=	HackGen35Console-Regular HackGen35Console-Bold
+.if ${PORT_OPTIONS:MHACKGEN35NERD_CONS}
+HACKGEN_FONTS+=	HackGen35NerdConsole-Regular HackGen35NerdConsole-Bold
 .endif
 
 do-install:
diff --git a/japanese/font-hackgen-nerd/distinfo b/japanese/font-hackgen-nerd/distinfo
index 87c55a6f10f7..0c64585d84f5 100644
--- a/japanese/font-hackgen-nerd/distinfo
+++ b/japanese/font-hackgen-nerd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614781003
-SHA256 (HackGen_v2.2.3.zip) = 81dc942372856d7d7d0e3f8a1ecef11471e23161dce25165f0cddc01bcef62f1
-SIZE (HackGen_v2.2.3.zip) = 40427167
+TIMESTAMP = 1614784570
+SHA256 (HackGenNerd_v2.2.3.zip) = 7ce5ea01ab88443f30de461e8b614cbeaed10a7fc9580902922646a1134158f0
+SIZE (HackGenNerd_v2.2.3.zip) = 44009475
diff --git a/japanese/font-hackgen-nerd/files/20-unhint-hackgen.conf b/japanese/font-hackgen-nerd/files/20-unhint-hackgen-nerd.conf
index c85b2653479a..30b641b6ead4 100644
--- a/japanese/font-hackgen-nerd/files/20-unhint-hackgen.conf
+++ b/japanese/font-hackgen-nerd/files/20-unhint-hackgen-nerd.conf
@@ -5,28 +5,28 @@
 	<match target="font">
 		<or>
 			<test name="family">
-				<string>HackGen-Regular</string>
+				<string>HackGenNerd-Regular</string>
 			</test>
 			<test name="family">
-				<string>HackGen-Bold</string>
+				<string>HackGenNerd-Bold</string>
 			</test>
 			<test name="family">
-				<string>HackGenConsole-Regular</string>
+				<string>HackGenNerdConsole-Regular</string>
 			</test>
 			<test name="family">
-				<string>HackGenConsole-Bold</string>
+				<string>HackGenNerdConsole-Bold</string>
 			</test>
 			<test name="family">
-				<string>HackGen35-Regular</string>
+				<string>HackGen35Nerd-Regular</string>
 			</test>
 			<test name="family">
-				<string>HackGen35-Bold</string>
+				<string>HackGen35Nerd-Bold</string>
 			</test>
 			<test name="family">
-				<string>HackGen35Console-Regular</string>
+				<string>HackGen35NerdConsole-Regular</string>
 			</test>
 			<test name="family">
-				<string>HackGen35Console-Bold</string>
+				<string>HackGen35NerdConsole-Bold</string>
 			</test>
 		</or>
 		<edit name="autohint">
diff --git a/japanese/font-hackgen-nerd/files/62-fonts-hackgen-nerd.conf b/japanese/font-hackgen-nerd/files/62-fonts-hackgen-nerd.conf
new file mode 100644
index 000000000000..5613798ec5a8
--- /dev/null
+++ b/japanese/font-hackgen-nerd/files/62-fonts-hackgen-nerd.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>HackGenNerd-Regular</family>
+			<family>HackGenNerd-Bold</family>
+			<family>HackGenNerdConsole-Regular</family>
+			<family>HackGenNerdConsole-Bold</family>
+			<family>HackGen35Nerd-Regular</family>
+			<family>HackGen35Nerd-Bold</family>
+			<family>HackGen35NerdConsole-Regular</family>
+			<family>HackGen35NerdConsole-Bold</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/japanese/font-hackgen-nerd/files/62-fonts-hackgen.conf b/japanese/font-hackgen-nerd/files/62-fonts-hackgen.conf
deleted file mode 100644
index cfd360fd20be..000000000000
--- a/japanese/font-hackgen-nerd/files/62-fonts-hackgen.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>HackGen35-Regular</family>
-			<family>HackGen35-Bold</family>
-			<family>HackGen35Console-Regular</family>
-			<family>HackGen35Console-Bold</family>
-		</prefer>
-	</alias>
-</fontconfig>
diff --git a/japanese/font-hackgen-nerd/pkg-plist b/japanese/font-hackgen-nerd/pkg-plist
index 67968ef927dd..e4e69c211e0d 100644
--- a/japanese/font-hackgen-nerd/pkg-plist
+++ b/japanese/font-hackgen-nerd/pkg-plist
@@ -1,12 +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
-%%HACKGEN35%%%%FONTSDIR%%/HackGen35-Regular.ttf
-%%HACKGEN35%%%%FONTSDIR%%/HackGen35-Bold.ttf
-%%HACKGEN35_CONS%%%%FONTSDIR%%/HackGen35Console-Regular.ttf
-%%HACKGEN35_CONS%%%%FONTSDIR%%/HackGen35Console-Bold.ttf
+etc/fonts/conf.avail/20-unhint-hackgen-nerd.conf
+etc/fonts/conf.avail/62-fonts-hackgen-nerd.conf
+etc/fonts/conf.d/20-unhint-hackgen-nerd.conf
+etc/fonts/conf.d/62-fonts-hackgen-nerd.conf
+%%HACKGENERD%%%%FONTSDIR%%/HackGenNerd-Regular.ttf
+%%HACKGENERD%%%%FONTSDIR%%/HackGenNerd-Bold.ttf
+%%HACKGENERD_CONS%%%%FONTSDIR%%/HackGenNerdConsole-Regular.ttf
+%%HACKGENERD_CONS%%%%FONTSDIR%%/HackGenNerdConsole-Bold.ttf
+%%HACKGEN35NERD%%%%FONTSDIR%%/HackGen35Nerd-Regular.ttf
+%%HACKGEN35NERD%%%%FONTSDIR%%/HackGen35Nerd-Bold.ttf
+%%HACKGEN35NERD_CONS%%%%FONTSDIR%%/HackGen35NerdConsole-Regular.ttf
+%%HACKGEN35NERD_CONS%%%%FONTSDIR%%/HackGen35NerdConsole-Bold.ttf