Date: Tue, 20 Mar 2007 06:49:42 +0900 (JST) From: NIIMI Satoshi <sa2c@sa2c.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110539: japanese/ipa-ttfonts: rename and split conf file Message-ID: <20070319214942.760ED4215@berkeley.l.sa2c.net> Resent-Message-ID: <200703192150.l2JLo44C051746@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110539
>Category: ports
>Synopsis: japanese/ipa-ttfonts: rename and split conf file
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 19 21:50:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: NIIMI Satoshi
>Release: FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #3: Sun Mar 18 07:46:35 JST 2007 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
With upgrade of fontconfig 2.4.2, including source of ~/.fonts.conf was
changed from "etc/fonts/fonts.conf" to "etc/fonts/conf.d/50-user.conf".
Currently, this port installs conf file as "2.ipa-ttfonts.conf". This
has precedence over ~/.fonts.conf, and users can't override the alias
for "serif", "sans-serif", and "monospace".
The fontconfig port installs alias configurations as "60-latin.conf"
and "65-nonlatin.conf", so I think it's best to insert conf file for
this port between them.
In addition, this patch splits hint related stuff into
"20-ipa-ttfonts-hint.conf", so that users can override.
>How-To-Repeat:
>Fix:
Please note to run before commit:
cvs add files/20-ipa-ttfonts-hint.conf files/62-ipa-ttfonts.conf
cvs delete -f files/2.ipa-ttfonts.conf
--- ipa-ttfonts.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/ipa-ttfonts/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 18 Jan 2007 03:28:38 -0000 1.8
+++ Makefile 19 Mar 2007 21:28:51 -0000
@@ -7,7 +7,7 @@
PORTNAME= ipa-ttfonts
PORTVERSION= 1.0.20060520
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
@@ -62,7 +62,8 @@
${DATADIR}/fonts/M+*.ttf \
${PREFIX}/${X_FONTSDIR}/TrueType/
${MKDIR} ${PREFIX}/etc/fonts/conf.d
- ${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
+ ${INSTALL_DATA} ${FILESDIR}/20-ipa-ttfonts-hint.conf \
+ ${FILESDIR}/62-ipa-ttfonts.conf \
${PREFIX}/etc/fonts/conf.d
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/ipa-ttfonts/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 18 Jan 2007 03:28:38 -0000 1.6
+++ pkg-plist 19 Mar 2007 21:29:20 -0000
@@ -83,7 +83,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
@dirrmtry %%LOCAL_FONTSDIR%%
@cwd %%X11BASE%%
-etc/fonts/conf.d/2.ipa-ttfonts.conf
+etc/fonts/conf.d/20-ipa-ttfonts-hint.conf
+etc/fonts/conf.d/62-ipa-ttfonts.conf
%%X_FONTSDIR%%/TrueType/ipag.ttf
%%X_FONTSDIR%%/TrueType/ipagp.ttf
%%X_FONTSDIR%%/TrueType/ipagui.ttf
Index: files/2.ipa-ttfonts.conf
===================================================================
RCS file: files/2.ipa-ttfonts.conf
diff -N files/2.ipa-ttfonts.conf
--- files/2.ipa-ttfonts.conf 3 Jan 2007 03:06:36 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $FreeBSD: ports/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf,v 1.2 2007/01/03 03:06:36 hrs Exp $ -->
-<fontconfig>
- <alias>
- <family>serif</family>
- <prefer>
- <family>IPAPMincho</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>IPAPGothic</family>
- <family>IPAUIGothic</family>
- <family>M+1P+IPAG</family>
- <family>M+2P+IPAG</family>
- <family>M+1P+IPAG circle</family>
- <family>M+2P+IPAG circle</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>IPAGothic</family>
- <family>IPAMincho</family>
- <family>M+1VM+IPAG circle</family>
- <family>M+2VM+IPAG circle</family>
- </prefer>
- </alias>
- <match target="font">
- <test name="family">
- <string>IPAMincho</string>
- <string>IPAGothic</string>
- <string>IPAPMincho</string>
- <string>IPAPGothic</string>
- <string>IPAUIGothic</string>
- <family>M+1P+IPAG</family>
- <family>M+2P+IPAG</family>
- <family>M+1P+IPAG circle</family>
- <family>M+2P+IPAG circle</family>
- <family>M+1VM+IPAG circle</family>
- <family>M+2VM+IPAG circle</family>
- </test>
- <edit name="hintstyle">
- <const>hintslight</const>
- </edit>
- <edit name="autohint">
- <bool>false</bool>
- </edit>
- </match>
-</fontconfig>
Index: files/20-ipa-ttfonts-hint.conf
===================================================================
RCS file: files/20-ipa-ttfonts-hint.conf
diff -N files/20-ipa-ttfonts-hint.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/20-ipa-ttfonts-hint.conf 19 Mar 2007 21:25:56 -0000
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+ <match target="font">
+ <test name="family">
+ <string>IPAMincho</string>
+ <string>IPAGothic</string>
+ <string>IPAPMincho</string>
+ <string>IPAPGothic</string>
+ <string>IPAUIGothic</string>
+ <family>M+1P+IPAG</family>
+ <family>M+2P+IPAG</family>
+ <family>M+1P+IPAG circle</family>
+ <family>M+2P+IPAG circle</family>
+ <family>M+1VM+IPAG circle</family>
+ <family>M+2VM+IPAG circle</family>
+ </test>
+ <edit name="autohint">
+ <bool>false</bool>
+ </edit>
+ </match>
+</fontconfig>
Index: files/62-ipa-ttfonts.conf
===================================================================
RCS file: files/62-ipa-ttfonts.conf
diff -N files/62-ipa-ttfonts.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/62-ipa-ttfonts.conf 19 Mar 2007 21:26:34 -0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+ <alias>
+ <family>serif</family>
+ <prefer>
+ <family>IPAPMincho</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>IPAPGothic</family>
+ <family>IPAUIGothic</family>
+ <family>M+1P+IPAG</family>
+ <family>M+2P+IPAG</family>
+ <family>M+1P+IPAG circle</family>
+ <family>M+2P+IPAG circle</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+ <family>IPAGothic</family>
+ <family>IPAMincho</family>
+ <family>M+1VM+IPAG circle</family>
+ <family>M+2VM+IPAG circle</family>
+ </prefer>
+ </alias>
+</fontconfig>
--- ipa-ttfonts.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070319214942.760ED4215>