From owner-freebsd-emulation@FreeBSD.ORG Wed May 23 11:59:44 2007 Return-Path: X-Original-To: freebsd-emulation@FreeBSD.org Delivered-To: freebsd-emulation@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9A6816A46C; Wed, 23 May 2007 11:59:44 +0000 (UTC) (envelope-from bsam@ipt.ru) Received: from mail.ipt.ru (mail.ipt.ru [80.253.10.82]) by mx1.freebsd.org (Postfix) with ESMTP id 74D2513C48C; Wed, 23 May 2007 11:59:44 +0000 (UTC) (envelope-from bsam@ipt.ru) Received: from stat.sem.ipt.ru ([192.168.12.1] helo=ipt.ru) by mail.ipt.ru with esmtp (Exim 4.62 (FreeBSD)) (envelope-from ) id 1HqpVH-000FxI-8X; Wed, 23 May 2007 15:59:43 +0400 Received: from bsam by ipt.ru with local (Exim 4.63 (FreeBSD)) (envelope-from ) id 1HqpWL-0000rR-R4; Wed, 23 May 2007 16:00:49 +0400 To: Alexander Leidinger References: <200705231116.l4NBGKJI082138@freefall.freebsd.org> <20070523133902.47ewer69wkckcgs0@webmail.leidinger.net> From: Boris Samorodov Date: Wed, 23 May 2007 16:00:49 +0400 In-Reply-To: <20070523133902.47ewer69wkckcgs0@webmail.leidinger.net> (Alexander Leidinger's message of "Wed\, 23 May 2007 13\:39\:02 +0200") Message-ID: <00270814@srv.sem.ipt.ru> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.99 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: dmitry@karasik.eu.org, freebsd-emulation@FreeBSD.org, Pav Lucistnik Subject: Re: ports/112851: x11-fonts/linux-fontconfig /etc/fonts/fonts.conf not updated with xorg 7.2 X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2007 11:59:44 -0000 On Wed, 23 May 2007 13:39:02 +0200 Alexander Leidinger wrote: > Quoting Pav Lucistnik (from Wed, 23 May 2007 11:16:20 GMT): > > The workarounds suggested needs to be done both or are alternatives? I edited > > the path in fonts.conf, and fonts now appear in acroread just fine. > > linux-opera > > is still messed up. > Don't run the linux fc-cache program! I assume it will mess up the > contents of the cache file for the FreeBSD fontconfig. > Boris, your patch looks good in principle, but I prefer to create the > fonts.conf on the fly (REINPLACE s:/usr/X11R6:${X11BASE}:g) instead of > hardcoding it (except portmgr/pav tells us that X11BASE goes away, > then it should be LOCALBASE). See > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/110632 for more (as OK. I used X11BASE. > we got the info that the new fontconfig is not compatible, and as I > didn't found a matching fontconfig version back then, we have to go > the way as proposed in the PR). Maybe we should also not install (= > remove) the linux fc-cache program. > Pav, do we (or better: has bsam) portmgr approval to fix linux-fontconfig? Here is the new patch (taken from PR/110632, bump the PORTREVISION): ----- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/linux-fontconfig/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 19 Mar 2007 05:13:58 -0000 1.18 +++ Makefile 23 May 2007 11:54:49 -0000 @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-fonts linux DISTNAME= ${PORTNAME}-${PORTVERSION}-13 @@ -29,5 +29,6 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf + ${REINPLACE_CMD} -i '' -e "s|/usr/X11R6|${X11BASE}|g" ${PREFIX}/etc/fonts/fonts.conf .include ----- WBR -- bsam Boris Samorodov (bsam) Research Engineer, http://www.ipt.ru Telephone & Internet SP FreeBSD committer, http://www.FreeBSD.org The Power To Serve