summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-05-24 02:38:03 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-05-24 02:38:03 +0000
commitfce982ef5be332a4ce9f79078d4c7607d871feec (patch)
treecfdaf0ff8c1d147b90d7a542f096ec74bec3b59b /x11-base/xorg-x11
parentseveral changes, new ebuilds, cleaned old ebuilds/files, fixed a few scripts ... (diff)
downloadgentoo-2-fce982ef5be332a4ce9f79078d4c7607d871feec.tar.gz
gentoo-2-fce982ef5be332a4ce9f79078d4c7607d871feec.tar.bz2
gentoo-2-fce982ef5be332a4ce9f79078d4c7607d871feec.zip
(#93034) There's a new FontEncDir that we also need to change to fit our FHS compatibility.
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild4
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 613a4798fd3e..a3d6cabd5182 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.386 2005/05/24 02:34:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.387 2005/05/24 02:38:03 spyderous Exp $
+
+ 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.99.5.ebuild:
+ (#93034) There's a new FontEncDir that we also need to change to fit our FHS
+ compatibility.
24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
index 792df46e7904..3590b196aa1e 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.99.5.ebuild,v 1.7 2005/05/24 02:34:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild,v 1.8 2005/05/24 02:38:03 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -539,6 +539,8 @@ host_def_setup() {
echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF}
echo "#define DocDir /usr/share/doc/${PF}" >> ${HOSTCONF}
echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
+ # Single quotes so FONTDIR doesn't get run
+ echo '#define FontEncDir $(FONTDIR)/encodings' >> ${HOSTCONF}
echo "#define BinDir /usr/bin" >> ${HOSTCONF}
echo "#define IncRoot /usr/include" >> ${HOSTCONF}
# This breaks the case when $(SYSTEMUSRINCDIR) = $(INCDIR)