From sa2c@sa2c.net  Mon Mar 19 22:28:16 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 C25C816A401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 22:28:16 +0000 (UTC)
	(envelope-from sa2c@sa2c.net)
Received: from wr-out-0506.google.com (wr-out-0506.google.com [64.233.184.237])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CF0813C45A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 22:28:16 +0000 (UTC)
	(envelope-from sa2c@sa2c.net)
Received: by wr-out-0506.google.com with SMTP id 36so1614132wra
        for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 15:28:16 -0700 (PDT)
Received: by 10.65.153.10 with SMTP id f10mr8518131qbo.1174343295797;
        Mon, 19 Mar 2007 15:28:15 -0700 (PDT)
Received: from berkeley.l.sa2c.net ( [125.193.35.8])
        by mx.google.com with ESMTP id r1sm8799671nzd.2007.03.19.15.28.14;
        Mon, 19 Mar 2007 15:28:14 -0700 (PDT)
Received: by berkeley.l.sa2c.net (Postfix, from userid 3104)
	id 5B47F4215; Tue, 20 Mar 2007 07:28:10 +0900 (JST)
Message-Id: <20070319222810.5B47F4215@berkeley.l.sa2c.net>
Date: Tue, 20 Mar 2007 07:28:10 +0900 (JST)
From: NIIMI Satoshi <sa2c@sa2c.net>
Reply-To: NIIMI Satoshi <sa2c@sa2c.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: x11-fonts/bitstream-vera: don't install conf file
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110544
>Category:       ports
>Synopsis:       x11-fonts/bitstream-vera: don't install conf file
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 19 22:30:04 GMT 2007
>Closed-Date:    Sat Mar 24 20:41:18 GMT 2007
>Last-Modified:  Sat Mar 24 20:50:05 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 "0.vera.conf".  This
has precedence over ~/.fonts.conf, and users can't override the alias
for "serif", "sans-serif", and "monospace".

Aliases for Vera fonts are already included in "60-latin.conf", so
it's not necessary to install "local.conf".
	
>How-To-Repeat:
	
>Fix:

	

--- bitstream-vera.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/bitstream-vera/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	2 Feb 2007 17:06:23 -0000	1.14
+++ Makefile	19 Mar 2007 22:17:34 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	bitstream-vera
 PORTVERSION=	1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
@@ -50,7 +50,7 @@
 # Install
 #
 
-do-install: install-fonts install-conf install-docs
+do-install: install-fonts install-docs
 
 install-fonts:
 	${MKDIR} ${FONTSDIR}
@@ -58,11 +58,6 @@
 	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.TXT ${FONTSDIR}
 
-install-conf:
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${WRKSRC}/local.conf \
-		${PREFIX}/etc/fonts/conf.d/0.vera.conf
-
 install-docs:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/bitstream-vera/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	5 Nov 2005 04:53:45 -0000	1.6
+++ pkg-plist	19 Mar 2007 22:25:30 -0000
@@ -1,4 +1,3 @@
-etc/fonts/conf.d/0.vera.conf
 %%FONTSDIR%%/COPYRIGHT.TXT
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/Vera.ttf
--- bitstream-vera.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 19 22:30:15 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110544 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Sat Mar 24 20:41:04 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110544: commit references a PR
Date: Sat, 24 Mar 2007 20:41:00 +0000 (UTC)

 marcus      2007-03-24 20:40:54 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-fonts/bitstream-vera Makefile pkg-plist 
   Log:
   Do not install config file as these fonts will automatically be loaded
   with fontconfig-2.4.2.  By installing the config file, it is no longer possible
   to override Bitstream fonts in the users ~/.fonts.conf file.
   
   PR:             110544
   Submitted by:   NIIMI Satoshi <sa2c@sa2c.net>
   
   Revision  Changes    Path
   1.15      +2 -7      ports/x11-fonts/bitstream-vera/Makefile
   1.7       +0 -1      ports/x11-fonts/bitstream-vera/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:
