add ttmkfdir2 and other patches

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 98d4cfed60abc3989eb60d03e20ccc746aff2736..a0f65bdca226c9b319872de2f31afed02f7f5bf4 100644 (file)
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.46 2002/10/12 15:30:38 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.47 2002/10/13 04:55:02 azarah Exp $
+
+  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
+
+  Add ttmkfdir2 to build.  This should close bug #6402.
+  
+  Add X-TrueType patches from Redhat.
 
   12 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
 

diff --git a/x11-base/xfree/files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2
new file mode 100644 (file)
index 0000000..74c8373
Binary files /dev/null and b/x11-base/xfree/files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 differ

diff --git a/x11-base/xfree/files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2
new file mode 100644 (file)
index 0000000..784d0bc
Binary files /dev/null and b/x11-base/xfree/files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 differ

diff --git a/x11-base/xfree/files/4.2.1-patches/095_all_4.2.1-ttmkfdir2-gentoo.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/095_all_4.2.1-ttmkfdir2-gentoo.patch.bz2
new file mode 100644 (file)
index 0000000..87c4330
Binary files /dev/null and b/x11-base/xfree/files/4.2.1-patches/095_all_4.2.1-ttmkfdir2-gentoo.patch.bz2 differ

diff --git a/x11-base/xfree/files/digest-xfree-4.2.1 b/x11-base/xfree/files/digest-xfree-4.2.1
index 4b0b537a88e70cf4ff399d4beddd77c775fabaa1..621cea27f00e3865c08899f5df2a45e3c6b585b0 100644 (file)
--- a/x11-base/xfree/files/digest-xfree-4.2.1
+++ b/x11-base/xfree/files/digest-xfree-4.2.1
@@ -2,9 +2,10 @@ MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532
 MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328
 MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679
 MD5 23d04bf0cfc48772b8d698c95eec37bd freetype-2.1.2.tar.bz2 742830
+MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
+MD5 61efb004b19befdb5335ef058323002c ttmkfdir2-1.0.tar.bz2 16650
 MD5 38adc94a4953a6b29e8619c25dda4887 4.2.0-4.2.1.diff.gz 54763
 MD5 17ce2d3e0dcad9cdc9fe7a8b38277a6e XFree86-4.2.1-patches-1.0.tar.bz2 168818
-MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 edd1643429f2ffcfde3ccecdf2f76c94 xf41sav.tgz 33105
 MD5 1877066730c28394e9048583390dc0d3 sis_drv_src_050902-2.tar.gz 286720

diff --git a/x11-base/xfree/xfree-4.2.1.ebuild b/x11-base/xfree/xfree-4.2.1.ebuild
index 7ee1f23f95b1a9c295426276d83caab184677e8c..6dba75c25ad259eb20c3ac90083175999d5cfe56 100644 (file)
--- a/x11-base/xfree/xfree-4.2.1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.13 2002/10/13 01:17:26 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.14 2002/10/13 04:55:02 azarah Exp $
 
 IUSE="sse nls mmx truetype 3dnow 3dfx"
 
@@ -73,6 +73,7 @@ SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
         ${SRC_PATH1}/X${MY_SV}src-3.tgz
         mirror://sourceforge/freetype/freetype-${FT2_VER}.tar.bz2
         http://fontconfig.org/release/fcpackage.${FC2_VER/\./_}.tar.gz
+        mirror://gentoo/ttmkfdir2-1.0.tar.bz2
         ${X_PATCHES}
         ${X_DRIVERS}
         truetype? ( ${MS_FONT_URLS} )"
@@ -85,7 +86,8 @@ DEPEND=">=sys-apps/baselayout-1.8.3
        >=sys-libs/ncurses-5.1
        >=sys-libs/pam-0.75
        >=sys-libs/zlib-1.1.3-r2
-       sys-devel/flex
+       >=sys-devel/flex-2.5.4a-r5
+       sys-devel/libtool
        sys-devel/perl
        >=media-libs/fontconfig-2.0
        >=media-libs/freetype-${FT2_VER}
@@ -112,6 +114,8 @@ src_unpack() {
                XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 \
                fcpackage.${FC2_VER/\./_}.tar.gz
 
+       cd ${S}; unpack ttmkfdir2-1.0.tar.bz2
+
        # Deploy our custom freetype2.  We want it static for stability,
        # and because some things in Gentoo depends the freetype2 that
        # is distributed with XFree86.
@@ -285,8 +289,11 @@ src_compile() {
        then
                cd ${S}/nls
                make || die
-               cd ${S}
        fi
+
+       einfo "Building ttmkfdir2..."
+       cd ${S}/ttmkfdir2
+       emake || die
 }
 
 src_install() {
@@ -309,9 +316,12 @@ src_install() {
        then
                cd ${S}/nls
                make DESTDIR=${D} install || die
-               cd ${S}
        fi
 
+       einfo "Installing ttmkfdir2..."
+       exeinto /usr/X11R6/bin
+       newexe ${S}/ttmkfdir2/ttmkfdir ttmkfdir2
+
        # Make sure user running xterm can only write to utmp.
        fowners root.utmp /usr/X11R6/bin/xterm
        fperms 2755 /usr/X11R6/bin/xterm
@@ -453,10 +463,42 @@ pkg_preinst() {
 pkg_postinst() {
 
        env-update
-       einfo "Making font dirs..."
-       LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
-       find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 \
-               -exec ${ROOT}/usr/X11R6/bin/mkfontdir {} \;
+
+       if [ "${ROOT}" = "/" ]
+       then
+               einfo "Making font dirs..."
+               LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
+               find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 \
+                       -exec ${ROOT}/usr/X11R6/bin/mkfontdir {} \;
+
+               einfo "Creating fonts.scale files..."
+               find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 \
+                       -exec ${ROOT}/usr/X11R6/bin/ttmkfdir2 -o {}/fonts.scale -d {} \;
+
+               einfo "Creating FC font cache..."
+               /usr/bin/fc-cache
+
+               einfo "Generating encodings..."
+               rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/fonts.{cache-1,dir,scale}
+               for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1)
+               do
+                       if [ "${x}" != "${ROOT}/usr/X11R6/lib/X11/fonts/encodings" ]
+                       then
+                               cd ${x}
+                               LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
+                               mkfontdir -n -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings
+                       fi
+               done
+
+               einfo "Fixing permissions..."
+               find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
+                       -exec chmod 0644 {} \;
+
+               # Switch to the xfree implementation.
+               # Use new opengl-update that will not reset user selected
+               # OpenGL interface ...
+               /usr/sbin/opengl-update --use-old xfree
+       fi
 
        # make sure all the Compose files are present
        for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d)
@@ -467,17 +509,6 @@ pkg_postinst() {
                fi
        done
 
-       # switch to the xfree implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               einfo "Creating font cache..."
-               /usr/bin/fc-cache
-
-               # use new opengl-update that will not reset user selected
-               # OpenGL interface ...
-               /usr/sbin/opengl-update --use-old xfree
-       fi
-
        # add back directories that portage nukes on unmerge
        if [ ! -d ${ROOT}/var/lib/xdm ]
        then