diff --git a/package/x11/xfree86-cvs/apm.patch b/package/x11/xfree86-cvs/apm.patch
deleted file mode 100644
index aa5e2e278..000000000
--- a/package/x11/xfree86-cvs/apm.patch
+++ /dev/null
@@ -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/xfree86-cvs/apm.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./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
diff --git a/package/x11/xfree86-cvs/devfs-vc.patch b/package/x11/xfree86-cvs/devfs-vc.patch
deleted file mode 100644
index 41b615153..000000000
--- a/package/x11/xfree86-cvs/devfs-vc.patch
+++ /dev/null
@@ -1,64 +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/xfree86-cvs/devfs-vc.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- xfree86-cvs-2003-01-08/programs/Xserver/hw/kdrive/linux/linux.c~ 2002-10-08 23:27:55.000000000 +0200
-+++ xfree86-cvs-2003-01-08/programs/Xserver/hw/kdrive/linux/linux.c 2003-01-11 21:26:19.000000000 +0100
-@@ -79,10 +79,10 @@
- vtno = kdVirtualTerminal;
- else
- {
-- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
-+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0)
- {
- FatalError(
-- "LinuxInit: Cannot open /dev/tty0 (%s)\n",
-+ "LinuxInit: Cannot open /dev/vc/0 (%s)\n",
- strerror(errno));
- }
- if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
-@@ -93,7 +93,7 @@
- }
- close(fd);
-
-- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
-+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/vc/1-64 */
-
- if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
- {
-@@ -110,7 +110,7 @@
- *
- * Why is this needed?
- */
-- LinuxCheckChown ("/dev/tty0");
-+ LinuxCheckChown ("/dev/vc/0");
- /*
- * Linux doesn't switch to an active vt after the last close of a vt,
- * so we do this ourselves by remembering which is active now.
-@@ -441,7 +441,7 @@
- activeVT = -1;
- }
- close(LinuxConsoleFd); /* make the vt-manager happy */
-- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
-+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0);
- if (fd >= 0)
- {
- ioctl (fd, VT_GETSTATE, &vts);
diff --git a/package/x11/xfree86-cvs/imake_rules.patch b/package/x11/xfree86-cvs/imake_rules.patch
deleted file mode 100644
index 2ffd926b5..000000000
--- a/package/x11/xfree86-cvs/imake_rules.patch
+++ /dev/null
@@ -1,36 +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/xfree86-cvs/imake_rules.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./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)
diff --git a/package/x11/xfree86-cvs/imake_tmpl.patch b/package/x11/xfree86-cvs/imake_tmpl.patch
deleted file mode 100644
index 70e0360ad..000000000
--- a/package/x11/xfree86-cvs/imake_tmpl.patch
+++ /dev/null
@@ -1,45 +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/xfree86-cvs/imake_tmpl.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./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 /* Addeed by Clifford */
- VARDIR = VarDirectory /* usually /var */
- VARLIBDIR = VarLibDir /* xdm runtime files */
- SYSTEMUSRLIBDIR = SystemUsrLibDir /* system's "/usr/lib" */
diff --git a/package/x11/xfree86-cvs/imakemdep_ppc.patch b/package/x11/xfree86-cvs/imakemdep_ppc.patch
deleted file mode 100644
index dc417e673..000000000
--- a/package/x11/xfree86-cvs/imakemdep_ppc.patch
+++ /dev/null
@@ -1,34 +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/xfree86-cvs/imakemdep_ppc.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./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
diff --git a/package/x11/xfree86-cvs/startwm.patch b/package/x11/xfree86-cvs/startwm.patch
deleted file mode 100644
index 1e4f14108..000000000
--- a/package/x11/xfree86-cvs/startwm.patch
+++ /dev/null
@@ -1,209 +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/xfree86-cvs/startwm.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./programs/twm/system.twmrc.orig Fri Jan 21 19:41:50 2000
-+++ ./programs/twm/system.twmrc Thu Dec 28 15:23:15 2000
-@@ -12,6 +12,8 @@
- # $XFree86: xc/programs/twm/system.twmrc,v 1.3 2000/01/21 18:41:50 dawes Exp $
- #
-
-+NoDefaults
-+
- NoGrabServer
- RestartPreviousState
- DecorateTransients
-@@ -21,23 +23,26 @@
- IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
- IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*"
- #ClientBorderWidth
-+RandomPlacement
-+AutoRelativeResize
-+IconifyByUnmapping
-
- Color
- {
-- BorderColor "slategrey"
-- DefaultBackground "rgb:2/a/9"
-- DefaultForeground "gray85"
-- TitleBackground "rgb:2/a/9"
-- TitleForeground "gray85"
-- MenuBackground "rgb:2/a/9"
-- MenuForeground "gray85"
-- MenuTitleBackground "gray70"
-- MenuTitleForeground "rgb:2/a/9"
-- IconBackground "rgb:2/a/9"
-- IconForeground "gray85"
-- IconBorderColor "gray85"
-- IconManagerBackground "rgb:2/a/9"
-- IconManagerForeground "gray85"
-+ BorderColor "slategrey"
-+ DefaultBackground "rgb:2/a/9"
-+ DefaultForeground "gray85"
-+ TitleBackground "rgb:2/a/9"
-+ TitleForeground "gray85"
-+ MenuBackground "rgb:2/a/9"
-+ MenuForeground "gray85"
-+ MenuTitleBackground "gray70"
-+ MenuTitleForeground "rgb:2/a/9"
-+ IconBackground "rgb:2/a/9"
-+ IconForeground "gray85"
-+ IconBorderColor "gray85"
-+ IconManagerBackground "rgb:2/a/9"
-+ IconManagerForeground "gray85"
- }
-
- #
-@@ -46,48 +51,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
- }
---- ./programs/xdm/config/Xsession.orig Sun Jan 11 04:48:32 1998
-+++ ./programs/xdm/config/Xsession Thu Dec 28 15:23:15 2000
-@@ -33,5 +33,11 @@
- if [ -r "$resources" ]; then
- xrdb -load "$resources"
- fi
-+
-+ WINDOWMANAGER="${WINDOWMANAGER:-gnome-session}"
-+ [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
-+ [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
-+ [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
-+ xsetroot -solid darkcyan ; exec twm ; exec xterm
- exec xsm
- fi
---- ./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/xinit/xinitrc.cpp.orig Wed Apr 27 09:13:07 1994
-+++ ./programs/xinit/xinitrc.cpp Thu Dec 28 15:23:15 2000
-@@ -24,10 +24,10 @@
- xmodmap $usermodmap
- fi
-
--XCOMM start some nice programs
-+XCOMM start the window manager
-
--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:-gnome-session}"
-+[ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
-+[ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
-+[ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
-+xsetroot -solid darkcyan ; exec twm ; exec xterm
diff --git a/package/x11/xfree86-cvs/stone_mod_xfree86.sh b/package/x11/xfree86-cvs/stone_mod_xfree86.sh
deleted file mode 100644
index 3823be654..000000000
--- a/package/x11/xfree86-cvs/stone_mod_xfree86.sh
+++ /dev/null
@@ -1,39 +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/xfree86-cvs/stone_mod_xfree86.sh
-# ROCK Linux is Copyright (C) 1998 - 2003 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 xfree86 X11/XFree86 (Graphical User Interface)
-
-main() {
- while
- gui_menu xfree86 'XFree86 Configuration Menu' \
- \
- 'Run "xf86config" (interactve config) now' \
- 'gui_cmd xf86config xf86config' \
- \
- 'Run "X -configure" (automated config) now' \
- 'X -configure' \
- \
- 'Edit/View /etc/X11/XF86Config' \
- "gui_edit XF86config /etc/X11/XF86Config"
- do : ; done
-}
-
diff --git a/package/x11/xfree86-cvs/xconsole-pty.patch b/package/x11/xfree86-cvs/xconsole-pty.patch
deleted file mode 100644
index 31791b0ab..000000000
--- a/package/x11/xfree86-cvs/xconsole-pty.patch
+++ /dev/null
@@ -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/xfree86-cvs/xconsole-pty.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./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 */
diff --git a/package/x11/xfree86-cvs/xfree86-cvs.cache b/package/x11/xfree86-cvs/xfree86-cvs.cache
deleted file mode 100644
index e72c02df0..000000000
--- a/package/x11/xfree86-cvs/xfree86-cvs.cache
+++ /dev/null
@@ -1,35 +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/xfree86-cvs/xfree86-cvs.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2003 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] 1040267111 Thu Dec 19 04:05:11 2002
-[CONFIG-ID] 1.7-snapshot-ia32-reference
-[ROCKVER] 1.7-snapshot
-
-[LOGS] 5-xfree86.log 9-xfree86.log
-
-[BUILDTIME] 322391 (9)
-[SIZE] 147.57 MB, 11573 files
-
-[DEP] bash binutils bison bzip2 fileutils findutils flex gawk gcc3 glibc
-[DEP] grep gv gzip linux24-src m4 make ncompress ncurses patch perl5
-[DEP] postfix sed sh-utils sysfiles tar textutils xfree86
-
diff --git a/package/x11/xfree86-cvs/xfree86-cvs.conf b/package/x11/xfree86-cvs/xfree86-cvs.conf
deleted file mode 100644
index 4c11a8d8b..000000000
--- a/package/x11/xfree86-cvs/xfree86-cvs.conf
+++ /dev/null
@@ -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/xfree86-cvs/xfree86-cvs.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
-. package/x11/xfree86/xf_config.sh
-
-x11base_main() {
- echo "Extracting source (CVS) ..."
- tar $taropt $archdir/xfree86-cvs-$ver.tar.bz2
-
- cd xfree86-cvs-$ver
-
- xf_extract_gl
- xf_extract_hallib
-
- xf_patch
- xf_build
- xf_install
-}
-
-custmain=x11base_main
-autoextract=0
-createdocs=0
diff --git a/package/x11/xfree86-cvs/xfree86-cvs.cron b/package/x11/xfree86-cvs/xfree86-cvs.cron
deleted file mode 100644
index 119a7dc6b..000000000
--- a/package/x11/xfree86-cvs/xfree86-cvs.cron
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "Running mkfontdir ..."
-for i in /usr/X11R6/lib/X11/fonts/* ; do
- if test -f $i/fonts.dir ; then mkfontdir $i ; fi
-done ; unset i
-
diff --git a/package/x11/xfree86-cvs/xfree86-cvs.desc b/package/x11/xfree86-cvs/xfree86-cvs.desc
deleted file mode 100644
index 49fd7fd1e..000000000
--- a/package/x11/xfree86-cvs/xfree86-cvs.desc
+++ /dev/null
@@ -1,51 +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/xfree86-cvs/xfree86-cvs.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2003 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] A CVS snapshot of the XFree86 X11 Server
-
-[T] XFree86 is the Open Source port of X.Org's X11R6 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.xfree86.org/
-
-[A] The XFree86 Project, Inc. {The XFreee86 Sourcecode}
-[A] The Open Group X Project Team {Original Sourcecode}
-[M] Rene Rebe <rene@rocklinux.org>
-
-[C] base/x11
-[E] group x11
-
-[L] OpenSource
-[S] Beta
-[V] 2003-09-15
-[P] X -----5---9 952.000
-
-[O] mga_version=2.1
-
-[D] X xfree86-cvs-2003-09-15.tar.bz2 cvs://ssh:anoncvs@anoncvs.xfree86.org:/cvs::xc!2003-04-05/
-[D] 2803589536 mgadrivers-2.1-src.tgz ftp://ftp.matrox.com/pub/mga/archive/linux/2003/
-[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/
-
diff --git a/package/x11/xfree86-cvs/xman-filters.patch.disabled b/package/x11/xfree86-cvs/xman-filters.patch.disabled
deleted file mode 100644
index 3a461228c..000000000
--- a/package/x11/xfree86-cvs/xman-filters.patch.disabled
+++ /dev/null
@@ -1,50 +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/xfree86-cvs/xman-filters.patch.disabled
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./programs/xman/vendor.h.orig 2001-11-04 02:13:48.000000000 +0200
-+++ ./programs/xman/vendor.h 2002-10-01 20:36:52.000000000 +0300
-@@ -173,20 +173,20 @@
- # elif defined(BSD) && (BSD >= 199103)
- # define FORMAT "| eqn | tbl | nroff -man"
- # elif defined(linux)
--# define FORMAT "| geqn | gtbl | groff -Tlatin1 -mandoc"
-+# define FORMAT "| eqn | tbl | groff -Tlatin1 -mandoc"
- # else
- # define FORMAT "| neqn | nroff -man" /* The format command. */
- # endif
- # if defined(linux)
--# define TBL "gtbl"
-+# define TBL "tbl"
- # else
- # define TBL "tbl"
- # endif
- #else /* HANDLE_ROFFSEQ */
- # if defined(linux)
--# define ZSOELIM "zsoelim"
--# define EQN "geqn"
--# define TBL "gtbl"
-+# define ZSOELIM "soelim"
-+# define EQN "eqn"
-+# define TBL "tbl"
- # else
- # define ZSOELIM "soelim"
- # define EQN "eqn"
diff --git a/package/x11/xfree86-cvs/xterm-ls.patch b/package/x11/xfree86-cvs/xterm-ls.patch
deleted file mode 100644
index 13fbfc1d9..000000000
--- a/package/x11/xfree86-cvs/xterm-ls.patch
+++ /dev/null
@@ -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/xfree86-cvs/xterm-ls.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
-
---- ./programs/xterm/XTerm.ad.orig Wed Jun 14 21:43:58 2000
-+++ ./programs/xterm/XTerm.ad Thu Dec 28 15:22:20 2000
-@@ -138,3 +138,6 @@
- *VT100*color15: white
- *VT100*colorUL: yellow
- *VT100*colorBD: white
-+
-+! A new xTerm should (= must!) have a login shell. (Clifford)
-+*loginShell: on