diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-11-22 19:25:10 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-11-22 19:25:10 +0000 |
| commit | 3dc317acea401928685e1f0892aef2710c030532 (patch) | |
| tree | 50cfaf871e55e20e38e139b96c73f0877b85b0de /x11-base | |
| parent | unstabled. (Manifest recommit) (diff) | |
| download | gentoo-2-3dc317acea401928685e1f0892aef2710c030532.tar.gz gentoo-2-3dc317acea401928685e1f0892aef2710c030532.tar.bz2 gentoo-2-3dc317acea401928685e1f0892aef2710c030532.zip | |
Fix problem where one could end up with '/usr/lib/fonts' font paths in xorg.conf.example by adding a new sed match. This happens because we changed from /usr/X11R6/libdir to /usr/libdir.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 820bdd806533..a5f5a96b0f60 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.223 2004/11/22 16:18:18 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.224 2004/11/22 19:25:10 spyderous Exp $ + + 22 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.0-r4.ebuild: + Fix problem where one could end up with '/usr/lib/fonts' font paths in + xorg.conf.example by adding a new sed match. This happens because we changed + from /usr/X11R6/libdir to /usr/libdir. 22 Nov 2004; Tom Gall <tgall@gentoo.org>; xorg-x11-6.7.0-r3.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild index bff814afcf76..7067f7f60783 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.13 2004/11/22 02:12:26 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.14 2004/11/22 19:25:10 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1280,7 +1280,8 @@ setup_xprint_init() { setup_config_files() { # Fix default config files after installing fonts to /usr/share/fonts - sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ + sed -i -e "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ + -e "s:/usr/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ ${D}/etc/X11/xorg.conf.example if use font-server; then sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ |