*** empty log message ***

3 files changed, 76 insertions, 2 deletions

diff --git a/x11-base/xfree/files/4.0.2/XftConfig b/x11-base/xfree/files/4.0.2/XftConfig
new file mode 100644
index 000000000000..16af856f7c29
--- /dev/null
+++ b/x11-base/xfree/files/4.0.2/XftConfig
@@ -0,0 +1,71 @@
+#
+# XftConfig
+#
+# Use with Type1 and TrueType fonts
+#
+
+dir "/usr/X11R6/lib/X11/fonts/Type1"
+dir "/usr/X11R6/lib/X11/fonts/truetype"
+
+#
+# alias 'fixed' for 'mono'
+#
+match any family == "fixed"		edit family =+ "mono";
+
+#
+#Check users config file
+#
+includeif	"~/.xftconfig"
+
+#
+# Substitute TrueType fonts for Type1 versions
+#
+match any family == "Times"		edit family += "Times New Roman";
+match any family == "Helvetica"		edit family += "Verdana";
+match any family == "Courier"		edit family += "Courier New";
+
+#
+# Use TrueType fonts for defaults
+#
+match any family == "serif" 		edit family += "Times New Roman";
+match any family == "sans" 		edit family += "Verdana";
+
+#
+# Use monotype.com (andale) face where possible
+#
+match 
+	any family == "mono" 
+	all slant == roman 
+	all weight < bold
+edit
+	family += "monotype.com";
+#
+# otherwise, use courier
+#
+match any family == "mono"		edit family += "Courier New";
+
+#
+# Alias between XLFD families and font file family name, prefer local fonts
+#
+match any family == "Charter"		edit family += "Bitstream Charter";
+match any family == "Bitstream Charter" edit family =+ "Charter";
+
+match any family == "Lucidux Serif"	edit family += "LuciduxSerif";
+match any family == "LuciduxSerif"	edit family =+ "Lucidux Serif";
+
+match any family == "Lucidux Sans"	edit family += "LuciduxSans";
+match any family == "LuciduxSans"	edit family =+ "Lucidux Sans";
+
+match any family == "Lucidux Mono"	edit family += "LuciduxMono";
+match any family == "LuciduxMono"	edit family =+ "Lucidux Mono";
+    
+#
+# TrueType font aliases
+#
+match any family == "Comic Sans"	edit family += "Comic Sans MS";
+match any family == "Comic Sans MS"	edit family =+ "Comic Sans";
+match any family == "Trebuchet" 	edit family += "Trebuchet MS";
+match any family == "Trebuchet MS" 	edit family =+ "Trebuchet";
+match any family == "Monotype" 		edit family =+ "Monotype.com";
+match any family == "Andale Mono"	edit family += "Monotype.com";
+match any family == "Monotype.com"	edit family =+ "Andale Mono";
diff --git a/x11-base/xfree/files/4.0.2/site.def b/x11-base/xfree/files/4.0.2/site.def
index 53f15f80fa3d..aeca05860b62 100644
--- a/x11-base/xfree/files/4.0.2/site.def
+++ b/x11-base/xfree/files/4.0.2/site.def
@@ -4,4 +4,4 @@
 #define ForceNormalLib YES
 #define BuildXinerama YES
 #define SharedLibXau YES
-#define Freetype2Dir /usr/lib/freetype2
+#define Freetype2Dir /usr
diff --git a/x11-base/xfree/xfree-4.0.2.ebuild b/x11-base/xfree/xfree-4.0.2.ebuild
index 82c083bc4156..75f7179669fb 100644
--- a/x11-base/xfree/xfree-4.0.2.ebuild
+++ b/x11-base/xfree/xfree-4.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2.ebuild,v 1.2 2000/12/21 08:22:29 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2.ebuild,v 1.3 2000/12/21 11:22:10 achim Exp $
 
 A="X402src-1.tgz X402src-2.tgz X402src-3.tgz"
 S=${WORKDIR}/xc
@@ -12,6 +12,7 @@ SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.
 	 $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz"
 
 DEPEND=">=sys-apps/bash-2.04
+	>=media-libs/freetype-2.0.1
 	>=sys-libs/glibc-2.1.3
 	>=sys-libs/gpm-1.19.3
 	>=sys-libs/ncurses-5.1"
@@ -30,6 +31,8 @@ src_compile() {
 src_install() {                               
     try make install DESTDIR=${D}
     try make install.man DESTDIR=${D}
+    insinto /usr/X11R6/lib/X11
+    doins ${FILESDIR}/${PV}/XftConfig
     preplib /usr/X11R6
 }