Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jul 2016 11:04:06 +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: r418916 - in head/japanese/font-genshingothic: . files
Message-ID:  <201607221104.u6MB46mT051802@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Fri Jul 22 11:04:06 2016
New Revision: 418916
URL: https://svnweb.freebsd.org/changeset/ports/418916

Log:
  Use the generic family name without weight.

Modified:
  head/japanese/font-genshingothic/Makefile
  head/japanese/font-genshingothic/files/20-unhint-genshingothic.conf
  head/japanese/font-genshingothic/files/62-fonts-genshingothic.conf
  head/japanese/font-genshingothic/files/pkg-install.in

Modified: head/japanese/font-genshingothic/Makefile
==============================================================================
--- head/japanese/font-genshingothic/Makefile	Fri Jul 22 10:56:52 2016	(r418915)
+++ head/japanese/font-genshingothic/Makefile	Fri Jul 22 11:04:06 2016	(r418916)
@@ -2,7 +2,7 @@
 
 PORTNAME=	genshingothic
 PORTVERSION=	20150607
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP
 MASTER_SITE_SUBDIR=users/8/8634
@@ -14,7 +14,7 @@ COMMENT=	GenShinGothic Japanese TrueType
 LICENSE=	OFL11
 
 USES=		7z fonts:fc
-FONTNAME=	genshingothic
+FONTNAME=	${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install

Modified: head/japanese/font-genshingothic/files/20-unhint-genshingothic.conf
==============================================================================
--- head/japanese/font-genshingothic/files/20-unhint-genshingothic.conf	Fri Jul 22 10:56:52 2016	(r418915)
+++ head/japanese/font-genshingothic/files/20-unhint-genshingothic.conf	Fri Jul 22 11:04:06 2016	(r418916)
@@ -5,67 +5,13 @@
 	<match target="font">
 		<or>
 			<test name="family">
-				<string>Gen Shin Gothic Bold</string>
+				<string>Gen Shin Gothic</string>
 			</test>
 			<test name="family">
-				<string>Gen Shin Gothic ExtraLight</string>
+				<string>Gen Shin Gothic Monospace</string>
 			</test>
 			<test name="family">
-				<string>Gen Shin Gothic Heavy</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Light</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Medium</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Normal</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Regular</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Monospace Bold</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Monospace ExtraLight</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Monospace Heavy</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Monospace Light</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Monospace Medium</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Monospace Normal</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic Monospace Regular</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic P Bold</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic P ExtraLight</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic P Heavy</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic P Light</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic P Medium</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic P Normal</string>
-			</test>
-			<test name="family">
-				<string>Gen Shin Gothic P Regular</string>
+				<string>Gen Shin Gothic P</string>
 			</test>
 		</or>
 		<edit name="autohint">

Modified: head/japanese/font-genshingothic/files/62-fonts-genshingothic.conf
==============================================================================
--- head/japanese/font-genshingothic/files/62-fonts-genshingothic.conf	Fri Jul 22 10:56:52 2016	(r418915)
+++ head/japanese/font-genshingothic/files/62-fonts-genshingothic.conf	Fri Jul 22 11:04:06 2016	(r418916)
@@ -5,32 +5,14 @@
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>Gen Shin Gothic Regular</family>
-			<family>Gen Shin Gothic Normal</family>
-			<family>Gen Shin Gothic Medium</family>
-			<family>Gen Shin Gothic Light</family>
-			<family>Gen Shin Gothic Bold</family>
-			<family>Gen Shin Gothic ExtraLight</family>
-			<family>Gen Shin Gothic Heavy</family>
-			<family>Gen Shin Gothic P Regular</family>
-			<family>Gen Shin Gothic P Normal</family>
-			<family>Gen Shin Gothic P Medium</family>
-			<family>Gen Shin Gothic P Light</family>
-			<family>Gen Shin Gothic P Bold</family>
-			<family>Gen Shin Gothic P ExtraLight</family>
-			<family>Gen Shin Gothic P Heavy</family>
+			<family>Gen Shin Gothic</family>
+			<family>Gen Shin Gothic P</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>Gen Shin Gothic Monospace Regular</family>
-			<family>Gen Shin Gothic Monospace Normal</family>
-			<family>Gen Shin Gothic Monospace Medium</family>
-			<family>Gen Shin Gothic Monospace Light</family>
-			<family>Gen Shin Gothic Monospace Bold</family>
-			<family>Gen Shin Gothic Monospace ExtraLight</family>
-			<family>Gen Shin Gothic Monospace Heavy</family>
+			<family>Gen Shin Gothic Monospace</family>
 		</prefer>
 	</alias>
 </fontconfig>

Modified: head/japanese/font-genshingothic/files/pkg-install.in
==============================================================================
--- head/japanese/font-genshingothic/files/pkg-install.in	Fri Jul 22 10:56:52 2016	(r418915)
+++ head/japanese/font-genshingothic/files/pkg-install.in	Fri Jul 22 11:04:06 2016	(r418916)
@@ -53,29 +53,29 @@ 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-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
 	done
 }
 



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