From sa2c@sa2c.net  Mon Mar 19 21:49:51 2007
Return-Path: <sa2c@sa2c.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F211516A404
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 21:49:51 +0000 (UTC)
	(envelope-from sa2c@sa2c.net)
Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.170])
	by mx1.freebsd.org (Postfix) with ESMTP id A863713C455
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 21:49:50 +0000 (UTC)
	(envelope-from sa2c@sa2c.net)
Received: by ug-out-1314.google.com with SMTP id 71so1375425ugh
        for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 14:49:49 -0700 (PDT)
Received: by 10.65.177.6 with SMTP id e6mr8447219qbp.1174340988231;
        Mon, 19 Mar 2007 14:49:48 -0700 (PDT)
Received: from berkeley.l.sa2c.net ( [125.193.35.8])
        by mx.google.com with ESMTP id 22sm8773745nzn.2007.03.19.14.49.46;
        Mon, 19 Mar 2007 14:49:47 -0700 (PDT)
Received: by berkeley.l.sa2c.net (Postfix, from userid 3104)
	id 760ED4215; Tue, 20 Mar 2007 06:49:42 +0900 (JST)
Message-Id: <20070319214942.760ED4215@berkeley.l.sa2c.net>
Date: Tue, 20 Mar 2007 06:49:42 +0900 (JST)
From: NIIMI Satoshi <sa2c@sa2c.net>
Reply-To: NIIMI Satoshi <sa2c@sa2c.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: japanese/ipa-ttfonts: rename and split conf file
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110539
>Category:       ports
>Synopsis:       japanese/ipa-ttfonts: rename and split conf file
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    hrs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 19 21:50:04 GMT 2007
>Closed-Date:    Sun Mar 25 17:09:44 GMT 2007
>Last-Modified:  Sun Mar 25 17:10:23 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->hrs 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 19 21:50:14 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110539 
State-Changed-From-To: open->closed 
State-Changed-By: hrs 
State-Changed-When: Sun Mar 25 17:08:54 UTC 2007 
State-Changed-Why:  
Committed with some minor modifications.  Thanks for submitting! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110539 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110539: commit references a PR
Date: Sun, 25 Mar 2007 17:07:45 +0000 (UTC)

 hrs         2007-03-25 17:07:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     japanese/ipa-ttfonts Makefile pkg-plist 
     japanese/ipa-ttfonts/files pkg-install.in 
   Added files:
     japanese/ipa-ttfonts/files 20-unhint-ipattfonts.conf 
                                62-fonts-ipattfonts.conf 
   Removed files:
     japanese/ipa-ttfonts/files 2.ipa-ttfonts.conf 
   Log:
   - Split the etc/fonts/conf.d/2.ipa-ttfonts.conf file into
     20-unhint-ipattfonts.conf and 62-fonts-ipattfonts.conf[1].
   - Fix wrong handling of fonts.dir in pkg-install[2].
   - Bump PORTREVISION.
   
   PR:             ports/110539[1]
   Submitted by:   NIIMI Satoshi[1]
   Spotted by:     nork[2]
   
   Revision  Changes    Path
   1.9       +3 -2      ports/japanese/ipa-ttfonts/Makefile
   1.3       +0 -52     ports/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf (dead)
   1.1       +23 -0     ports/japanese/ipa-ttfonts/files/20-unhint-ipattfonts.conf (new)
   1.1       +31 -0     ports/japanese/ipa-ttfonts/files/62-fonts-ipattfonts.conf (new)
   1.3       +2 -2      ports/japanese/ipa-ttfonts/files/pkg-install.in
   1.7       +3 -2      ports/japanese/ipa-ttfonts/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
