xorg-*: Massive rename to conform to X11R7.x_a.b.c versioning and xorg-* directory structure.

	This is the first step for the update to X11R7.1.  
	This will not build and will be followed by more patches and updates.

3 files changed, 0 insertions, 143 deletions

diff --git a/packages/xfonts/imake-staging.patch b/packages/xfonts/imake-staging.patch
deleted file mode 100644
index bf2e350830..0000000000
--- a/packages/xfonts/imake-staging.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- xc/config/cf/Imake.tmpl.orig	2004-07-28 04:24:29.000000000 +0100
-+++ xc/config/cf/Imake.tmpl	2004-09-14 21:03:06.000000000 +0100
-@@ -2038,11 +2038,11 @@
-  */
-       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
--           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
-         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-          LDPRELIB = LdPreLib $(INSTALLED_LIBS)
-         LDPOSTLIB = LdPostLib
--        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
-      CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
- 
-            LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
---- xc/config/cf/Library.tmpl~	2004-05-24 20:06:57.000000000 +0100
-+++ xc/config/cf/Library.tmpl	2004-09-14 21:10:29.000000000 +0100
-@@ -114,7 +114,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
--     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
-    PICFLAGS = LargePositionIndependentCFlags
- # endif
---- xc/config/cf/X11.tmpl~	2004-09-03 17:18:18.000000000 +0100
-+++ xc/config/cf/X11.tmpl	2004-09-14 21:30:30.000000000 +0100
-@@ -3359,7 +3359,7 @@
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
- #if Freetype2LibDirStandard
--FREETYPE2LIB = -lfreetype
-+FREETYPE2LIB = $(LD_STAGING) -lfreetype
- #else
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
- #endif
diff --git a/packages/xfonts/lexer.patch b/packages/xfonts/lexer.patch
deleted file mode 100644
index c3caf57174..0000000000
--- a/packages/xfonts/lexer.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur xc.old/config/pswrap/lexer.l xc/config/pswrap/lexer.l
---- xc.old/config/pswrap/lexer.l	2004-04-23 18:42:00.000000000 +0000
-+++ xc/config/pswrap/lexer.l	2004-11-16 21:07:10.569144105 +0000
-@@ -41,6 +41,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
-+int yy_prev_more_offset;
- 
- #include "pswpriv.h"
- #include "pswparser.h"
-diff -Naur xc.old/programs/twm/lex.l xc/programs/twm/lex.l
---- xc.old/programs/twm/lex.l	2004-04-23 18:42:00.000000000 +0000
-+++ xc/programs/twm/lex.l    2004-11-16 21:07:10.569144105 +0000
-@@ -65,6 +41,7 @@
- #include "gram.h"
- #include "list.h"
- #include "parse.h"
-+int yy_prev_more_offset;
-
- #ifdef FLEX_SCANNER
- int yylineno;
-diff -Naur xc.old/programs/xgc/lex.l xc/programs/xgc/lex.l
---- xc.old/programs/xgc/lex.l	2004-04-23 18:42:00.000000000 +0000
-+++ xc/programs/xgc/lex.l    2004-11-16 21:07:10.569144105 +0000
-@@ -11,6 +11,9 @@
- #include <X11/X.h>
- #include "gram.h"
- #include "constants.h"
-+ 
-+int yy_prev_more_offset;
-+ 
- #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__)
- int yylineno = 0;
- #endif
-diff -Naur xc.old/programs/Xserver/hw/dmx/config/scanner.l xc/programs/Xserver/hw/dmx/config/scanner.l
---- xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-07-30 20:06:00.000000000 +0000
-+++ xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-11-16 21:07:10.569144105 +0000
-@@ -37,6 +37,9 @@
- #include "parser.h"
- #include <string.h>
- #include <ctype.h>
-+
-+int yy_prev_more_offset;
-+
- static int getdimension(int token, const char *text, int leng);
- static int getstring(int token, const char *text, int leng);
- static int gettoken(int token, const char *text, int leng);
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xfonts/xfonts-xorg_6.8.bb
deleted file mode 100644
index f6710dcd5b..0000000000
--- a/packages/xfonts/xfonts-xorg_6.8.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-SECTION = "x11/base"
-PR = "r1"
-# XXX Is this true?  These fonts are from X.org.
-LICENSE = "XFree86"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
-	file://lexer.patch;patch=1"
-
-
-PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}"
-FILES_${PN}-75dpi = "${libdir}/X11/fonts/75dpi"
-FILES_${PN}-100dpi = "${libdir}/X11/fonts/100dpi"
-FILES_${PN}-type1 = "${libdir}/X11/fonts/Type1"
-FILES_${PN}-ttf = "${libdir}/X11/fonts/TTF"
-FILES_${PN}-cyrillic = "${libdir}/X11/fonts/cyrillic"
-FILES_${PN} = "${libdir}/X11/fonts"
-
-PACKAGE_ARCH = "all"
-
-S = "${WORKDIR}/xc"
-
-do_configure() {
-	echo "#define ProjectRoot /usr" >> config/cf/host.def
-	echo "#define XnestServer NO"  >> config/cf/host.def
-	echo "#define XdmxServer NO"  >> config/cf/host.def
-	echo "#define CcCmd ${BUILD_CC}" >> config/cf/host.def
-	echo "#define LdCmd ${BUILD_LD}" >> config/cf/host.def
-	echo "#define BuildFreetype2Library YES" >> config/cf/host.def
-	echo "#define HasFreetype2 NO" >> config/cf/host.def
-	echo "" > config/cf/date.def
-	make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
-	make CC="${BUILD_CC}" xmakefile
-	make Makefiles
-	make clean
-}
-
-do_compile() {
-	#make depend
-	make includes
-	make -C config/util
-	make -C lib/freetype2
-	make -C lib/font
-	make -C lib/fontenc
-	make -C lib/fontconfig
-	make -C programs/mkfontscale
-	make -C programs/bdftopcf
-	make -C programs/fc-cache
-	make -C fonts
-}
-
-do_install() {
-	make -C fonts DESTDIR="${D}" install
-}
-
-do_stage() {
-	:
-}