fake:

remove old xorg package stf told me to ;-) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7862 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago · 008a331477
33 changed files with 0 additions and 3213 deletions
--- a/package/x11/xorg/apm.patch
+++ b/package/x11/xorg/apm.patch
@ -1,30 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/apm.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c.org	Fri Apr 13 13:03:24 2001
 +++ ./programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c	Fri Apr 13 13:04:06 2001
@@ -15,7 +15,7 @@
 #include <fcntl.h>
  
 #define APM_PROC   "/proc/apm"
 -#define APM_DEVICE "/dev/apm_bios"
 +#define APM_DEVICE "/dev/misc/apm_bios"
 
 #ifndef APM_STANDBY_FAILED
 # define APM_STANDBY_FAILED 0xf000
--- a/package/x11/xorg/changeProjectRoot.patch-disabled
+++ b/package/x11/xorg/changeProjectRoot.patch-disabled
@ -1,12 +0,0 @@
 diff -Nur xc-vanilla/config/cf/xorgsite.def xc/config/cf/xorgsite.def
 --- xc-vanilla/config/cf/xorgsite.def	2004-09-12 12:48:09.077330088 +0200
 +++ xc/config/cf/xorgsite.def	2004-09-12 12:59:27.096255544 +0200
@@ -699,4 +699,7 @@
 #define X86EMU_LIBPATH /usr/local/lib
  */ 
 
 -
 +/*
 + * Install xorg in the special directory /usr/X11R6-xorg
 + */
 +#define ProjectRoot /usr/X11R6-xorg
--- a/package/x11/xorg/config.hlp
+++ b/package/x11/xorg/config.hlp
@ -1,29 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/config.hlp
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 MENU_PKG_XORG
  Here you'll find options for X.Org.

 ROCKCFG_PKG_XFREE86_XINERAMA
  This options enables support for Xinerama globally - so many packages
  are build with special multi-head support.

--- a/package/x11/xorg/config.in
+++ b/package/x11/xorg/config.in
@ -1,62 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/config.in
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 if pkgcheck xfree86 X || pkgcheck xorg X
 then
  menu_begin MENU_PKG_XORG 'X.Org / XFree86 Options'

 	if pkgcheck xfree86 X && pkgcheck xorg X
 	then
 		bool 'Build X.Org (instead of Xfree86)' \
 			ROCKCFG_PKG_XORG_BUILD 1

 		if [ $ROCKCFG_PKG_XORG_BUILD = 1 ] ; then
 			pkgremove xfree86
 		else
 			pkgremove xorg
 		fi
 	else
 		if pkgcheck xfree86 X; then
 			comment 'Using XFree86 (xorg already disabled)'
 		fi
 		if pkgcheck xorg X; then
 			comment 'Using X.Org (xfree86 already disabled)'
 		fi
 	fi

 	bool 'Enable Xinerama support globally' \
 		ROCKCFG_PKG_XORG_XINERAMA 1
  menu_end
 fi

 if ! pkgcheck xfree86 X; then
 	pkgremove xfree86
 	pkgremove xfree86-cyrillic-fonts
 	pkgremove xfree86-doc
 fi

 if ! pkgcheck xorg X; then
 	pkgremove xorg
 	pkgremove xcompmgr
 	pkgremove transset
 fi

--- a/package/x11/xorg/freetype2.patch
+++ b/package/x11/xorg/freetype2.patch
@ -1,297 +0,0 @@
 Copied from https://bugs.freedesktop.org/attachment.cgi?id=6033
 File names adapted for X.Org 6.9.0

 diff -urbN ./lib/font/FreeType/ftfuncs.c ./lib/font/FreeType/ftfuncs.c
 --- ./lib/font/FreeType/ftfuncs.c	2005-10-24 02:32:05.000000000 +0800
 +++ ./lib/font/FreeType/ftfuncs.c	2006-06-25 10:56:24.221147322 +0800
@@ -54,10 +54,7 @@
 #include FT_TYPE1_TABLES_H
 #include FT_XFREE86_H
 #include FT_BBOX_H
 -#include FT_INTERNAL_TRUETYPE_TYPES_H
 #include FT_TRUETYPE_TAGS_H
 -#include FT_INTERNAL_SFNT_H
 -#include FT_INTERNAL_STREAM_H
 /*
  *  If you want to use FT_Outline_Get_CBox instead of 
  *  FT_Outline_Get_BBox, define here.
@@ -123,6 +120,25 @@
 };
 
 
 +/* read 2-byte value from a SFNT table */
 +static FT_UShort
 +sfnt_get_ushort( FT_Face     face,
 +                 FT_ULong    table_tag,
 +                 FT_ULong    table_offset )
 +{
 +  FT_Byte    buff[2];
 +  FT_ULong   len = sizeof(buff);
 +  FT_UShort  result = 0;
 +
 +  if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
 +    result = (FT_UShort)( (buff[0] << 8) | buff[1] );
 +
 +  return result;
 +}
 +
 +#define  sfnt_get_short(f,t,o)  ((FT_Short)sfnt_get_ushort((f),(t),(o)))
 +
 +
 static int ftypeInitP = 0;      /* is the engine initialised? */
 FT_Library ftypeLibrary;
 
@@ -211,6 +227,10 @@
         if(maxp && maxp->maxContours == 0)
             face->bitmap = 1;
     }
 +
 +    face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
 +                                                    TTAG_hhea, 34 );
 +
     /* Insert face in hashtable and return it */
     face->next = faceTable[bucket];
     faceTable[bucket] = face;
@@ -462,6 +482,34 @@
     }
 
     if( FT_IS_SFNT( face->face ) ) {
 +#if 1
 +        FT_F26Dot6  tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
 +        FT_UInt     nn;
 +
 +        instance->strike_index=0xFFFFU;
 +
 +        tt_char_width  = (FT_F26Dot6)(trans->scale*(1<<6) + 0.5);
 +        tt_char_height = (FT_F26Dot6)(trans->scale*(1<<6) + 0.5);
 +
 +        tt_dim_x = FLOOR64( ( tt_char_width  * trans->xres + 36 ) / 72 + 32 );
 +        tt_dim_y = FLOOR64( ( tt_char_height * trans->yres + 36 ) / 72 + 32 );
 +
 +	if ( tt_dim_x && !tt_dim_y )
 +	    tt_dim_y = tt_dim_x;
 +	else if ( !tt_dim_x && tt_dim_y )
 +	    tt_dim_x = tt_dim_y;
 +
 +        for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
 +        {
 +          FT_Bitmap_Size*  sz = &face->face->available_sizes[nn];
 +
 +          if ( tt_dim_x == FLOOR64(sz->x_ppem + 32) && tt_dim_y == FLOOR64(sz->y_ppem + 32) )
 +          {
 +            instance->strike_index = nn;
 +            break;
 +          }
 +        }
 +#else
 	/* See Set_Char_Sizes() in ttdriver.c */
 	FT_Error err;
 	TT_Face tt_face;
@@ -486,6 +534,7 @@
 	sfnt   = (SFNT_Service)tt_face->sfnt;
 	err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
 	if ( err ) instance->strike_index=0xFFFFU;
 +#endif
     }
 
     /* maintain a linked list of instances */
@@ -803,31 +852,61 @@
  * parse the htmx field in TrueType font.
  */
 
 -/* from src/truetype/ttgload.c */
 static void
 -tt_get_metrics( TT_HoriHeader*  header,
 +tt_get_metrics( FT_Face         face,
 		FT_UInt         idx,
 +		FT_UInt         num_hmetrics,
 		FT_Short*       bearing,
 		FT_UShort*      advance )
 -/*  Copyright 1996-2001, 2002 by                      */
 -/*  David Turner, Robert Wilhelm, and Werner Lemberg. */
 {
 -    TT_LongMetrics  longs_m;
 -    FT_UShort       k = header->number_Of_HMetrics;
 +   /* read the metrics directly from the horizontal header, we
 +    * parse the SFNT table directly through the standard FreeType API.
 +    * this works with any version of the library and doesn't need to
 +    * peek at its internals. Maybe a bit less
 +    */
 +    FT_UInt  count  = num_hmetrics;
 +    FT_ULong length = 0;
 +    FT_ULong offset = 0;
 +    FT_Error error;
 
 -    if ( k == 0 ) {
 -	*bearing = *advance = 0;
 -	return;
 -    }
 +    error = FT_Load_Sfnt_Table( face, TTAG_hmtx, 0, NULL, &length );
 
 -    if ( idx < (FT_UInt)k ) {
 -	longs_m  = (TT_LongMetrics )header->long_metrics + idx;
 -	*bearing = longs_m->bearing;
 -	*advance = longs_m->advance;
 +    if ( count == 0 || error )
 +    {
 +      *advance = 0;
 +      *bearing = 0;
 +    }
 +    else if ( idx < count )
 +    {
 +	offset = idx * 4L;
 +	if ( offset + 4 > length )
 +	{
 +	    *advance = 0;
 +	    *bearing = 0;
 +	}
 +	else
 +	{
 +	    *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
 +	    *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
 +	}
 +    }
 +    else
 +    {
 +	offset = 4L * (count - 1);
 +	if ( offset + 4 > length )
 +	{
 +	    *advance = 0;
 +	    *bearing = 0;
 +	}
 +	else
 +	{
 +	    *advance = sfnt_get_ushort ( face, TTAG_hmtx, offset );
 +	    offset += 4 + 2 * ( idx - count );
 +	    if ( offset + 2 > length)
 +		*bearing = 0;
 +	    else
 +		*bearing = sfnt_get_short ( face, TTAG_hmtx, offset );
     }
 -    else {
 -	*bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
 -	*advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
     }
 }
 
@@ -835,6 +914,7 @@
 ft_get_very_lazy_bbox( FT_UInt index,
 		       FT_Face face,
 		       FT_Size size,
 +		       FT_UInt num_hmetrics,
 		       double slant,
 		       FT_Matrix *matrix,
 		       FT_BBox *bbox,
@@ -842,15 +922,14 @@
 		       FT_Long *vertAdvance)
 {
     if ( FT_IS_SFNT( face ) ) {
 -	TT_Face   ttface = (TT_Face)face;
 	FT_Size_Metrics *smetrics = &size->metrics;
 	FT_Short  leftBearing = 0;
 	FT_UShort advance = 0;
 	FT_Vector p0, p1, p2, p3;
 
 	/* horizontal */
 -	tt_get_metrics(&ttface->horizontal, index,
 -		       &leftBearing, &advance);
 +	tt_get_metrics( face, index, num_hmetrics,
 +		       &leftBearing, &advance );
 
 #if 0
 	fprintf(stderr,"x_scale=%f y_scale=%f\n",
@@ -910,7 +989,27 @@
 		    FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
 		    int *sbitchk_incomplete_but_exist )
 {
 -#if (FREETYPE_VERSION >= 2001008)
 +#if 1
 +    if ( strike_index != 0xFFFFU && ft_face->available_sizes != NULL )
 +    {
 +      FT_Error         error;
 +      FT_Bitmap_Size*  sz = &ft_face->available_sizes[strike_index];
 +
 +      error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
 +      if ( !error )
 +      {
 +        error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
 +        if ( !error )
 +        {
 +          if ( metrics_return != NULL )
 +            *metrics_return = ft_face->glyph->metrics;
 +
 +          return 0;
 +        }
 +      }
 +    }
 +    return -1;
 +#elif (FREETYPE_VERSION >= 2001008)
     SFNT_Service       sfnt;
     TT_Face            face;
     FT_Error           error;
@@ -1043,6 +1142,7 @@
 	    if( bitmap_metrics == NULL ) {
 		if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
 		    if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
 +					       face->num_hmetrics,
 					       instance->ttcap.vl_slant,
 					       &instance->transformation.matrix,
 					       &bbox, &outline_hori_advance, 
@@ -1207,10 +1307,27 @@
 	}
 
 	if( face->face->glyph->format != FT_GLYPH_FORMAT_BITMAP ) {
 +#ifdef USE_GET_CBOX
 +	    FT_Outline_Get_CBox(&face->face->glyph->outline, &bbox);
 +	    ftrc = 0;
 +#else
 +	    ftrc = FT_Outline_Get_BBox(&face->face->glyph->outline, &bbox);
 +#endif
 +	    if( ftrc != 0 ) return FTtoXReturnCode(ftrc);
 +	    bbox.yMin = FLOOR64( bbox.yMin );
 +	    bbox.yMax = CEIL64 ( bbox.yMax );
 +	    ht_actual = ( bbox.yMax - bbox.yMin ) >> 6;
 +	    /* FreeType think a glyph with 0 height control box is invalid. 
 +	     * So just let X to create a empty bitmap instead. */
 +	    if ( ht_actual == 0 )
 +		is_outline = -1;
 +	    else
 +	    {
 	    ftrc = FT_Render_Glyph(face->face->glyph,FT_RENDER_MODE_MONO);
 	    if( ftrc != 0 ) return FTtoXReturnCode(ftrc);
 	    is_outline = 1;
 	}
 +	}
 	else{
 	    is_outline=0;
 	}
@@ -1221,6 +1338,7 @@
 	if( is_outline == 1 ){
 	    if( correct ){
 		if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
 +					   face->num_hmetrics,
 					   instance->ttcap.vl_slant,
 					   &instance->transformation.matrix,
 					   &bbox, &outline_hori_advance, 
 diff -urbN ./lib/font/FreeType/ftfuncs.h ./lib/font/FreeType/ftfuncs.h
 --- ./lib/font/FreeType/ftfuncs.h	2005-07-07 22:59:47.000000000 +0800
 +++ ./lib/font/FreeType/ftfuncs.h	2006-06-21 21:05:28.533849804 +0800
@@ -47,6 +47,7 @@
     char *filename;
     FT_Face face;
     int bitmap;
 +    FT_UInt num_hmetrics;
     struct _FTInstance *instances;
     struct _FTInstance *active_instance;
     struct _FTFace *next;       /* link to next face in bucket */
 diff -urbN ./lib/font/FreeType/ftsystem.c ./lib/font/FreeType/ftsystem.c
 --- ./lib/font/FreeType/ftsystem.c	2005-07-09 14:36:10.000000000 +0800
 +++ ./lib/font/FreeType/ftsystem.c	2006-06-21 21:05:28.534849622 +0800
@@ -35,7 +35,6 @@
 #endif
 #include <ft2build.h>
 #include FT_CONFIG_CONFIG_H
 -#include FT_INTERNAL_DEBUG_H
 #include FT_SYSTEM_H
 #include FT_ERRORS_H
 #include FT_TYPES_H
--- a/package/x11/xorg/imake_rules.patch
+++ b/package/x11/xorg/imake_rules.patch
@ -1,33 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/imake_rules.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./config/cf/Imake.rules.orig	2003-03-23 11:44:47.000000000 +0100
 +++ ./config/cf/Imake.rules	2003-03-23 11:50:43.000000000 +0100
@@ -1693,8 +1693,9 @@
 		(cd Concat($(DESTDIR),npath/mdir); \			@@\
 		 tar xf -; exit 0); exit 0); \				@@\
 	  fi; \								@@\
 -	  $(RM) -r rdir; \						@@\
 -	  $(LN) Concat($${RELPATH},npath/mdir) ldir; \			@@\
 +	  if [ ! -e rdir ]; then \					@@\
 +	    $(LN) Concat($${RELPATH},npath/mdir) ldir; \		@@\
 +	  fi; \								@@\
 	fi
 #else
 #define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath)
--- a/package/x11/xorg/imake_tmpl.patch
+++ b/package/x11/xorg/imake_tmpl.patch
@ -1,42 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/imake_tmpl.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./config/cf/Imake.tmpl.orig	Sun Mar 10 22:44:13 2002
 +++ ./config/cf/Imake.tmpl	Sun Mar 10 22:44:52 2002
@@ -1036,10 +1036,10 @@
 #define GzipCmd gzip
 #endif
 #ifndef CppCmd
 -#define CppCmd /LibDirName/cpp
 +#define CppCmd cpp
 #endif
 #ifndef RawCppCmd
 -#define RawCppCmd CppCmd -undef
 +#define RawCppCmd CppCmd
 #endif
 #ifndef CppNoLineInfoOption
 #define CppNoLineInfoOption /**/
@@ -1491,6 +1491,7 @@
 
           INCROOT = IncRoot		/* base of where to put header files */
         USRLIBDIR = UsrLibDir		/* nonshared libraries */
 +        MODULEDIR = $(USRLIBDIR)/modules /* Added by Clifford */
            VARDIR = VarDirectory	/* usually /var */
         VARLIBDIR = VarLibDir		/* xdm runtime files */
   SYSTEMUSRLIBDIR = SystemUsrLibDir	/* system's "/usr/lib" */
--- a/package/x11/xorg/imakemdep_ppc.patch
+++ b/package/x11/xorg/imakemdep_ppc.patch
@ -1,31 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/imakemdep_ppc.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./config/imake/imakemdep.h.orig	Wed Nov 29 17:33:50 2000
 +++ ./config/imake/imakemdep.h	Thu Dec 28 15:44:10 2000
@@ -364,6 +364,9 @@
 # ifdef __m68k__
 	"-D__m68k__",
 # endif
 +# ifdef __powerpc__
 +	"-D__powerpc__",
 +# endif
 # ifdef __GNUC__
 	"-traditional",
 # endif
--- a/package/x11/xorg/linux-joystick_h.patch
+++ b/package/x11/xorg/linux-joystick_h.patch
@ -1,41 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/linux-joystick_h.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 diff -dur xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c
 --- xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c	2004-04-23 21:54:05.000000000 +0200
 +++ src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c	2005-10-20 21:27:44.000000000 +0200
@@ -5,8 +5,18 @@
 #include <string.h>
 #include <errno.h>
 #define inline __inline__
 +
 +#ifdef __STRICT_ANSI__
 +#define REDEFINE__STRICT_ANSI__
 +#undef __STRICT_ANSI__
 +#endif
 +
 #include <linux/joystick.h>
 
 +#ifdef REDEFINE__STRICT_ANSI__
 +#define __STRICT_ANSI__
 +#endif
 +
 #undef BUS_ISA
 #undef BUS_PCI
 
--- a/package/x11/xorg/local.conf.data
+++ b/package/x11/xorg/local.conf.data
@ -1,64 +0,0 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts.conf file to configure system font access -->
 <fontconfig>

 <!-- Overwrite (currently) broken fonts.
 -->

        <match target="pattern">
                <test qual="any" name="family">
                        <string>Helvetica</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Arial</string>
                </edit>
        </match>

        <match target="pattern">
                <test qual="any" name="family">
                        <string>Lucida</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Arial</string>
                </edit>
        </match>

        <match target="pattern">
                <test qual="any" name="family">
                        <string>Fixed</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Andale Mono</string>
                </edit>
        </match>

        <match target="pattern">
                <test qual="any" name="family">
                        <string>Charter</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Agate</string>
                </edit>
        </match>

        <match target="pattern">
                <test qual="any" name="family">
                        <string>Clean</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Andale Mono</string>
                </edit>
        </match>

        <match target="pattern">
                <test qual="any" name="family">
                        <string>Times</string>
                </test>
                <edit name="family" mode="assign">
                        <string>Times New Roman</string>
                </edit>
        </match>

 </fontconfig>

--- a/package/x11/xorg/macintosh-xkb-us-de-ibook.patch
+++ b/package/x11/xorg/macintosh-xkb-us-de-ibook.patch
@ -1,89 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/macintosh-xkb-us-de-ibook.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 Otherwise all the third and fourth level symbols are not reachable on
 iBooks :-(((

  Rene Rebe <rene@exactcode.de>

 --- xc/programs/xkbcomp/symbols/macintosh/us_ibook.orig	1970-01-01 01:00:00.000000000 +0100
 +++ xc/programs/xkbcomp/symbols/macintosh/us_ibook	2003-09-04 01:15:45.000000000 +0200
@@ -0,0 +1,23 @@
 +// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
 +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.1 2000/09/19 12:46:25 eich Exp $
 +
 +// rene@exactcode.de - make the iBook useable
 +
 +default partial alphanumeric_keys 
 +xkb_symbols "basic" {
 +
 +    include "macintosh/us(basic)"
 +
 +    // Describes the differences between a very simple US/ASCII
 +    // keyboard and a very simple iBook keybaord
 +
 +    // Alphanumeric section
 +    name[Group1]= "US/ASCII";
 +    key <BKSP> {	[ BackSpace,    BackSpace		],
 +			[ Delete				]	};
 +    // begin modifier mappings
 +    key <LMTA> {	[ Alt_L,	Meta_L	]	};
 +    key <RMTA> {	[ Alt_R,	Meta_R	]	};
 +
 +};
 +
 --- xc/programs/xkbcomp/symbols/macintosh/de_ibook.orig	1970-01-01 01:00:00.000000000 +0100
 +++ xc/programs/xkbcomp/symbols/macintosh/de_ibook	2003-09-04 01:15:56.000000000 +0200
@@ -0,0 +1,25 @@
 +// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
 +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.1 2000/09/19 12:46:25 eich Exp $
 +
 +// rene@exactcode.de - make the iBook useable
 +
 +default partial alphanumeric_keys 
 +xkb_symbols "basic" {
 +    include "macintosh/de(basic)"
 +
 +    // Describes the differences between a very simple US/ASCII
 +    // keyboard and a very simple iBook keybaord
 +
 +    // Alphanumeric section
 +    name[Group1]= "German";
 +    key <BKSP> {	[ BackSpace,    BackSpace		],
 +			[ Delete				]	};
 +
 +    // begin modifier mappings
 +    key <LMTA> {	[ Alt_L,	Meta_L	]	};
 +    key <RMTA> {	[ Alt_R,	Meta_R	]	};
 +
 +    key <LALT> {	[ Mode_switch,	Multi_key	]	};
 +
 +};
 +
 --- xc/programs/xkbcomp/symbols/macintosh/Imakefile.orig	2003-12-03 16:48:53.000000000 +0100
 +++ xc/programs/xkbcomp/symbols/macintosh/Imakefile	2003-12-03 16:49:14.000000000 +0100
@@ -3,7 +3,7 @@
 XCOMM
 XCOMM $XFree86: xc/programs/xkbcomp/symbols/macintosh/Imakefile,v 1.3 2000/10/02 02:32:17 tsi Exp $
 
 -     DATAFILES = de de_CH dk es fi fr fr_CH gb it nl no pt se us
 +     DATAFILES = de de_CH de_ibook dk es fi fr fr_CH gb it nl no pt se us us_ibook
 
 all::
 
--- a/package/x11/xorg/no-fc-cache-run.patch
+++ b/package/x11/xorg/no-fc-cache-run.patch
@ -1,48 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/no-fc-cache-run.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 The run of fc-cache makes X.org depend on any other font package - which
 is -well- sub-optimal ... ;-)

  - Rene Rebe <rene@exactcode.de>

 --- xc/programs/fc-cache/Imakefile.orig	2003-09-19 00:31:32.000000000 +0200
 +++ xc/programs/fc-cache/Imakefile	2003-09-19 00:26:02.000000000 +0200
@@ -15,7 +15,7 @@
 
 install::
 	if [ x$${DESTDIR} = x ]; then \
 -		$(FCCACHE) -v -f;\
 +		echo "You should run $(FCCACHE) -v -f later ..." ;\
 	fi
 
 LinkSourceFile(fc-cache.c,$(FONTCONFIGDIR)/fc-cache)
 --- xc/config/cf/X11.tmpl.orig	2003-09-09 20:05:52.000000000 +0300
 +++ xc/config/cf/X11.tmpl	2003-10-18 15:18:04.000000000 +0300
@@ -3523,9 +3523,7 @@
 # endif /* MakeFcCache */
 
 # ifndef InstallFcCache
 -#  define InstallFcCache(dest)						@@\
 -install::								@@\
 -	RunProgram(FCCACHE, $(FCCACHEOPTS) $(DESTDIR)dest)
 +#  define InstallFcCache(dest)
 # endif /* InstallFcCache */
 
 #else
--- a/package/x11/xorg/no-multilib.patch
+++ b/package/x11/xorg/no-multilib.patch
@ -1,11 +0,0 @@
 --- xc/config/cf/linux.cf.orig	2006-03-18 20:22:58.000000000 +0000
 +++ xc/config/cf/linux.cf	2006-03-18 20:23:25.000000000 +0000
@@ -541,7 +541,7 @@
 #define MkdirHierCmd		mkdir -p
 
 #ifndef HaveLib64
 -# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
 +# if defined (s390xArchitecture) 
 #  define HaveLib64	YES
 # else
 #  define HaveLib64	NO
--- a/package/x11/xorg/parse-config
+++ b/package/x11/xorg/parse-config
@ -1,33 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/parse-config
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 if [ "$ROCKCFG_PKG_XORG_XINERAMA" = 1 ] ; then
 	var_append confopt " " "--with-xinerama"
 fi

 if [ "$stagelevel" -gt 1 -a -d "/usr/X11/bin" ]; then
 	# ouch! some packages seam to be using
 	# this variables in ./configure
 	export XBINDIR=/usr/X11/bin
 	export XLIBDIR=/usr/X11/lib
 fi

--- a/package/x11/xorg/radeon-accel-asm-volatile.patch
+++ b/package/x11/xorg/radeon-accel-asm-volatile.patch
@ -1,20 +0,0 @@
 --- ./programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c.orig	2006-04-09 17:13:15.000000000 +0200
 +++ ./programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c	2006-04-09 17:16:27.000000000 +0200
@@ -730,7 +730,7 @@
 
 	    for (; nwords > 0; --nwords, ++d, ++s)
 #ifdef __powerpc__
 -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
 +		__asm__ __volatile__("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
 #else
 		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
@@ -745,7 +745,7 @@
 
 	    for (; nwords > 0; --nwords, ++d, ++s)
 #ifdef __powerpc__
 -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
 +		__asm__ __volatile__("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
 #else
 	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
--- a/package/x11/xorg/sparc-keyboard-def-26headers.patch
+++ b/package/x11/xorg/sparc-keyboard-def-26headers.patch
@ -1,41 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/sparc-keyboard-def-26headers.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~	2004-08-21 16:22:07.000000000 +0200
 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2004-08-21 19:54:02.000000000 +0200
@@ -102,7 +102,7 @@
 
 /* Deal with spurious kernel header change */
 #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
 -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
 +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) && !defined(__sparc__)
 #  define rate period
 # endif
 #endif
 --- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~	2004-08-21 16:22:07.000000000 +0200
 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2004-08-21 19:53:22.000000000 +0200
@@ -75,7 +75,7 @@
 
 /* Deal with spurious kernel header change */
 #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
 -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
 +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) && !defined(__sparc__)
 #  define rate period
 # endif
 #endif
--- a/package/x11/xorg/startwm.patch
+++ b/package/x11/xorg/startwm.patch
@ -1,70 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/startwm.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 More flexible root application startup. Kind of ROCK Linux specific.

 --- ./programs/xdm/config/Xsetup_0.orig	Wed Apr 27 09:20:03 1994
 +++ ./programs/xdm/config/Xsetup_0	Thu Dec 28 15:23:15 2000
@@ -1,3 +1,4 @@
 #!/bin/sh
 # $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $
 xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
 +xsetroot -solid black
 --- ./programs/xdm/config/Xsession.cpp.orig	2006-03-18 22:31:35.000000000 +0000
 +++ ./programs/xdm/config/Xsession.cpp	2006-03-18 22:33:23.000000000 +0000
@@ -56,5 +56,14 @@
                 exec `eval $XDESKTOP`
         }
 #endif
 +
 +XCOMM we need at least the PATH /opt/.../bin expansion ...
 +	[ -f /etc/profile ] && . /etc/profile
 +
 +	WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
 +	[ "$WINDOWMANAGER" =  "gnome" ] && WINDOWMANAGER="gnome-session"
 +	[ "$WINDOWMANAGER" =  "kde"   ] && WINDOWMANAGER="startkde"
 +	[ "$WINDOWMANAGER" != "twm" -a -n "$(type -p ${WINDOWMANAGER%% *})" ] && exec $WINDOWMANAGER
 +	xsetroot -solid darkcyan ; exec twm ; exec xterm
 	exec BINDIR/xsm
 fi
 --- ./programs/xinit/xinitrc.cpp.orig	2006-03-18 22:36:41.000000000 +0000
 +++ ./programs/xinit/xinitrc.cpp	2006-03-18 22:38:20.000000000 +0000
@@ -24,7 +24,7 @@
     XMODMAP $usermodmap
 fi
 
 -XCOMM start some nice programs
 +XCOMM start the window manager
 
 #if defined(__SCO__) || defined(__UNIXWARE__)
 if [ -r /etc/default/xdesktops ]; then
@@ -68,8 +68,8 @@
 
 XCOMM This is the fallback case if nothing else is executed above
 #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
 -TWM &
 -XCLOCK -geometry 50x50-1+1 &
 -XTERM -geometry 80x50+494+51 &
 -XTERM -geometry 80x20+494-0 &
 -exec XTERM -geometry 80x66+0+0 -name login
 +WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
 +[ "$WINDOWMANAGER" =  "gnome" ] && WINDOWMANAGER="gnome-session"
 +[ "$WINDOWMANAGER" =  "kde"   ] && WINDOWMANAGER="startkde"
 +[ "$WINDOWMANAGER" != "twm" -a -n "$(type -p ${WINDOWMANAGER%% *})" ] && exec $WINDOWMANAGER
 +xsetroot -solid darkcyan ; exec twm ; exec xterm
--- a/package/x11/xorg/startxdm.sh
+++ b/package/x11/xorg/startxdm.sh
@ -1,13 +0,0 @@
 #!/bin/sh

 XDM=/usr/X11/bin/xdm

 [ -e /etc/conf/xdm ] && . /etc/conf/xdm

 [ "$1" = "-nodaemon" ] && case $XDM in
 	*gdm*|*kdm*|*xdm*) ;;
 	*) shift ;;
 esac

 $XDM "$@"

--- a/package/x11/xorg/stone_mod_xorg.sh
+++ b/package/x11/xorg/stone_mod_xorg.sh
@ -1,99 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/stone_mod_xorg.sh
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 #
 # [MAIN] 50 xorg X11/X.Org (Graphical User Interface)

 set_wm() {
 	echo "export WINDOWMANAGER=\"$1\"" > /etc/profile.d/windowmanager
 }

 set_xdm() {
 	echo "export XDM=\"$1\"" > /etc/conf/xdm
 }

 main() {
 	while
 		WINDOWMANAGER=""
 		if [ -f /etc/profile.d/windowmanager ]; then
 			. /etc/profile.d/windowmanager
 		fi

 		XDM=""
 		if [ -f /etc/conf/xdm ]; then
 			. /etc/conf/xdm
 		fi

 		cmd="gui_menu xorg 'X.Org Configuration Menu'

 		'Run xorgcfg (recommended, new interactive config)'
 			'gui_cmd xorgcfg xorgcfg -config /etc/X11/xorg.conf'

 		'Run X -configure (automated config)'
 			'gui_cmd Xorg Xorg -configure ; mv /root/xorg.conf.new /etc/X11/xorg.conf'

 		'Run xorgconfig (old textual config)'
 			'gui_cmd xorgconfig xorgconfig'"

 		cmd="$cmd '' ''"

 		for x in /usr/share/rock-registry/xdm/* ; do
 		  if [ -f $x ] ; then
 			. $x

 			if [ "$XDM" = "$exec" ]; then
 			pre='[*]' ; else
 			pre='[ ]' ; fi

 			cmd="$cmd
 			    '$pre Use $name in runlevel 5'
 			    'set_xdm \"$exec\"'"
 		  fi
 		done

 		cmd="$cmd '' ''"

 		for x in /usr/share/rock-registry/wm/* ; do
 		  if [ -f $x ] ; then
 			. $x

 			if [ "$WINDOWMANAGER" = "$exec" ]; then
 			pre='[*]' ; else
 			pre='[ ]' ; fi

 			cmd="$cmd
 			    '$pre Use $name as default Windowmanager'
 			    'set_wm \"$exec\"'"
 		  fi
 		done

 		cmd="$cmd '' ''"

 		cmd="$cmd
 		'Edit/View /etc/X11/xorg.conf'
 			'gui_edit xorg.conf /etc/X11/xorg.conf'
 		'Edit/View /etc/profile.d/windowmanager'
 			'gui_edit WINDOWMANAGER /etc/profile.d/windowmanager'"

 		eval $cmd
 	do : ; done
 }

--- a/package/x11/xorg/twm-defaults.patch
+++ b/package/x11/xorg/twm-defaults.patch
@ -1,138 +0,0 @@

 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/twm-defaults.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 Some twm configs Clifford likes more ...

 --- xc/programs/twm/system.twmrc.orig	2003-08-28 02:06:28.000000000 +0200
 +++ xc/programs/twm/system.twmrc	2003-08-28 02:36:46.000000000 +0200
@@ -12,6 +12,8 @@
 # $XFree86: xc/programs/twm/system.twmrc,v 1.5 2003/08/04 10:32:30 eich Exp $
 #
 
 +NoDefaults
 +
 NoGrabServer
 RestartPreviousState
 DecorateTransients
@@ -21,6 +23,9 @@
 IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
 IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*"
 #ClientBorderWidth
 +RandomPlacement
 +AutoRelativeResize
 +IconifyByUnmapping
 
 Color
 {
@@ -47,48 +52,65 @@
 MoveDelta 3
 Function "move-or-lower" { f.move f.deltastop f.lower }
 Function "move-or-raise" { f.move f.deltastop f.raise }
 -Function "move-or-iconify" { f.move f.deltastop f.iconify }
 +Function "xiconify" { f.iconify f.showiconmgr }
 
 #
 # Set some useful bindings.  Sort of uwm-ish, sort of simple-button-ish
 #
 -Button1 = : root : f.menu "defops"
 
 -Button1 = m : window|icon : f.function "move-or-lower"
 -Button2 = m : window|icon : f.iconify
 -Button3 = m : window|icon : f.function "move-or-raise"
 +LeftTitleButton "opendotMask" = f.function "xiconify"
 +RightTitleButton "star" = f.delete
 +
 +Button1 = : root : f.menu "defops"
 +Button2 = : root : f.menu "apps"
 +Button3 = : root : f.exec "xterm &"
 
 Button1 = : title : f.function "move-or-raise"
 -Button2 = : title : f.raiselower
 +Button2 = : title : f.fullzoom
 +Button3 = : title : f.function "move-or-lower"
 
 -Button1 = : icon : f.function "move-or-iconify"
 -Button2 = : icon : f.iconify
 +Button1 = : icon : f.function "xiconify"
 +Button3 = : icon : f.identify
 +
 +Button1 = : iconmgr : f.function "xiconify"
 +Button2 = : iconmgr : f.raise
 +Button3 = : iconmgr : f.identify
 +
 +Button1 = : frame : f.resize
 +Button2 = : frame : f.raiselower
 +Button3 = : frame : f.function "move-or-raise"
 
 -Button1 = : iconmgr : f.iconify
 -Button2 = : iconmgr : f.iconify
 
 #
 # And a menus with the usual things
 #
 menu "defops"
 {
 -"Twm"	f.title
 -"Iconify"	f.iconify
 -"Resize"	f.resize
 -"Move"		f.move
 -"Raise"		f.raise
 -"Lower"		f.lower
 -""		f.nop
 -"Focus"		f.focus
 -"Unfocus"	f.unfocus
 -"Show Iconmgr"	f.showiconmgr
 -"Hide Iconmgr"	f.hideiconmgr
 -""		f.nop
 -"Xterm"		f.exec "exec xterm &"
 -""		f.nop
 -"Kill"		f.destroy
 -"Delete"	f.delete
 -""		f.nop
 -"Restart"	f.restart
 -"Exit"		f.quit
 +	"TWM"		f.title
 +	"Iconify"	f.iconify
 +	"Resize"	f.resize
 +	"Move"		f.move
 +	"Raise"		f.raise
 +	"Lower"		f.lower
 +	"Zoom"		f.fullzoom
 +	""		f.nop
 +	"Focus"		f.focus
 +	"Unfocus"	f.unfocus
 +	"Show Iconmgr"	f.showiconmgr
 +	"Hide Iconmgr"	f.hideiconmgr
 +	""		f.nop
 +	"Kill"		f.destroy
 +	"Delete"	f.delete
 +	""		f.nop
 +	"Restart"	f.restart
 +	"Exit"		f.quit
 +}
 +
 +menu "apps"
 +{
 +	"Applications"		f.title
 +	"xTerm"			f.exec "xterm &"
 +	"xTerm (black)"		f.exec "xterm -fg white -bg black &"
 +	"Mozilla"		f.exec "mozilla &"
 +	"Icon Manager"		f.showiconmgr
 }
--- a/package/x11/xorg/x11r6.9.0-geteuid.patch
+++ b/package/x11/xorg/x11r6.9.0-geteuid.patch
@ -1,20 +0,0 @@
 --- ./programs/Xserver/hw/xfree86/common/xf86Init.c.orig	2006-03-17 23:30:10.000000000 +0200
 +++ ./programs/Xserver/hw/xfree86/common/xf86Init.c	2006-03-17 23:29:35.000000000 +0200
@@ -1376,7 +1376,7 @@
     }
   
   /* First the options that are only allowed for root */
 -  if (getuid() == 0 || geteuid != 0)
 +  if (getuid() == 0 || geteuid() != 0)
   {
     if (!strcmp(argv[i], "-modulepath"))
     {
@@ -1679,7 +1679,7 @@
   }
   if (!strcmp(argv[i], "-configure"))
   {
 -    if (getuid() != 0 && geteuid == 0) {
 +    if (getuid() != 0 && geteuid() == 0) {
 	ErrorF("The '-configure' option can only be used by root.\n");
 	exit(1);
     }
--- a/package/x11/xorg/x11r6.9.0-mitri.patch
+++ b/package/x11/xorg/x11r6.9.0-mitri.patch
@ -1,25 +0,0 @@
 Index: programs/Xserver/render/mitri.c
 ===================================================================
 RCS file: /cvs/xorg/xc/programs/Xserver/render/mitri.c,v
 retrieving revision 1.5
 diff -u -r1.5 mitri.c
 --- ./programs/Xserver/render/mitri.c	3 Jul 2005 07:02:08 -0000	1.5
 +++ ./programs/Xserver/render/mitri.c	30 Apr 2006 20:19:57 -0000
@@ -145,7 +145,7 @@
     if (npoint < 3)
 	return;
     ntri = npoint - 2;
 -    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
 +    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
     if (!tris)
 	return;
     for (tri = tris; npoint >= 3; npoint--, points++, tri++)
@@ -177,7 +177,7 @@
     if (npoint < 3)
 	return;
     ntri = npoint - 2;
 -    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
 +    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
     if (!tris)
 	return;
     first = points++;
--- a/package/x11/xorg/xconsole-pty.patch
+++ b/package/x11/xorg/xconsole-pty.patch
@ -1,51 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/xconsole-pty.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./programs/xconsole/xconsole.c.orig	Sun Mar 21 08:35:37 1999
 +++ ./programs/xconsole/xconsole.c	Thu Nov 23 16:15:23 2000
@@ -786,6 +786,21 @@
 		return 0;
 	}
 #else
 +#ifdef __GLIBC__	/* The new way to open a Pseudo Terminal */
 +	if ((*pty = getpt()) < 0)
 +		return 1;
 +	strcpy(ttydev, ptsname(*pty));
 +	if ((unlockpt(*pty)) < 0) {
 +		close(*pty);
 +		return(1);
 +	}
 +	if ((grantpt(*pty)) < 0) {
 +		close(*pty);
 +		return(1);
 +	}
 +	if ((*tty = open (ttydev, O_RDWR)) >= 0)
 +		return(0);
 +#else
 	strcpy (ttydev, "/dev/ttyxx");
 	strcpy (ptydev, "/dev/ptyxx");
 	while (PTYCHAR1[letter]) {
@@ -811,6 +826,7 @@
 	    devindex = 0;
 	    (void) letter++;
 	}
 +#endif
 #endif /* sgi else not sgi */
 #endif /* CRAY else not CRAY */
 #endif /* umips && SYSTYPE_SYSV */
--- a/package/x11/xorg/xf_config.sh
+++ b/package/x11/xorg/xf_config.sh
@ -1,185 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/xf_config.sh
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 # extract and patch base
 xf_extract() {
 	echo "Extracting source (for package version $ver) ..."
 	for x in $xf_files ; do
 		tar $taropt $archdir/$x
 	done

 	cd xc

 	for x in $xf_patches ; do
 		echo "Patching source ($x) ..."
        	bunzip2 < $archdir/$x | patch -p1 -E
 	done
 }

 # extract additional gl* stuff
 xf_extract_gl() {
 	mkdir release ; ln -s ../.. release/xc
 	tar $taropt $archdir/mangl.tar.bz2
 	tar $taropt $archdir/manglu.tar.bz2
 	tar $taropt $archdir/manglx.tar.bz2
 	rm -rf release
 }

 # extract the Matrox HALlib (additional TV/DVI out support on x86)
 xf_extract_hallib() {
 	echo "Extracting mgaHALlib (For Matrox (>G400) cards) ..."
 	tar $taropt $archdir/mgadriver-$mga_version-src.tar.bz2
 	cp mgadriver-$mga_version-src/4.3.0/mga/HALlib/mgaHALlib.a \
 	  programs/Xserver/hw/xfree86/drivers/mga/HALlib/mgaHALlib.a
 	rm -rf mgadriver-$mga_version-src 

 	if [[ $arch == "x86" && $arch_machine != "x86_64" ]] ; then
 		echo "Enabling Matrox HALlib (since this is x86) ..."
 		cat >> config/cf/host.def << EOT

 /* Additinal TC/DVI support since this is x86 */
 #define         HaveMatroxHal           YES
 EOT
 	fi
 }

 # apply the patches
 xf_patch() {
 	cp -v programs/twm/system.twmrc programs/twm/system.twmrc.orig
 	for x in $patchfiles ; do
 	  if [ -f $x ] ; then
 		echo "Apply patch $x ..."
 		patch -Nf -p1 < $x
 	fi ; done
 	find \( -name 'config.guess' -o -name 'config.sub' \) \
 		-exec chmod +x '{}' ';'
 }

 # build the World
 xf_build() {
 	eval $MAKE World
 	cd nls ; eval $MAKE ; cd ..
 }

 # install the World
 xf_install() {
 	echo "Create /etc/X11 (if it's not already there) ..."
 	mkdir -p $root/etc/X11

 	if [ "$arch_sizeof_char_p" = 8 ] ; then
 		mkdir -p $root/usr/X11R6/lib
 		ln -s lib $root/usr/X11R6/lib64
 	fi

 	eval $MAKE install
 	eval $MAKE install.man
 	cd nls ; eval $MAKE install ; cd ..
 	rm -fv $root/etc/fonts/*.bak

 	rm -fv $root/usr/X11
 	rm -fv $root/usr/bin/X11
 	rm -fv $root/usr/lib/X11
 	rm -fv $root/usr/include/X11

 	ln -sv X11R6 $root/usr/X11
 	ln -sv ../X11/bin $root/usr/bin/X11
 	ln -sv ../X11/lib/X11 $root/usr/lib/X11
 	ln -sv ../X11/include/X11 $root/usr/include/X11

 	mkdir -p $root/usr/X11R6/lib/X11/fonts/TrueType
 	
 	echo "Copy TWM config files ..."
 	cp -v programs/twm/system.twmrc.orig \
 	  programs/twm/sample-twmrc/original.twmrc
 	cp -v programs/twm/sample-twmrc/*.twmrc $root/usr/X11R6/lib/X11/twm/
 	register_wm twm TWM /usr/X11/bin/twm

 	echo "Copying default example configs ..."
 	        cp -fv $base/package/x11/${pkg}/xorg.conf.data \
 			$root/etc/X11/xorg.conf.example
 		cp -fv $root/etc/X11/xorg.conf{.example,}
 		cp -fv $base/package/x11/${pkg}/local.conf.data \
 			$root/etc/fonts/local.conf

 	echo "Fixing compiled keymaps directory ..."
 	mkdir -p $root/var/lib/xkb 
 	cp -fu programs/xkbcomp/compiled/README $root/var/lib/xkb

 	echo "Installing xfs init script ..."
 	install_init xfs $base/package/x11/${pkg}/xfs.init

 	register_xdm xdm 'X11 dislay manager' /usr/X11R6/bin/xdm


 	echo "Installing the xdm start script (multiplexer) ..."
 	cp $confdir/startxdm.sh $root/usr/X11R6/bin/startxdm
 	chmod +x $root/usr/X11R6/bin/startxdm

 	echo "Installing X-Windows Setup Script ..."
 	cp -fv $base/package/x11/${pkg}/stone_mod_${pkg}.sh $root/etc/stone.d/mod_${pkg}.sh
 	echo "export WINDOWMANAGER=kde" > $root/etc/profile.d/windowmanager

 	echo "Installing X-Windows Cron Script ..."
 	cp -fv $base/package/x11/${pkg}/${pkg}.cron \
 		$root/etc/cron.daily/80-${pkg}
 	chmod +x $root/etc/cron.daily/80-${pkg}
 }

 # configure the World
 xf_config() {
 	if [ -f "$base/config/$config/xorgsite.def" ] ; then
 		cp $base/config/$config/xorgsite.def config/cf/host.def
 		echo "Found custom configuration"
 	else
 	
 	echo "Configuring X-Windows ..."
 	cat >> config/cf/host.def << EOT
 /* Disable the internal zlib to use the system installed one */
 #define		HasZlib			YES
 /* Disable the internal expat library to use the system installed one */
 #define		HasExpat		YES

 /* Less warnings with recent gccs ... */
 #define		DefaultCCOptions	-ansi GccWarningOptions

 /* Make sure config files are allways installed ... */
 #define		InstallXinitConfig	YES
 #define		InstallXdmConfig	YES
 #define		InstallFSConfig		YES

 /* do not install duplicate crap in /etc/X11 */
 #define		UseSeparateConfDir	NO

 EOT
 	
 	if [[ $arch == "x86" && $arch_machine != "x86_64" ]] ; then
 	        echo "Enabling Matrox HALlib (since this is x86) ..."
 		cat >> config/cf/host.def << EOT

 /* Additional TV/DVI support since this is x86 */
 #define		HaveMatroxHal		YES
 EOT
 	fi
 	
 	fi
 }

--- a/package/x11/xorg/xfs.init
+++ b/package/x11/xorg/xfs.init
@ -1,42 +0,0 @@
 #!/bin/sh
 #
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/xfs.init
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 #
 # ROCK Linux: /etc/rc.d/init.d/xfs
 #
 # Desc: X Font Server
 # Runlevel: 80 rcX
 #

 main_begin

    block_begin(start, `Starting xfs.')
        check(`/usr/X11/bin/xfs -daemon')
    block_end

    block_begin(stop, `Stopping xfs')
        check(`killall -15 /usr/X11/bin/xfs')
    block_end

 main_end

--- a/package/x11/xorg/xorg-fontconfig-noftinternals.patch
+++ b/package/x11/xorg/xorg-fontconfig-noftinternals.patch
@ -1,729 +0,0 @@
 Copied from http://freetype.sourceforge.net/freetype2/patches/fontconfig-2.3.2-noftinternals.patch
 File names adapted for X.Org 6.9.0
 Patch for xc/lib/fontconfig/Imakefile added

 --- xc/lib/fontconfig/Imakefile.orig	2005-11-08 07:33:26.000000000 +0100
 +++ xc/lib/fontconfig/Imakefile	2006-07-07 17:57:31.000000000 +0200
@@ -49,11 +49,11 @@
 REQUIREDLIBS=$(LDPRELIBS) $(FREETYPE2LIB) $(EXPATLIB)
 
 SRCS=fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
 -     fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c fclist.c \
 +     fcdefault.c fcdir.c fcfreetype.c fcftglue.c fcfs.c fcinit.c fclang.c fclist.c \
      fcmatch.c fcmatrix.c fcname.c fcpat.c fcstr.c fcxml.c
 
 OBJS=fcatomic.o fcblanks.o fccache.o fccfg.o fccharset.o fcdbg.o \
 -     fcdefault.o fcdir.o fcfreetype.o fcfs.o fcinit.o fclang.o fclist.o \
 +     fcdefault.o fcdir.o fcfreetype.o fcftglue.o fcfs.o fcinit.o fclang.o fclist.o \
      fcmatch.o fcmatrix.o fcname.o fcpat.o fcstr.o fcxml.o
 
 #include <Library.tmpl>
@@ -186,6 +186,7 @@
 LinkSourceFile(fcdefault.c,$(FONTCONFIGSRC)/src)
 LinkSourceFile(fcdir.c,$(FONTCONFIGSRC)/src)
 /* LinkSourceFile(fcfreetype.c,$(FONTCONFIGSRC)/src) - use custom copy for now */
 +LinkSourceFile(fcftglue.c,$(FONTCONFIGSRC)/src)
 LinkSourceFile(fcfs.c,$(FONTCONFIGSRC)/src)
 LinkSourceFile(fcinit.c,$(FONTCONFIGSRC)/src)
 LinkSourceFile(fclang.c,$(FONTCONFIGSRC)/src)
 diff -urN xc/lib/fontconfig/fcfreetype.c xc/extras/fontconfig/src/fcfreetype.c
 --- xc/lib/fontconfig/fcfreetype.c	2005-04-21 14:37:43.000000000 +0200
 +++ xc/lib/fontconfig/fcfreetype.c	2005-07-07 13:17:32.224401218 +0200
@@ -50,14 +50,11 @@
 #include "fcint.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 -#include FT_INTERNAL_OBJECTS_H
 #include FT_TRUETYPE_TABLES_H
 #include FT_SFNT_NAMES_H
 #include FT_TRUETYPE_IDS_H
 #include FT_TYPE1_TABLES_H
 -#include FT_INTERNAL_STREAM_H
 -#include FT_INTERNAL_SFNT_H
 -#include FT_INTERNAL_TRUETYPE_TYPES_H
 +#include "fcftglue.h"
 #if HAVE_FT_GET_X11_FONT_FORMAT
 #include FT_XFREE86_H
 #endif
@@ -65,8 +62,7 @@
 #if HAVE_FT_GET_BDF_PROPERTY
 #include FT_BDF_H
 #include FT_MODULE_H
 -#define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \
 -			     (f)->driver->root.clazz->get_interface)
 +#define HAS_BDF_PROPERTY(f) ((f))
 #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \
 				    FT_Get_BDF_Property(f,n,p) : \
 				    FT_Err_Invalid_Argument)
@@ -1559,7 +1555,7 @@
      */
     if (FcCharSetCount (cs) == 0)
     {
 -	if (!strcmp(FT_MODULE_CLASS(&face->driver->root)->module_name, "pcf"))
 +	if (!strcmp(FT_Get_X11_Font_Format(face),"PCF"))
 	    goto bail2;
     }
 
@@ -2706,8 +2702,7 @@
 static FT_Error
 GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *script_count)
 {
 -    FT_ULong         cur_offset, new_offset, base_offset;
 -    TT_Face          tt_face = (TT_Face)face;
 +    FT_ULong   cur_offset, new_offset, base_offset;
     FT_Stream  stream = face->stream;
     FT_Error   error;
     FT_UShort          n, p;
@@ -2716,51 +2711,43 @@
     if ( !stream )
 	return TT_Err_Invalid_Face_Handle;
 
 -    if (( error = tt_face->goto_table( tt_face, tabletag, stream, 0 ) ))
 +    if ( (error = fcft_face_goto_table( face, tabletag, stream )) != 0 )
 	return error;
 
 -    base_offset = FT_STREAM_POS();
 +    base_offset = FCFT_STREAM_POS();
 
     /* skip version */
 
 -    if ( FT_STREAM_SEEK( base_offset + 4L ) || FT_FRAME_ENTER( 2L ) )
 -	return error;
 -
 -    new_offset = FT_GET_USHORT() + base_offset;
 -
 -    FT_FRAME_EXIT();
 -
 -    cur_offset = FT_STREAM_POS();
 -
 -    if ( FT_STREAM_SEEK( new_offset ) != TT_Err_Ok )
 -	return error;
 -
 -    base_offset = FT_STREAM_POS();
 +    if ( FCFT_STREAM_SEEK( base_offset + 4L ) ||
 +         FCFT_READ_USHORT( new_offset )       ) 
 +      return error;
 +    
 +    new_offset += base_offset;
 +    cur_offset  = FCFT_STREAM_POS();
 
 -    if ( FT_FRAME_ENTER( 2L ) )
 +    if ( FCFT_STREAM_SEEK( new_offset ) != TT_Err_Ok )
 	return error;
 
 -    *script_count = FT_GET_USHORT();
 +    base_offset = FCFT_STREAM_POS();
 
 -    FT_FRAME_EXIT();
 -
 -    if ( FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong )) )
 -	return error;
 +    if ( FCFT_READ_USHORT(*script_count)                         ||
 +         FCFT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong ) )
 + 	return error;
 
     p = 0;
     for ( n = 0; n < *script_count; n++ )
     {
 -	if ( FT_FRAME_ENTER( 6L ) )
 +	if ( FCFT_FRAME_ENTER( 6L ) )
 	    goto Fail;
 
 -	(*stags)[p] = FT_GET_ULONG();
 -	new_offset = FT_GET_USHORT() + base_offset;
 +	(*stags)[p] = FCFT_GET_ULONG();
 +	new_offset  = FCFT_GET_USHORT() + base_offset;
 
 -	FT_FRAME_EXIT();
 +	FCFT_FRAME_EXIT();
 
 -	cur_offset = FT_STREAM_POS();
 +	cur_offset = FCFT_STREAM_POS();
 
 -	if ( FT_STREAM_SEEK( new_offset ) )
 +	if ( FCFT_STREAM_SEEK( new_offset ) )
 	    goto Fail;
 
 	if ( error == TT_Err_Ok )
@@ -2768,7 +2755,7 @@
 	else if ( error != TTO_Err_Empty_Script )
 	    goto Fail;
 
 -	(void)FT_STREAM_SEEK( cur_offset );
 +	(void)FCFT_STREAM_SEEK( cur_offset );
     }
 
     if (!p)
@@ -2784,7 +2771,7 @@
 
 Fail:
     *script_count = 0;
 -    FT_FREE( *stags );
 +    FCFT_FREE( *stags );
     return error;
 }
 
@@ -2841,7 +2828,7 @@
     if (FcDebug () & FC_DBG_SCANV)
 	printf("complex features in this font: %s\n", complex);
 bail:
 -    FT_FREE(gsubtags);
 -    FT_FREE(gpostags);
 +    FCFT_FREE(gsubtags);
 +    FCFT_FREE(gpostags);
     return complex;
 }
 diff -urN xc/extras/fontconfig/src/fcftglue.c xc/extras/fontconfig/src/fcftglue.c
 --- xc/extras/fontconfig/src/fcftglue.c	1970-01-01 01:00:00.000000000 +0100
 +++ xc/extras/fontconfig/src/fcftglue.c	2005-07-07 13:34:48.630254000 +0200
@@ -0,0 +1,380 @@
 +#include "fcftglue.h"
 +
 +/***************************************************************************/
 +/***************************************************************************/
 +/*****                                                                 *****/
 +/*****                                                                 *****/
 +/*****                                                                 *****/
 +/***************************************************************************/
 +/***************************************************************************/
 +
 +/* only used internall */
 +static FT_Pointer
 +fcft_qalloc( FT_Memory  memory,
 +             FT_ULong   size,
 +             FT_Error  *perror )
 +{
 +  FT_Error    error = 0;
 +  FT_Pointer  block = NULL;
 +
 +  if ( size > 0 )
 +  {
 +    block = memory->alloc( memory, size );
 +    if ( !block )
 +      error = FT_Err_Out_Of_Memory;
 +  }
 +
 +  *perror = error;
 +  return block;
 +}
 +
 +#define  FCFT_QALLOC(ptr,size)    ( (ptr) = fcft_qalloc( memory, (size), &error ), error != 0 )
 +
 +
 +FCFT_APIDEF( FT_Pointer )
 +fcft_alloc( FT_Memory  memory,
 +            FT_ULong   size,
 +            FT_Error  *perror )
 +{
 +  FT_Error    error = 0;
 +  FT_Pointer  block = NULL;
 +
 +  if ( size > 0 )
 +  {
 +    block = memory->alloc( memory, size );
 +    if ( !block )
 +      error = FT_Err_Out_Of_Memory;
 +    else
 +      memset( (char*)block, 0, (size_t)size );
 +  }
 +
 +  *perror = error;
 +  return block;
 +}
 +
 +
 +FCFT_APIDEF( FT_Pointer )
 +fcft_realloc( FT_Memory   memory,
 +              FT_Pointer  block,
 +              FT_ULong    old_size,
 +              FT_ULong    new_size,
 +              FT_Error   *perror )
 +{
 +  FT_Pointer  block2 = NULL;
 +  FT_Error    error  = 0;
 +
 +  if ( block == NULL )
 +  {
 +    block2 = fcft_alloc( memory, new_size, &error );
 +  }
 +  else if ( new_size <= 0 )
 +  {
 +    fcft_free( memory, block );
 +  }
 +  else
 +  {
 +    block2 = fcft_alloc( memory, new_size, &error );
 +    if ( !error )
 +    {
 +      memcpy( (char*)block2, (const char*)block, (size_t)old_size );
 +      if ( new_size > old_size )
 +        memset( (char*)block2 + old_size, 0, (size_t)(new_size - old_size) );
 +    }
 +  }
 +
 +  if ( !error )
 +    block = block2;
 +
 +  *perror = error;
 +  return block;
 +}
 +
 +
 +FCFT_APIDEF( void )
 +fcft_free( FT_Memory   memory,
 +           FT_Pointer  block )
 +{
 +  if ( block )
 +    memory->free( memory, block );
 +}
 +
 +
 +FCFT_APIDEF( FT_Long )
 +fcft_stream_pos( FT_Stream   stream )
 +{
 +  return stream->pos;
 +}
 +
 +
 +FCFT_APIDEF( FT_Error )
 +fcft_stream_seek( FT_Stream   stream,
 +                  FT_Long     pos )
 +{
 +  FT_Error  error = 0;
 +
 +  stream->pos = pos;
 +  if ( stream->read )
 +  {
 +    if ( stream->read( stream, pos, 0, 0 ) )
 +      error = FT_Err_Invalid_Stream_Operation;
 +  }
 +  else if ( pos > stream->size )
 +    error = FT_Err_Invalid_Stream_Operation;
 +
 +  return error;
 +}
 +
 +
 +FCFT_APIDEF( FT_Error )
 +fcft_stream_frame_enter( FT_Stream   stream,
 +                         FT_ULong    count )
 +{
 +  FT_Error  error = FT_Err_Ok;
 +  FT_ULong  read_bytes;
 +
 +  if ( stream->read )
 +  {
 +    /* allocate the frame in memory */
 +    FT_Memory  memory = stream->memory;
 +
 +
 +    if ( FCFT_QALLOC( stream->base, count ) )
 +      goto Exit;
 +
 +    /* read it */
 +    read_bytes = stream->read( stream, stream->pos,
 +                               stream->base, count );
 +    if ( read_bytes < count )
 +    {
 +      FCFT_FREE( stream->base );
 +      error = FT_Err_Invalid_Stream_Operation;
 +    }
 +    stream->cursor = stream->base;
 +    stream->limit  = stream->cursor + count;
 +    stream->pos   += read_bytes;
 +  }
 +  else
 +  {
 +    /* check current and new position */
 +    if ( stream->pos >= stream->size        ||
 +         stream->pos + count > stream->size )
 +    {
 +      error = FT_Err_Invalid_Stream_Operation;
 +      goto Exit;
 +    }
 +
 +    /* set cursor */
 +    stream->cursor = stream->base + stream->pos;
 +    stream->limit  = stream->cursor + count;
 +    stream->pos   += count;
 +  }
 +
 +Exit:
 +  return error;
 +}
 +
 +
 +FCFT_APIDEF( void )
 +fcft_stream_frame_exit( FT_Stream  stream )
 +{
 +  if ( stream->read )
 +  {
 +    FT_Memory  memory = stream->memory;
 +
 +    FCFT_FREE( stream->base );
 +  }
 +  stream->cursor = 0;
 +  stream->limit  = 0;
 +}
 +
 +
 +FCFT_APIDEF( FT_Byte )
 +fcft_stream_get_byte( FT_Stream  stream )
 +{
 +  FT_Byte  result = 0;
 +
 +  if ( stream->cursor < stream->limit )
 +    result = *stream->cursor++;
 +
 +  return result;
 +}
 +
 +
 +FCFT_APIDEF( FT_Short )
 +fcft_stream_get_short( FT_Stream  stream )
 +{
 +  FT_Byte*  p;
 +  FT_Short  result = 0;
 +
 +  p = stream->cursor;
 +  if ( p + 2 <= stream->limit )
 +  {
 +    result         = (FT_Short)((p[0] << 8) | p[1]);
 +    stream->cursor = p+2;
 +  }
 +  return result;
 +}
 +
 +
 +FCFT_APIDEF( FT_Long )
 +fcft_stream_get_long( FT_Stream   stream )
 +{
 +  FT_Byte*  p;
 +  FT_Long   result = 0;
 +
 +  p = stream->cursor;
 +  if ( p + 4 <= stream->limit )
 +  {
 +    result         = (FT_Long)(((FT_Long)p[0] << 24) |
 +                               ((FT_Long)p[1] << 16) |
 +                               ((FT_Long)p[2] << 8)  |
 +                                         p[3]        );
 +    stream->cursor = p+4;
 +  }
 +  return result;
 +}
 +
 +
 +static FT_Error
 +fcft_stream_readp( FT_Stream   stream,
 +                   FT_Byte*   *pbuffer,
 +                   FT_ULong    count )
 +{
 +  FT_Error  error = 0;
 +
 +  if ( stream->read )
 +  {
 +    FT_ULong  read_bytes = stream->read( stream, stream->pos, *pbuffer, count );
 +
 +    if ( read_bytes != count )
 +      goto Fail;
 +
 +    stream->pos += count;
 +  }
 +  else
 +  {
 +    if ( stream->pos >= stream->size        ||
 +         stream->pos + count > stream->size )
 +      goto Fail;
 +
 +    *pbuffer     = stream->base + stream->pos;
 +    stream->pos += count;
 +  }
 +
 +Exit:
 +  return error;
 +
 +Fail:
 +  error = FT_Err_Invalid_Stream_Operation;
 +  goto Exit;
 +}
 +
 +
 +FCFT_API( FT_Byte )
 +fcft_stream_read_byte( FT_Stream   stream,
 +                       FT_Error   *perror )
 +{
 +  FT_Byte   temp[1], *p = temp, result = 0;
 +  FT_Error  error = fcft_stream_readp( stream, &p, 1 );
 +
 +  if ( !error )
 +    result = *p;
 +
 +  return error;
 +}
 +
 +FCFT_API( FT_Short )
 +fcft_stream_read_short( FT_Stream  stream,
 +                        FT_Error  *perror )
 +{
 +  FT_Byte   temp[2], *p = temp;
 +  FT_Short  result = 0;
 +  FT_Error  error  = fcft_stream_readp( stream, &p, 2 );
 +
 +  if ( !error )
 +    result = (FT_Short)((p[0] << 8) | p[1]);
 +
 +  return error;
 +}
 +
 +FCFT_API( FT_Long )
 +fcft_stream_read_long( FT_Stream  stream,
 +                       FT_Error  *perror )
 +{
 +  FT_Byte   temp[4], *p = temp;
 +  FT_Long   result = 0;
 +  FT_Error  error  = fcft_stream_readp( stream, &p, 4 );
 +
 +  if ( !error )
 +    result = (FT_Long)((FT_Long)(p[0] << 24) |
 +                       (FT_Long)(p[1] << 16) |
 +                                (p[2] << 8)  |
 +                                 p[3]        );
 +
 +  return error;
 +}
 +
 +
 +FCFT_APIDEF( FT_Error )
 +fcft_face_goto_table( FT_Face    face,
 +                      FT_ULong   the_tag,
 +                      FT_Stream  stream )
 +{
 +  FT_Error  error;
 +
 +  if ( !FT_IS_SFNT(face) )
 +    error = FT_Err_Invalid_Face_Handle;
 +  else
 +  {
 +   /* parse the directory table directly, without using
 +    * FreeType's built-in data structures
 +    */
 +    FT_UInt   count, nn;
 +    FT_ULong  offset = 0;
 +
 +    if ( face->num_faces > 1 )
 +    {
 +      /* deal with TrueType collections */
 +      FT_ULong  offset;
 +
 +      if ( FCFT_STREAM_SEEK( 12 + face->face_index*4 ) ||
 +           FCFT_READ_ULONG(offset)                     )
 +        goto Exit;
 +    }
 +
 +    if ( FCFT_STREAM_SEEK( offset+4 ) ||
 +         FCFT_READ_USHORT(count)      )
 +      goto Exit;
 +
 +
 +    if ( FCFT_STREAM_SEEK( offset+12 ) ||
 +         FCFT_FRAME_ENTER( count*16 )  )
 +      goto Exit;
 +
 +    for ( nn = 0; nn < count; nn++ )
 +    {
 +      FT_ULong  tag      = FCFT_GET_TAG();
 +      FT_ULong  checksum = FCFT_GET_ULONG();
 +      FT_ULong  start    = FCFT_GET_ULONG();
 +      FT_ULong  size     = FCFT_GET_ULONG();
 +
 +      FT_UNUSED(checksum);
 +      FT_UNUSED(size);
 +
 +      if ( tag == the_tag )
 +      {
 +        error = fcft_stream_seek( stream, offset+start );
 +        goto FoundIt;
 +      }
 +    }
 +    error = FT_Err_Table_Missing;
 +
 +  FoundIt:
 +    FCFT_FRAME_EXIT();
 +  }
 +
 +Exit:
 +  return error;
 +}
 +
 +#undef FCFT_QALLOC
 diff -urN xc/extras/fontconfig/src/fcftglue.h xc/extras/fontconfig/src/fcftglue.h
 --- xc/extras/fontconfig/src/fcftglue.h	1970-01-01 01:00:00.000000000 +0100
 +++ xc/extras/fontconfig/src/fcftglue.h	2005-07-07 13:15:43.292717000 +0200
@@ -0,0 +1,135 @@
 +/* the following contains code used to prevent FontConfig from
 + * abusing FreeType internals. We simply duplicate some of the FreeType
 + * functionality using only publicly defined APIs and structures
 + */
 +#ifndef __FONTCONFIG_FTGLUE_H__
 +#define __FONTCONFIG_FTGLUE_H__
 +
 +#include <ft2build.h>
 +#include FT_FREETYPE_H
 +
 +FT_BEGIN_HEADER
 +
 +
 +/* utility macros */
 +#define  FCFT_SET_ERR(c)   ( (error = (c)) != 0 )
 +
 +#ifndef FCFT_API
 +#define FCFT_API(x)  extern x
 +#endif
 +
 +#ifndef FCFT_APIDEF
 +#define FCFT_APIDEF(x)  x
 +#endif
 +
 +/* stream macros used by the OpenType parser */
 +#define  FCFT_STREAM_POS()       fcft_stream_pos( stream )
 +#define  FCFT_STREAM_SEEK(pos)   FCFT_SET_ERR( fcft_stream_seek( stream, pos ) )
 +#define  FCFT_FRAME_ENTER(size)  FCFT_SET_ERR( fcft_stream_frame_enter( stream, size ) )
 +#define  FCFT_FRAME_EXIT()       fcft_stream_frame_exit( stream )
 +
 +#define  FCFT_GET_BYTE()         fcft_stream_get_byte( stream )
 +#define  FCFT_GET_SHORT()        fcft_stream_get_short( stream )
 +#define  FCFT_GET_LONG()         fcft_stream_get_long( stream )
 +
 +#define  FCFT_GET_CHAR()        ((FT_Char)FCFT_GET_BYTE())
 +#define  FCFT_GET_USHORT()      ((FT_UShort)FCFT_GET_SHORT())
 +#define  FCFT_GET_ULONG()       ((FT_ULong)FCFT_GET_LONG())
 +#define  FCFT_GET_TAG()         FCFT_GET_ULONG()
 +
 +#define  FCFT_READ_(val,type,suffix)   \
 +   ( (val) = (type) fcft_stream_read_##suffix (stream, &error), error != 0 )
 +
 +#define  FCFT_READ_BYTE(val)    FCFT_READ_(val,FT_Byte,byte)
 +#define  FCFT_READ_SHORT(val)   FCFT_READ_(val,FT_Short,short)
 +#define  FCFT_READ_LONG(val)    FCFT_READ_(val,FT_Long,long)
 +
 +#define  FCFT_READ_CHAR(val)    FCFT_READ_(val,FT_Char,byte)
 +#define  FCFT_READ_USHORT(val)  FCFT_READ_(val,FT_UShort,short)
 +#define  FCFT_READ_ULONG(val)   FCFT_READ_(val,FT_ULong,long)
 +
 +
 +FCFT_API( FT_Long )
 +fcft_stream_pos( FT_Stream   stream );
 +
 +FCFT_API( FT_Error )
 +fcft_stream_seek( FT_Stream   stream,
 +                  FT_Long     pos );
 +
 +FCFT_API( FT_Error )
 +fcft_stream_frame_enter( FT_Stream   stream,
 +                         FT_ULong    size );
 +
 +FCFT_API( void )
 +fcft_stream_frame_exit( FT_Stream  stream );
 +
 +FCFT_API( FT_Byte )
 +fcft_stream_get_byte( FT_Stream  stream );
 +
 +FCFT_API( FT_Short )
 +fcft_stream_get_short( FT_Stream  stream );
 +
 +FCFT_API( FT_Long )
 +fcft_stream_get_long( FT_Stream   stream );
 +
 +FCFT_API( FT_Byte )
 +fcft_stream_read_byte( FT_Stream   stream,
 +                       FT_Error   *perror );
 +
 +FCFT_API( FT_Short )
 +fcft_stream_read_short( FT_Stream  stream,
 +                        FT_Error  *perror );
 +
 +FCFT_API( FT_Long )
 +fcft_stream_read_long( FT_Stream  stream,
 +                       FT_Error  *perror );
 +
 +FCFT_API( FT_Error )
 +fcft_face_goto_table( FT_Face    face,
 +                      FT_ULong   tag,
 +                      FT_Stream  stream );
 +
 +/* memory macros used by the OpenType parser */
 +#define  FCFT_MEM_ALLOC(_ptr,_size)   \
 +           ( (_ptr) = fcft_alloc( memory, _size, &error ), error != 0 )
 +
 +#define  FCFT_MEM_REALLOC(_ptr,_oldsz,_newsz)  \
 +           ( (_ptr) = fcft_realloc( memory, (_ptr), (_oldsz), (_newsz), &error ), error != 0 )
 +
 +#define  FCFT_FREE(_ptr)               \
 +  FT_BEGIN_STMNT                       \
 +    if ( (_ptr) )                      \
 +    {                                  \
 +      fcft_free( memory, _ptr );       \
 +      _ptr = NULL;                     \
 +    }                                  \
 +  FT_END_STMNT
 +
 +#define  FCFT_MEM_ALLOC_ARRAY(_ptr,_count,_type)   \
 +           FCFT_MEM_ALLOC(_ptr,(_count)*sizeof(_type))
 +
 +#define  FCFT_MEM_REALLOC_ARRAY(_ptr,_oldcnt,_newcnt,_type) \
 +           FCFT_MEM_REALLOC(_ptr,(_oldcnt)*sizeof(_type),(_newcnt)*sizeof(_type))
 +
 +
 +FCFT_API( FT_Pointer )
 +fcft_alloc( FT_Memory  memory,
 +            FT_ULong   size,
 +            FT_Error  *perror );
 +
 +FCFT_API( FT_Pointer )
 +fcft_realloc( FT_Memory   memory,
 +              FT_Pointer  block,
 +              FT_ULong    old_size,
 +              FT_ULong    new_size,
 +              FT_Error   *perror );
 +
 +FCFT_API( void )
 +fcft_free( FT_Memory   memory,
 +           FT_Pointer  block );
 +
 +/* */
 +
 +FT_END_HEADER
 +
 +#endif /* __OPENTYPE_FCFT_H__ */
 diff -urN xc/extras/fontconfig/src/Makefile.am xc/extras/fontconfig/src/Makefile.am
 --- xc/extras/fontconfig/src/Makefile.am	2004-12-05 06:49:20.000000000 +0100
 +++ xc/extras/fontconfig/src/Makefile.am	2005-07-07 13:09:15.416637082 +0200
@@ -86,6 +86,7 @@
 	fcdefault.c \
 	fcdir.c \
 	fcfreetype.c \
 +	fcftglue.c \
 	fcfs.c \
 	fcinit.c \
 	fclang.c \
 diff -urN xc/extras/fontconfig/src/Makefile.in xc/extras/fontconfig/src/Makefile.in
 --- xc/extras/fontconfig/src/Makefile.in	2005-04-27 21:08:51.000000000 +0200
 +++ xc/extras/fontconfig/src/Makefile.in	2005-07-07 13:09:15.417636939 +0200
@@ -228,6 +228,7 @@
 	fcdefault.c \
 	fcdir.c \
 	fcfreetype.c \
 +	fcftglue.c \
 	fcfs.c \
 	fcinit.c \
 	fclang.c \
@@ -257,7 +258,7 @@
 libfontconfig_la_DEPENDENCIES =
 am_libfontconfig_la_OBJECTS = fcatomic.lo fcblanks.lo fccache.lo \
 	fccfg.lo fccharset.lo fcdbg.lo fcdefault.lo fcdir.lo \
 -	fcfreetype.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \
 +	fcfreetype.lo fcftglue.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \
 	fcmatrix.lo fcname.lo fcpat.lo fcstr.lo fcxml.lo
 libfontconfig_la_OBJECTS = $(am_libfontconfig_la_OBJECTS)
 
--- a/package/x11/xorg/xorg.cache
+++ b/package/x11/xorg/xorg.cache
@ -1,82 +0,0 @@
 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/x11/xorg/xorg.cache
 [COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [TIMESTAMP] 1142459754 Wed Mar 15 22:55:54 2006 (5)
 [TIMESTAMP] 1142700097 Sat Mar 18 17:41:37 2006 (9)

 [CONFIG-ID] TRUNK-x86-reference
 [ROCKVER] TRUNK

 [LOGS] 5-xorg.log 9-xorg.log

 [BUILDTIME] 218927 (5)
 [BUILDTIME] 229889 (9)
 [SIZE] 104.70 MB, 8677 files

 [DEP] 00-dirtree alien bash2 binutils bison bzip2 coreutils diffutils
 [DEP] expat expat:dev findutils flex flex:dev freetype freetype:dev gawk
 [DEP] gcc34 gcc34:dev glibc23 glibc23:dev grep gzip libpng libpng:dev
 [DEP] linux26-header:dev m4 make mktemp ncurses:dev patch perl5 rrdtool
 [DEP] sed sysfiles tar zlib:dev

 [PROVIDES] X X11 Xdmx Xmark Xnest Xorg Xprt Xvfb appres atobm bdftopcf
 [PROVIDES] bdftruncate beforelight bitmap bmtoa ccmakedep cleanlinks
 [PROVIDES] cxpm dga dpsexec dpsinfo editres fc-cache fc-list fslsfonts
 [PROVIDES] fstobdf gamma_dri.so gccmakedep getconfig getconfig.pl glxgears
 [PROVIDES] glxinfo gtf i810_dri.so i915_dri.so iceauth ico imake inb inl
 [PROVIDES] inw ioport lbxproxy libFS.so libGL.so libGLU.so libGLcore.a
 [PROVIDES] libGLw.so libI810XvMC.so libICE.so libOSMesa.a libOSMesa.so
 [PROVIDES] libSM.so libX11.so libXRes.so libXTrap.so libXau.a libXaw.so
 [PROVIDES] libXcomposite.so libXcursor.so libXdamage.so libXdmcp.a
 [PROVIDES] libXevie.so libXext.so libXfixes.so libXfont.a libXfont.so
 [PROVIDES] libXft.so libXi.so libXinerama.so libXmu.so libXmuu.so libXp.so
 [PROVIDES] libXpm.so libXprintAppUtil.a libXprintUtil.a libXrandr.so
 [PROVIDES] libXrender.so libXss.so libXt.so libXtst.so libXv.so libXvMC.so
 [PROVIDES] libXxf86dga.so libXxf86misc.so libXxf86rush.so libXxf86vm.so
 [PROVIDES] libafb.a libbitmap.a libcfb.a libcfb16.a libcfb24.a libcfb32.a
 [PROVIDES] libcw.a libdamage.a libdbe.a libddc.a libdmx.a libdps.so
 [PROVIDES] libdpstk.so libdri.a libdrm.a libextmod.a libfb.a libfbdevhw.a
 [PROVIDES] libfntstubs.a libfontconfig.so libfontenc.so libfreetype.so
 [PROVIDES] libglx.a libi2c.a libint10.a liblayer.a libmfb.a liboldX.a
 [PROVIDES] libpcidata.a libpsres.so librac.a libramdac.a librecord.a
 [PROVIDES] libscanpci.a libshadow.a libshadowfb.a libtype1.a libvbe.a
 [PROVIDES] libvgahw.a libxaa.a libxf1bpp.a libxf24_32bpp.a libxf4bpp.a
 [PROVIDES] libxf86config.a libxf8_16bpp.a libxf8_32bpp.a libxkbfile.so
 [PROVIDES] libxkbui.so libxrx.so libxrxnest.so libxtrap.a listres lndir
 [PROVIDES] luit makedepend makeg makepsres makestrs mergelib mga_dri.so
 [PROVIDES] mkcfm mkdirhier mkfontdir mkfontscale mkhtmlindex mmapr mmapw
 [PROVIDES] oclock outb outl outw pcitweak proxymngr pswrap r128_dri.so
 [PROVIDES] r200_dri.so radeon_dri.so resize revpath rman rstart rstartd
 [PROVIDES] scanpci sessreg setxkbmap showfont showrgb sis_dri.so smproxy
 [PROVIDES] startx startxdm sxpm tdfx_dri.so texteroids twm ucs2any uxterm
 [PROVIDES] viewres x11perf x11perfcomp xauth xbiff xcalc xclipboard
 [PROVIDES] xclock xcmsdb xconsole xcursor-config xcursorgen xcutsel
 [PROVIDES] xditview xdm xdpyinfo xdriinfo xedit xev xeyes xfd xfindproxy
 [PROVIDES] xfontsel xfs xfsinfo xft-config xfwp xgamma xgc xhost xinit
 [PROVIDES] xkbbell xkbcomp xkbevd xkbprint xkbvleds xkbwatch xkill xload
 [PROVIDES] xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmkmf
 [PROVIDES] xmodmap xmore xon xorgcfg xorgconfig xphelloworld xplsprinters
 [PROVIDES] xprehashprinterlist xprop xpsimplehelloworld xpxthelloworld
 [PROVIDES] xrandr xrdb xrefresh xrx xset xsetmode xsetpointer xsetroot xsm
 [PROVIDES] xstdcmap xterm xtrapchar xtrapin xtrapinfo xtrapout xtrapproto
 [PROVIDES] xtrapreset xtrapstats xvidtune xvinfo xwd xwininfo xwud

--- a/package/x11/xorg/xorg.conf
+++ b/package/x11/xorg/xorg.conf
@ -1,54 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/xorg.conf
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 # include the configuration script for X ...
 . package/x11/xorg/xf_config.sh

 x11base_main() {
 	xf_extract

 	xf_extract_gl
 	xf_extract_hallib
 	xf_patch

 	xf_config

 	xf_build
 	xf_install
 }

 custmain=x11base_main
 autoextract=0
 createdocs=0
 forcefpic=0

 var_remove GCC3_WRAPPER_INSERT " " "-fstack-protector"

 # don't put the modules in a :dev package
 splitreg 45 . '/lib/modules/'

 # documentation files
 splitreg 50 doc 'usr/X11R6/lib/X11/doc'

 # this fixes many cyclic dependencies..
 var_append flistrfilter "|" ".*mkhtmlindex.pl.*X11/doc/html.*"

--- a/package/x11/xorg/xorg.conf.data
+++ b/package/x11/xorg/xorg.conf.data
@ -1,595 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/xorg.conf.data
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 # File generated by xf86config.
 # and additional hand edited by Rene Rebe - ROCK Linux Project
 #
 # YOU MUST ONLY ADD A CARD SECTION AND MODIFY SOME MONITOR SETTINGS
 # TO GET A WORKING X CONFIGURATION.
 #

 #
 # Copyright (c) 1999 by The XFree86 Project, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 # 
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 # 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
 # OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 # 
 # Except as contained in this notice, the name of the XFree86 Project shall
 # not be used in advertising or otherwise to promote the sale, use or other
 # dealings in this Software without prior written authorization from the
 # XFree86 Project.
 #

 # **********************************************************************
 # Refer to the XF86Config(4/5) man page for details about the format of 
 # this file.
 # **********************************************************************

 # **********************************************************************
 # Module section -- this  section  is used to specify
 # which dynamically loadable modules to load.
 # **********************************************************************
 #
 Section "Module"

    Load        "dbe"  	# DBE (double buffer extension)
    Load	"ddc"   # Display Data Channel extension

 # This loads the miscellaneous extensions module
    SubSection  "extmod"
      # Option    "omit xfree86-dga" # don't initialise the DGA extension
      # Option    "omit XFree86-VidModeExtension" # disable mode-switching-supoprt
    EndSubSection

 # This loads the Type1 and FreeType font modules
    Load        "type1"
    Load        "freetype"

 #    Load	"glx"  # GLX extension (OpenGL visuals)
 #    Load	"dri"  # Direct Rendering Interface extension (OpenGL)

 #    Load	"v4l"  # Video 4 Linux extension (provides a xv adapter)
 EndSection

 # this enabled normal users to use DRI - the Direct Rendering Extension.
 # it is also possible to use a group to control access.
 #
 Section "DRI"
    Mode 0666
 EndSection

 # **********************************************************************
 # Files section.  This allows default font and rgb paths to be set
 # **********************************************************************

 Section "Files"

 # The location of the RGB database.  Note, this is the name of the
 # file minus the extension (like ".txt" or ".db").  There is normally
 # no need to change the default.

    RgbPath	"/usr/X11R6/lib/X11/rgb"

 # Multiple FontPath entries are allowed (which are concatenated together),
 # as well as specifying multiple comma-separated entries in one FontPath
 # command (or a combination of both methods)
 # 
 # If you don't have a floating point coprocessor and emacs, Mosaic or other
 # programs take long to start up, try moving the Type1 and Speedo directory
 # to the end of this list (or comment them out).
 # 

    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
    FontPath   "/usr/X11R6/lib/X11/fonts/CID/"
    FontPath   "/usr/X11R6/lib/X11/fonts/PEX/"
    FontPath   "/usr/X11R6/lib/X11/fonts/Speedo/"
    FontPath   "/usr/X11R6/lib/X11/fonts/Type1/"
    FontPath   "/usr/X11R6/lib/X11/fonts/cyrillic/"
    FontPath   "/usr/X11R6/lib/X11/fonts/encodings/"
    FontPath   "/usr/X11R6/lib/X11/fonts/freefont/"
    FontPath   "/usr/X11R6/lib/X11/fonts/latin2/"
    FontPath   "/usr/X11R6/lib/X11/fonts/local/"
    FontPath   "/usr/X11R6/lib/X11/fonts/misc/"
    FontPath   "/usr/X11R6/lib/X11/fonts/sharefont"
    FontPath   "/usr/X11R6/lib/X11/fonts/TrueType"

    FontPath   "/usr/share/ghostscript/fonts/"

 # The module search path.  The default path is shown here.

 #    ModulePath "/usr/X11R6/lib/modules"

 EndSection

 # **********************************************************************
 # Server flags section.
 # **********************************************************************

 Section "ServerFlags"

 # Uncomment this to cause a core dump at the spot where a signal is 
 # received.  This may leave the console in an unusable state, but may
 # provide a better stack trace in the core dump to aid in debugging

 #    Option "NoTrapSignals"

 # Uncomment this to disable the <Crtl><Alt><BS> server abort sequence
 # This allows clients to receive this key event.

 #    Option "DontZap"

 # Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching
 # sequences.  This allows clients to receive these key events.

 #    Option "Dont Zoom"

 # Uncomment this to disable tuning with the xvidtune client. With
 # it the client can still run and fetch card and monitor attributes,
 # but it will not be allowed to change them. If it tries it will
 # receive a protocol error.

 #    Option "DisableVidModeExtension"

 # Uncomment this to enable the use of a non-local xvidtune client. 

 #    Option "AllowNonLocalXvidtune"

 # Uncomment this to disable dynamically modifying the input device
 # (mouse and keyboard) settings. 

 #    Option "DisableModInDev"

 # Uncomment this to enable the use of a non-local client to
 # change the keyboard or mouse settings (currently only xset).

 #    Option "AllowNonLocalModInDev"

 EndSection

 # **********************************************************************
 # Input devices
 # **********************************************************************

 # **********************************************************************
 # Core keyboard's InputDevice section
 # **********************************************************************

 Section "InputDevice"

    Identifier	"Keyboard1"
    Driver	"kbd"

 # For most OSs the protocol can be omitted (it defaults to "Standard").
 # When using XQUEUE (only for SVR3 and SVR4, but not Solaris),
 # uncomment the following line.

 #    Option     "Protocol"      "Xqueue"

    Option "AutoRepeat" "250 30"

 # Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
 #    Option "Xleds" "1 2 3"

 #    Option "LeftAlt"     "Meta"
 #    Option "RightAlt"    "ModeShift"

 # To customise the XKB settings to suit your keyboard, modify the
 # lines below (which are the defaults).  For example, for a non-U.S.
 # keyboard, you will probably want to use:
 #    Option "XkbModel"    "pc102"
 # If you have a US Microsoft Natural keyboard, you can use:
 #    Option "XkbModel"    "microsoft"
 #
 # Then to change the language, change the Layout setting.
 # For example, a german layout can be obtained with:
 #    Option "XkbLayout"   "de"
 # or:
 #    Option "XkbLayout"   "de"
 #    Option "XkbVariant"  "nodeadkeys"
 #
 # If you'd like to switch the positions of your capslock and
 # control keys, use:
 #    Option "XkbOptions"  "ctrl:swapcaps"

 # These are the default XKB settings for XFree86
 #    Option "XkbRules"    "xfree86"
 #    Option "XkbModel"    "pc101"
 #    Option "XkbLayout"   "us"
 #    Option "XkbVariant"  ""
 #    Option "XkbOptions"  ""

 #    Option "XkbDisable"

    Option "XkbRules"	"xfree86"
    Option "XkbModel"	"pc105"
 #    Option "XkbLayout"	"de"  # german keyboard layout
 #    Option "XkbVariant" "nodeadkeys"  # normally not wanted

 EndSection


 # **********************************************************************
 # Core Pointer's InputDevice section
 # **********************************************************************

 # auto-detected mouse
 Section "InputDevice"

 # Identifier and driver

    Identifier  "Mouse1"
    Driver      "mouse"
    Option "Protocol"    "ImPS/2"
    Option "Device"      "/dev/input/mice"
    Option "ZaxisMapping" "4 5"

    #Option "Emulate3Buttons" "true" # for a two button touch-pad
 EndSection

 # for a normal ps2 mouse:
 #Section "InputDevice"
 #
 # Identifier and driver
 #
 #    Identifier  "Mouse1"
 #    Driver      "mouse"
 #    Option "Protocol"    "PS/2"
 #    Option "Device"      "/dev/misc/psaux"
 #
 #    #Option "Emulate3Buttons" "true" # for a two button touch-pad
 #EndSection

 # for a normal serial mouse
 #Section "InputDevice"
 #
 #    Identifier "Mouse1"
 #    Driver     "mouse"
 #    Option "Protocol"    "Microsoft"
 #    Option "Device"      "/dev/tts/0"
 #
 #    #Option "Emulate3Buttons" "true" # for a two button touch-pad
 #EndSection

 # for a usb Logitech wheel mouse
 #Section "InputDevice"
 #
 #    Identifier	"Mouse1"
 #    Driver	"mouse"
 #    Option "Protocol"    "IMPS/2"
 #    Option "Device"      "/dev/input/mouse0"
 #    Option "Buttons"	 "5"
 #    Option "ZaxisMapping" "4 5"
 #
 #EndSection


 # **********************************************************************
 # Other input device sections 
 # this is optional and is required only if you
 # are using extended input devices.  This is for example only.  Refer
 # to the XF86Config man page for a description of the options.
 # **********************************************************************
 #
 # Section "InputDevice" 
 #    Identifier  "Mouse2"
 #    Driver      "mouse"
 #    Option      "Protocol"      "MouseMan"
 #    Option      "Device"        "/dev/mouse2"
 # EndSection
 #
 # Section "InputDevice"
 #    Identifier "Spaceball"
 #    Driver     "magellan"
 #    Option     "Device"        "/dev/cua0"
 # EndSection
 #
 # Section "InputDevice"
 #    Identifier "Spaceball2"
 #    Driver     "spaceorb"
 #    Option     "Device"        "/dev/cua0"
 # EndSection
 #
 # Section "InputDevice"
 #    Identifier "Touchscreen0"
 #    Driver     "microtouch"
 #    Option     "Device"        "/dev/ttyS0"
 #    Option     "MinX"          "1412"
 #    Option     "MaxX"          "15184"
 #    Option     "MinY"          "15372"
 #    Option     "MaxY"          "1230"
 #    Option     "ScreenNumber"  "0"
 #    Option     "ReportingMode" "Scaled"
 #    Option     "ButtonNumber"  "1"
 #    Option     "SendCoreEvents"
 # EndSection
 #
 # Section "InputDevice"
 #    Identifier "Touchscreen1"
 #    Driver     "elo2300"
 #    Option     "Device"        "/dev/ttyS0"
 #    Option     "MinX"          "231"
 #    Option     "MaxX"          "3868"
 #    Option     "MinY"          "3858"
 #    Option     "MaxY"          "272"
 #    Option     "ScreenNumber"  "0"
 #    Option     "ReportingMode" "Scaled"
 #    Option     "ButtonThreshold"       "17"
 #    Option     "ButtonNumber"  "1"
 #    Option     "SendCoreEvents"
 # EndSection

 # Section "InputDevice"
 #   Identifier "Tablet1"
 #   Driver     "summa"
 #   Option     "Device"        "/dev/ttyS0"
 #   Option     "MinX"          "231"
 #   Option     "MaxX"          "3868"
 #   Option     "MinY"          "3858"
 #   Option     "MaxY"          "272"
 #   Option     "ScreenNumber"  "0"
 #   Option     "ReportingMode" "Scaled"
 #   Option     "ButtonThreshold"       "17"
 #   Option     "ButtonNumber"  "1"
 #   Option     "SendCoreEvents"
 #   Option	"BaudRate"    "19200"
 #   Option	"DataBits"    "8"
 #   Option	"StopBits"    "1"
 #   Option	"Parity"      "Odd"
 #   Option	"FlowControl" "Xoff"
 #   Option	"VTime"       "10"
 #   Option	"VMin"        "1"
 # EndSection


 # **********************************************************************
 # Monitor section
 # **********************************************************************

 # Any number of monitor sections may be present

 Section "Monitor"

    Identifier  "Monitor1"

 # NOTE: THE VALUES HERE ARE EXAMPLES ONLY.  REFER TO YOUR MONITOR'S
 # USER MANUAL FOR THE CORRECT NUMBERS !!

 # normally uncomment this lines
 #    HorizSync   24.0 - 80.0
 #    VertRefresh 50-100

 # overwrite the screen dimensions (in mm) e.g. to get another virtual dpi
 # value
 #    DisplaySize 345 260

 # HorizSync is in kHz unless units are specified.
 # HorizSync may be a comma separated list of discrete values, or a
 # comma separated list of ranges of values.
 #    HorizSync	30-64         # multisync
 #    HorizSync	31.5, 35.2    # multiple fixed sync frequencies
 #    HorizSync	15-25, 30-50  # multiple ranges of sync frequencies

 # VertRefresh is in Hz unless units are specified.
 # VertRefresh may be a comma separated list of discrete values, or a
 # comma separated list of ranges of values.
 #    VertRefresh 50-100

 # some mode examples 1,2 selfmade - 3 from fbset
 # (only needed for low-level tricks, exotic Laptops or other LCD's)
 #
 #    Mode "1152x900"
 #        DotClock        120  
 #        HTimings        1152 1200 1312 1528 
 #        VTimings        900  910  946  985
 #    EndMode
 #    Mode "1152x900-2"
 #        DotClock        100
 #        HTimings        1152 1200 1312 1528
 #        VTimings        900  910  946  985
 #    EndMode
 #    Mode "1152x864"
 #	DotClock 105.810
 #	HTimings 1152 1184 1312 1504
 #	VTimings 864 868 872 902
 #	Flags    "-HSync" "-VSync"
 #    EndMode

 # for framebuffer devices you might want to simply add
 # the 'fbset -x' output here.

 EndSection


 # **********************************************************************
 # Graphics device section
 # **********************************************************************

 # Any number of graphics device sections may be present

 Section "Device"
    Identifier	"Card1"

    # Use this for framebuffer devices - should work on most systems.
    Driver       "fbdev"
    Option       "fbdev" "/dev/fb/0"

 #    Driver	"vga" # mga, ati, nv, sis, vesa ...
 #    # Option     "BackingStore"

 #    # Some driver accept an UseFBDev option (e.g. radeon) to switch the
 #    # mode via the Linux framebuffer layer. Needed e.g. as workaround for
 #    # iBooks.
 #    # Option	"UseFBDev"

 #    # The BuID is only required for multi-monitor configs or some fbdev drivers
 #    # BusID	"PCI:1:5:0"
 #    # Screen	0 # Screen of a dual-head mga card

 #    # Option	"NoHal" # do not use the binary-only Matrox HAL library
 #    # Option	"AGPMode2x"

 EndSection

 # Matrox Millenium 4xx, Ati or NVidia second-head
 #Section "Device"
 #    Identifier	"Card2"
 #    Driver	"mga" # or other dual-able cards like ati, nv
 #    # Option	"BackingStore"

 #    BusID	"PCI:1:5:0"
 #    Screen	1
 #
 #    # Option	"NoHal" # do not use the binary-only Matrox HAL library
 #    # Option	"AGPMode2x"

 #    # Option	"Tv" "yes"
 #    # Option	"TVStandard" "PAL"
 #    # Option	"CableType" "SCART_COMPOSITE"
 #EndSection

 # **********************************************************************
 # Screen sections
 # **********************************************************************

 # Any number of screen sections may be present.  Each describes
 # the configuration of a single screen.  A single specific screen section
 # may be specified from the X server command line with the "-screen"
 # option.
 Section "Screen"
    Identifier  "Screen1"
    Device      "Card1"
    Monitor     "Monitor1"
    DefaultDepth 24

    Subsection "Display"
        Depth       4
        Modes       "1024x768" "800x600" "640x480"
        ViewPort    0 0
    EndSubsection
    Subsection "Display"
        Depth       8
        Modes       "1024x768" "800x600" "640x400"
        ViewPort    0 0
    EndSubsection
    Subsection "Display"
        Depth       16
 	Modes       "1024x768" "800x600" "640x480"
        ViewPort    0 0
    EndSubsection
    Subsection "Display"
        Depth       24
        Modes       "1024x768" "800x600" "640x480"
        ViewPort    0 0
    EndSubsection
    Subsection "Display"
        Depth       32
        Modes       "1024x768" "800x600" "640x480"
        ViewPort    0 0
    EndSubsection
 EndSection

 #Section "Screen"
 #    Identifier  "Screen2"
 #    Device      "Card2"
 #    Monitor     "Monitor1"
 #    DefaultDepth 16
 #
 #    Subsection "Display"
 #        Depth       16
 #        Modes       "1024x768" "800x600" "640x480" 
 #	ViewPort    0 0
 #    EndSubsection
 #EndSection

 #Section "Screen"
 #    Identifier  "ScreenTV"
 #    Device      "CardTV"
 #    Monitor     "Monitor1"
 #    DefaultDepth 16
 #
 #    Subsection "Display"
 #        Depth       16
 #        Modes       "640x480"
 #        ViewPort    0 0
 #    EndSubsection
 #EndSection


 # **********************************************************************
 # ServerLayout sections.
 # **********************************************************************

 # Any number of ServerLayout sections may be present.  Each describes
 # the way multiple screens are organised.  A specific ServerLayout
 # section may be specified from the X server command line with the
 # "-layout" option.  In the absence of this, the first section is used.
 # When now ServerLayout section is present, the first Screen section
 # is used alone.

 Section "ServerLayout"

 # The Identifier line must be present
    Identifier  "Simple Layout"

 # Each Screen line specifies a Screen section name, and optionally
 # the relative position of other screens.  The four names after
 # primary screen name are the screens to the top, bottom, left and right
 # of the primary screen.  In this example, screen 2 is located to the
 # right of screen 1.

    Screen "Screen1"  #LeftOf "Screen2"
    #Screen "Screen2"
    #Screen "ScreenTV" 

 # Each InputDevice line specifies an InputDevice section name and
 # optionally some options to specify the way the device is to be
 # used.  Those options include "CorePointer", "CoreKeyboard" and
 # "SendCoreEvents".

    InputDevice "Mouse1" "CorePointer"
    InputDevice "Keyboard1" "CoreKeyboard"

 # It is possible to specify secondary input devices which might not
 # be pressend on X startup. Nice for laptops with temporary external
 # mices ;-)!

 #    InputDevice "Mouse2" "SendCoreEvents"
 #    InputDevice "Tablet1"

 EndSection

--- a/package/x11/xorg/xorg.cron
+++ b/package/x11/xorg/xorg.cron
@ -1,16 +0,0 @@
 #!/bin/sh

 echo "Running mkfontscale / mkfontdir ..."
 for dir in /usr/X11R6/lib/X11/fonts/* ; do
 	[ -d $dir ] || continue
 	echo -n "$dir "
 	mkfontscale $dir
 	mkfontdir $dir
 done ; unset dir
 echo

 if [ "`which fc-cache`" ] ; then
 	echo "Running fc-cache ..."
 	fc-cache -v
 fi

--- a/package/x11/xorg/xorg.desc
+++ b/package/x11/xorg/xorg.desc
@ -1,54 +0,0 @@

 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/x11/xorg/xorg.desc
 [COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [I] The X.Org X11 Server and all base X11 files/programs

 [T] This is the X.Org's X11R6.x release that
 [T] supports several UNIX(R) and UNIX-like (such as Linux, the BSDs and
 [T] Solaris x86) operating systems on Intel and other platforms.

 [U] http://www.x.org/

 [A] The X.Org Foundation {The X.Org Sourcecode}
 [A] The Open Group X Project Team {Original Sourcecode}
 [M] Michael Obster <michael@obster.org>

 [C] base/x11
 [E] group x11
 [E] del terminus-font
 [F] CORE

 [L] OpenSource
 [S] Stable
 [V] 6.9.0 1
 [P] X X?---5---9 110.900

 [O] mga_version=4.1-1
 [O] xf_files=X11R6.9.0-src.tar.bz2

 [D] 2298387887 X11R6.9.0-src.tar.bz2 http://www.portal-to-web.de/pub/mirrors/x.org/X11R6.9.0/src-single/
 [D] 256482595 mgadriver-4.1-1-src.tar.gz ftp://ftp.matrox.com/pub/mga/archive/linux/2004/
 [D] 4094582231 mangl.tar.Z ftp://ftp.sgi.com/opengl/doc/
 [D] 1558312024 manglu.tar.Z ftp://ftp.sgi.com/opengl/doc/
 [D] 432442308 manglx.tar.Z ftp://ftp.sgi.com/opengl/doc/

--- a/package/x11/xorg/xprint-initdir-runlevel.patch
+++ b/package/x11/xorg/xprint-initdir-runlevel.patch
@ -1,129 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/xprint-initdir-runlevel.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 diff -Nur xc-vanilla/programs/Xserver/Xprint/etc/init.d/Imakefile xc/programs/Xserver/Xprint/etc/init.d/Imakefile
 --- xc-vanilla/programs/Xserver/Xprint/etc/init.d/Imakefile	2004-10-05 22:36:18.482470000 +0200
 +++ xc/programs/Xserver/Xprint/etc/init.d/Imakefile	2004-10-06 17:20:02.070718976 +0200
@@ -25,7 +25,7 @@
 #if NothingOutsideProjectRoot
 #define EtcDir ProjectRoot/etc
 #else
 -#define EtcDir /etc
 +#define EtcDir /etc/rc.d
 #endif
 
 ETCDIR = EtcDir
@@ -62,17 +62,18 @@
 XCOMM SuSE Linux(-like)
 
 #define InstallStartupLink(rcdir,script,linkname) \
 -	MakeDir($(DESTDIR)$(ETCDIR)/rc.d/rcdir) ; \
 -	ln -sf ../script $(DESTDIR)$(ETCDIR)/rc.d/rcdir/linkname
 +	MakeDir($(DESTDIR)$(ETCDIR)/rcdir) ; \
 +	ln -sf ../script $(DESTDIR)$(ETCDIR)/rcdir/linkname
 
 install::
 	echo "# Installing /etc/init.d links for SuSE Linux(-like)"
 -	InstallStartupLink(rc2.d,xprint,K21xprint)
 -	InstallStartupLink(rc2.d,xprint,S21xprint)
 -	InstallStartupLink(rc3.d,xprint,K21xprint)
 -	InstallStartupLink(rc3.d,xprint,S21xprint)
 -	InstallStartupLink(rc5.d,xprint,K21xprint)
 -	InstallStartupLink(rc5.d,xprint,S21xprint)
 +## only install for runlevel 5 because the others has no X
 +#	InstallStartupLink(rc2.d,xprint,K65xprint)
 +#	InstallStartupLink(rc2.d,xprint,S35xprint)
 +#	InstallStartupLink(rc3.d,xprint,K65xprint)
 +#	InstallStartupLink(rc3.d,xprint,S35xprint)
 +	InstallStartupLink(rc5.d,xprint,K65xprint)
 +	InstallStartupLink(rc5.d,xprint,S35xprint)
 # elif LinuxDistribution == LinuxRedHat
 XCOMM RedHat Linux(-like)
 
 diff -Nur xc-vanilla/programs/Xserver/Xprint/etc/init.d/xprint.cpp xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp
 --- xc-vanilla/programs/Xserver/Xprint/etc/init.d/xprint.cpp	2004-10-05 22:36:18.500467264 +0200
 +++ xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp	2004-10-06 17:26:46.970164904 +0200
@@ -25,6 +25,13 @@
 XCOMM Description: Startup/shutdown script for Xprint server(s)
 XCOMM## END INIT INFO
 
 +XCOMM# This is the ROCK Linux INIT information
 +XCOMM ROCK Linux /etc/rc.d/init.d/xprint
 +XCOMM
 +XCOMM Desc: Startup/shutdown script for Xprint server(s)
 +XCOMM Runlevel: 35 rcX
 +XCOMM
 +
 #undef sun
 #undef unix
 
@@ -42,21 +49,21 @@
 XCOMM
 XCOMM Usage:
 XCOMM - Start Xprint server(s) manually:
 -XCOMM   % /etc/init.d/xprint start
 +XCOMM   % /etc/rc.d/init.d/xprint start
 XCOMM
 XCOMM - Stop Xprint server(s) manually:
 -XCOMM   % /etc/init.d/xprint stop
 +XCOMM   % /etc/rc.d/init.d/xprint stop
 XCOMM
 XCOMM - Populate $XPSERVERLIST env var (for example as part of a global
 XCOMM   login script like /etc/profile or per-user login scripts like
 XCOMM   $HOME/.profile (sh/ksh/bash))
 -XCOMM   % XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
 +XCOMM   % XPSERVERLIST="`/etc/rc.d/init.d/xprint get_xpserverlist`"
 XCOMM   % export XPSERVERLIST
 XCOMM
 XCOMM Installation:
 -XCOMM   Copy this script to /etc/init.d/xprint and make sure that it is
 +XCOMM   Copy this script to /etc/rc.d/init.d/xprint and make sure that it is
 XCOMM   executable. If your installation is LSB-compliant, then run
 -XCOMM   % /usr/lib/lsb/install_initd /etc/init.d/xprint
 +XCOMM   % /usr/lib/lsb/install_initd /etc/rc.d/init.d/xprint
 XCOMM   to start the service on startup. Otherwise, manually create links
 XCOMM   to the matching run levels.
 XCOMM   Examples:
@@ -680,7 +687,7 @@
                   echo "Xprint server pid=${server_pid} done, exitcode=$?."
                   
                   # Remove the dead server from the registry
 -                  # (only if the registry still exists - if /etc/init.d/xprint stop" gets called the registry
 +                  # (only if the registry still exists - if /etc/rc.d/init.d/xprint stop" gets called the registry
                   # will be removed - and we should not re-create it afterwards...)
                   lock_server_registry
                   if [ -f "${XP_SERVERS}" ] ; then
@@ -745,7 +752,7 @@
     else 
         # Continue in the background if there is no spooler running yet (that
         # we don't hold off the boot process nor run in a possible race-condition
 -        # when /etc/init.d/lpd was not called yet but the runlevel script waits
 +        # when /etc/rc.d/init.d/lpd was not called yet but the runlevel script waits
         # for us to finish first ...
         if is_spooler_running ; then
             msg "Starting Xprint servers: Xprt."
@@ -1095,7 +1102,7 @@
         # done with setting the config for per-user Xprt instances
         return 0;
     else
 -        # Use /etc/init.d/xprint's builtin config
 +        # Use /etc/rc.d/init.d/xprint's builtin config
         # Each entry should start with |setup_config_defaults| to pull the
         # platform defaults and finish with |num_xpstart=$(($num_xpstart + 1))|
         # to end the entry
--- a/package/x11/xorg/xprint-nocshprofile.patch
+++ b/package/x11/xorg/xprint-nocshprofile.patch
@ -1,28 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/xorg/xprint-nocshprofile.patch
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 diff -Nur xc-vanilla/programs/Xserver/Xprint/etc/profile.d/Imakefile xc/programs/Xserver/Xprint/etc/profile.d/Imakefile
 --- xc-vanilla/programs/Xserver/Xprint/etc/profile.d/Imakefile	2004-10-05 22:36:18.508466048 +0200
 +++ xc/programs/Xserver/Xprint/etc/profile.d/Imakefile	2004-10-06 14:57:25.016588936 +0200
@@ -10,5 +10,4 @@
 
 all::
 
 -InstallNamedProg(xprint.csh,xprint.csh,$(ETCDIR)/profile.d)
 InstallNamedProg(xprint.sh,xprint.sh,$(ETCDIR)/profile.d)