ports/112851: x11-fonts/linux-fontconfig /etc/fonts/fonts.conf not updated with xorg 7.2

[Boris Samorodov]

On Wed, 23 May 2007 13:39:02 +0200 Alexander Leidinger wrote:

> Quoting Pav Lucistnik <pav at FreeBSD.org> (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 <bsd.port.mk>
-----


WBR
-- 
bsam
Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD committer, http://www.FreeBSD.org The Power To Serve