packages: fix xorg to compile modular and tiny versions

Based on googlecode r558 by John Voltz.

29 files changed, 0 insertions, 1795 deletions

diff --git a/package/xorg/Config.in b/package/xorg/Config.in
deleted file mode 100644
index c4fb419b3..000000000
--- a/package/xorg/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_XORG
-	depends on BR2_DEPRECATED
-	bool "X.org X Window System"
-	default y if BR2_PACKAGE_XSERVER_xorg
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_FONTCONFIG
-	select BR2_PACKAGE_PKGCONFIG
-	help
-	  The official X Window system and server.
-
-comment "X.org 6.8.2 X Window System disabled"
-	depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG7
-
diff --git a/package/xorg/Xserver b/package/xorg/Xserver
deleted file mode 100755
index 426ddaf06..000000000
--- a/package/xorg/Xserver
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X11/X -br dpms nologo -nolisten tcp
diff --git a/package/xorg/Xsession b/package/xorg/Xsession
deleted file mode 100755
index 5b63bb38e..000000000
--- a/package/xorg/Xsession
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export GDK_USE_XFT=1
-export LANG="en_US.UTF-8"
-/usr/bin/X11/rxvt -bg black -fg gray90
diff --git a/package/xorg/fontfile.patch b/package/xorg/fontfile.patch
deleted file mode 100644
index ed39bf45d..000000000
--- a/package/xorg/fontfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/lib/font/fontfile/Imakefile.old	2005-06-03 20:09:53.000000000 +0100
-+++ xc/lib/font/fontfile/Imakefile	2005-06-03 20:09:57.000000000 +0100
-@@ -14,7 +14,7 @@
- #endif
- 
-    INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
--	      -I$(INCLUDESRC)
-+	      -I$(INCLUDESRC) $(CC_STAGING)
-     HEADERS = 
- #ifdef FontFormatDefines
- FORMAT_DEFS = FontFormatDefines
diff --git a/package/xorg/fonts.alias b/package/xorg/fonts.alias
deleted file mode 100644
index 00e987071..000000000
--- a/package/xorg/fonts.alias
+++ /dev/null
@@ -1,6 +0,0 @@
-fixed        -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
-variable     -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
-7x14         -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
-7x14bold     -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
-
--misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
diff --git a/package/xorg/fonts.cache-1 b/package/xorg/fonts.cache-1
deleted file mode 100644
index daba0efa1..000000000
--- a/package/xorg/fonts.cache-1
+++ /dev/null
@@ -1,12 +0,0 @@
-"DejaVuSans-BoldOblique.ttf" 0 "DejaVu Sans:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4w}6a;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;)   !!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~  !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY  !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1%    !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7)  !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP      !)n<!!!!?+!!#PQ!!%|B  q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1       !!+Wr&0h?q P0oWR     !!+u{!ANVJ       !!.%!       /?6HG:lang=aa|ab|af|ast|ava|ay|az|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSans-Bold.ttf" 0 "DejaVu Sans:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4xpki;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;)   !!!7)Rim;3$WUr)#F+zm{ao04!FFpNQNVtK!!$qe#?3E%!!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~  !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY  !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1%    !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7)  !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP      !)n<!!!!?+!!#PQ!!%|B  q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1       !!+Wr&0h?q P0oWR     !!+u{!ANVJ |>6r||>^1!gm&i! #xw^)w0TUs!!+~~   |9.n]|>^1!|>^1!|>^1!ZK#{t!!.%!       /?6HG:lang=aa|ab|af|ar|ast|ava|ay|az|az-ir|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|ku-ir|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|ug|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSans-Oblique.ttf" 0 "DejaVu Sans:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4wUxZ;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;)   !!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~  !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY  !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1%    !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7)  !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP      !)n<!!!!?+!!#PQ!!%|B  q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1       !!+Wr&0h?q P0oWR     !!+u{!ANVJ       !!.%!       /?6HG:lang=aa|ab|af|ast|ava|ay|az|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSans.ttf" 0 "DejaVu Sans:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4xpki;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;)   !!!7)Rim;3$WUr)#F+zm{ao04!FFpNQNVtK!!$qe#?3E%!!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~  !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY  !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1%    !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7)  !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP      !)n<!!!!?+!!#PQ!!%|B  q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1       !!+Wr&0h?q P0oWR     !!+u{!ANVJ |>6r||>^1!gm&i! #xw^)w0TUs!!+~~   |9.n]|>^1!|>^1!|>^1!ZK#{t!!.%!       /?6HG:lang=aa|ab|af|ar|ast|ava|ay|az|az-ir|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|ku-ir|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|ug|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSansMono-Bold.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R  !!#3H!)rmR!!!Kz|<lWx     !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!{{K.!|>^1!|>^1!/?+uU!!!!%  !!#GN    {}$35|>T(~ !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !!!!G !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSansMono-BoldOblique.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R  !!#3H!)rmR!!!Kz|<lWx     !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~    !!#GN       !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !!!!G !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSansMono-Oblique.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R  !!#3H!)rmR!!!Kz|<lWx     !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~    !!#GN       !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !!!!G !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSansMono.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R  !!#3H!)rmR!!!Kz|<lWx     !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#DM|>^1!{{K.!|>^1!|>^1!/?+uU!!!!%  !!#GN    {}$35P0fQP !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !!!!G !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSerif-Bold.ttf" 0 "DejaVu Serif:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R#  !!#3H!)rmR!!!Kz|<lWx !#Z(4   !!#6Is|M]|!!!Ue!!!%2!!!!Z    !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~    !!#GN       !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !#x>Y !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSerif-BoldOblique.ttf" 0 "DejaVu Serif:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R#  !!#3H!)rmR!!!Kz|<lWx !#Z(4   !!#6Is|M]|!!!Ue!!!%2!!!!Z    !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~    !!#GN       !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !#x?D !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSerif-Oblique.ttf" 0 "DejaVu Serif:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R#  !!#3H!)rmR!!!Kz|<lWx !#Z(4   !!#6Is|M]|!!!Ue!!!%2!!!!Z    !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~    !!#GN       !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !#x?D !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
-"DejaVuSerif.ttf" 0 "DejaVu Serif:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~  !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R#  !!#3H!)rmR!!!Kz|<lWx !#Z(4   !!#6Is|M]|!!!Ue!!!%2!!!!Z    !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+      !!#AL    |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~    !!#GN       !!!!#!!#MP       !!!?+!!#SR!#>r1       !!+fv      !#x>Y !!+u{!!!!)       !!.%!       /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType"
diff --git a/package/xorg/freetype.patch b/package/xorg/freetype.patch
deleted file mode 100644
index 0ba3dd562..000000000
--- a/package/xorg/freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xc/lib/font/FreeType/Imakefile.old	2005-06-03 20:18:51.000000000 +0100
-+++ xc/lib/font/FreeType/Imakefile	2005-06-03 20:18:52.000000000 +0100
-@@ -20,7 +20,7 @@
- 
- INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
-            -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
--           -I$(INCLUDESRC)
-+           -I$(INCLUDESRC) $(CC_STAGING)
- 
- SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
- OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
---- xc/config/cf/X11.tmpl.old	2005-06-03 20:40:24.000000000 +0100
-+++ xc/config/cf/X11.tmpl	2005-06-03 20:40:40.000000000 +0100
-@@ -3371,7 +3371,7 @@
- 
- #if BuildFreetype2Library || HasFreetype2
- #if Freetype2IncDirStandard
--FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
-+FREETYPE2INCLUDES = `pkg-config --cflags freetype2`
- #else
- FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
- #endif
diff --git a/package/xorg/kbproto.pc b/package/xorg/kbproto.pc
deleted file mode 100644
index 7ce28edbb..000000000
--- a/package/xorg/kbproto.pc
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
- 
-Name: KBProto
-Description: KB extension headers
-Version: 1.0.3
-Cflags: -I${includedir}
diff --git a/package/xorg/libXfont-1.1.0-noftinternals.patch b/package/xorg/libXfont-1.1.0-noftinternals.patch
deleted file mode 100644
index 846410dc7..000000000
--- a/package/xorg/libXfont-1.1.0-noftinternals.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -urbN libXfont-1.1.0/src/FreeType/ftfuncs.c libXfont-1.1.0.new/src/FreeType/ftfuncs.c
---- xc/lib/font/FreeType/ftfuncs.c	2005-10-24 02:32:05.000000000 +0800
-+++ xc/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 libXfont-1.1.0/src/FreeType/ftfuncs.h libXfont-1.1.0.new/src/FreeType/ftfuncs.h
---- xc/lib/font/FreeType/ftfuncs.h	2005-07-07 22:59:47.000000000 +0800
-+++ xc/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 libXfont-1.1.0/src/FreeType/ftsystem.c libXfont-1.1.0.new/src/FreeType/ftsystem.c
---- xc/lib/font/FreeType/ftsystem.c	2005-07-09 14:36:10.000000000 +0800
-+++ xc/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
diff --git a/package/xorg/libdir-la.patch b/package/xorg/libdir-la.patch
deleted file mode 100644
index 90b0444c6..000000000
--- a/package/xorg/libdir-la.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- xc/lib/Xft/ltmain.sh.orig	2004-04-23 12:43:42.000000000 -0600
-+++ xc/lib/Xft/ltmain.sh	2007-01-13 15:04:20.000000000 -0700
-@@ -548,7 +548,7 @@
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
- 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
-+	  #exit 1
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -1652,7 +1652,7 @@
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
- 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
-+	  #exit 1
- #       else
- #         $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -5362,10 +5362,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit 1
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  #if test "$inst_prefix_dir" = "$destdir"; then
-+	  #  $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #  exit 1
-+	  #fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
---- xc/extras/fontconfig/ltmain.sh.orig	2004-04-23 12:43:42.000000000 -0600
-+++ xc/extras/fontconfig/ltmain.sh	2007-01-13 15:04:20.000000000 -0700
-@@ -548,7 +548,7 @@
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
- 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
-+	  #exit 1
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -1652,7 +1652,7 @@
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
- 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
-+	  #exit 1
- #       else
- #         $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -5362,10 +5362,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit 1
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  #if test "$inst_prefix_dir" = "$destdir"; then
-+	  #  $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #  exit 1
-+	  #fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
---- xc/extras/freetype2/builds/unix/ltmain.sh.orig	2007-01-13 15:05:47.000000000 -0700
-+++ xc/extras/freetype2/builds/unix/ltmain.sh	2007-01-13 15:07:55.000000000 -0700
-@@ -226,8 +226,9 @@
- 	# line option must be used.
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit $EXIT_FAILURE
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit $EXIT_FAILURE
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -2147,8 +2148,14 @@
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
- 	else
- 	  dir="$ladir/$objdir"
-@@ -2615,6 +2622,16 @@
- 		esac
- 		if grep "^installed=no" $deplib > /dev/null; then
- 		  path="$absdir/$objdir"
-+#		This interferes with crosscompilation. -CL
-+#		else
-+#		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+#		  if test -z "$libdir"; then
-+#		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+#		    exit 1
-+#		  fi
-+#		  if test "$absdir" != "$libdir"; then
-+#		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+#		  fi
- 		else
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -z "$libdir"; then
-@@ -5165,6 +5182,10 @@
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5483,10 +5504,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit $EXIT_FAILURE
-+	  # fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
diff --git a/package/xorg/mcookie.c b/package/xorg/mcookie.c
deleted file mode 100644
index 902d92fc4..000000000
--- a/package/xorg/mcookie.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/* mcookie.c -- Generates random numbers for xauth
- * Created: Fri Feb  3 10:42:48 1995 by faith@cs.unc.edu
- * Revised: Fri Mar 19 07:48:01 1999 by faith@acm.org
- * Public Domain 1995, 1999 Rickard E. Faith (faith@acm.org)
- * This program comes with ABSOLUTELY NO WARRANTY.
- * 
- * $Id: mcookie.c,v 1.5 1997/07/06 00:13:06 aebr Exp $
- *
- * This program gathers some random bits of data and used the MD5
- * message-digest algorithm to generate a 128-bit hexadecimal number for
- * use with xauth(1).
- *
- * NOTE: Unless /dev/random is available, this program does not actually
- * gather 128 bits of random information, so the magic cookie generated
- * will be considerably easier to guess than one might expect.
- *
- * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
- * - added Native Language Support
- * 1999-03-21 aeb: Added some fragments of code from Colin Plumb.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-
-#define BUFFERSIZE 4096
-
-
-#ifndef MD5_H
-#define MD5_H
-
-#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__)
-typedef unsigned int uint32;
-#else
-typedef unsigned long uint32;
-#endif
-
-struct MD5Context {
-	uint32 buf[4];
-	uint32 bits[2];
-	unsigned char in[64];
-};
-
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, unsigned char const *buf,
-	       unsigned len);
-void MD5Final(unsigned char digest[16], struct MD5Context *context);
-void MD5Transform(uint32 buf[4], uint32 const in[16]);
-
-/*
- * This is needed to make RSAREF happy on some MS-DOS compilers.
- */
-typedef struct MD5Context MD5_CTX;
-
-#endif /* !MD5_H */
-
-
-
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.  This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to MD5Init, call MD5Update as
- * needed on buffers full of bytes, and then call MD5Final, which
- * will fill a supplied 16-byte array with the digest.
- */
-#include <string.h>		/* for memcpy() */
-#include <endian.h>
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define byteReverse(buf, len)	/* Nothing */
-#else
-void byteReverse(unsigned char *buf, unsigned longs);
-
-/*
- * Note: this code is harmless on little-endian machines.
- */
-void byteReverse(unsigned char *buf, unsigned longs)
-{
-    uint32 t;
-    do {
-	t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
-	    ((unsigned) buf[1] << 8 | buf[0]);
-	*(uint32 *) buf = t;
-	buf += 4;
-    } while (--longs);
-}
-#endif
-
-/*
- * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
- * initialization constants.
- */
-void MD5Init(struct MD5Context *ctx)
-{
-    ctx->buf[0] = 0x67452301;
-    ctx->buf[1] = 0xefcdab89;
-    ctx->buf[2] = 0x98badcfe;
-    ctx->buf[3] = 0x10325476;
-
-    ctx->bits[0] = 0;
-    ctx->bits[1] = 0;
-}
-
-/*
- * Update context to reflect the concatenation of another buffer full
- * of bytes.
- */
-void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
-{
-    uint32 t;
-
-    /* Update bitcount */
-
-    t = ctx->bits[0];
-    if ((ctx->bits[0] = t + ((uint32) len << 3)) < t)
-	ctx->bits[1]++;		/* Carry from low to high */
-    ctx->bits[1] += len >> 29;
-
-    t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
-
-    /* Handle any leading odd-sized chunks */
-
-    if (t) {
-	unsigned char *p = (unsigned char *) ctx->in + t;
-
-	t = 64 - t;
-	if (len < t) {
-	    memcpy(p, buf, len);
-	    return;
-	}
-	memcpy(p, buf, t);
-	byteReverse(ctx->in, 16);
-	MD5Transform(ctx->buf, (uint32 *) ctx->in);
-	buf += t;
-	len -= t;
-    }
-    /* Process data in 64-byte chunks */
-
-    while (len >= 64) {
-	memcpy(ctx->in, buf, 64);
-	byteReverse(ctx->in, 16);
-	MD5Transform(ctx->buf, (uint32 *) ctx->in);
-	buf += 64;
-	len -= 64;
-    }
-
-    /* Handle any remaining bytes of data. */
-
-    memcpy(ctx->in, buf, len);
-}
-
-/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
- * 1 0* (64-bit count of bits processed, MSB-first)
- */
-void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
-{
-    unsigned count;
-    unsigned char *p;
-
-    /* Compute number of bytes mod 64 */
-    count = (ctx->bits[0] >> 3) & 0x3F;
-
-    /* Set the first char of padding to 0x80.  This is safe since there is
-       always at least one byte free */
-    p = ctx->in + count;
-    *p++ = 0x80;
-
-    /* Bytes of padding needed to make 64 bytes */
-    count = 64 - 1 - count;
-
-    /* Pad out to 56 mod 64 */
-    if (count < 8) {
-	/* Two lots of padding:  Pad the first block to 64 bytes */
-	memset(p, 0, count);
-	byteReverse(ctx->in, 16);
-	MD5Transform(ctx->buf, (uint32 *) ctx->in);
-
-	/* Now fill the next block with 56 bytes */
-	memset(ctx->in, 0, 56);
-    } else {
-	/* Pad block to 56 bytes */
-	memset(p, 0, count - 8);
-    }
-    byteReverse(ctx->in, 14);
-
-    /* Append length in bits and transform */
-    ((uint32 *) ctx->in)[14] = ctx->bits[0];
-    ((uint32 *) ctx->in)[15] = ctx->bits[1];
-
-    MD5Transform(ctx->buf, (uint32 *) ctx->in);
-    byteReverse((unsigned char *) ctx->buf, 4);
-    memcpy(digest, ctx->buf, 16);
-    memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
-}
-
-/* The four core functions - F1 is optimized somewhat */
-
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
-	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-
-/*
- * The core of the MD5 algorithm, this alters an existing MD5 hash to
- * reflect the addition of 16 longwords of new data.  MD5Update blocks
- * the data and converts bytes into longwords for this routine.
- */
-void MD5Transform(uint32 buf[4], uint32 const in[16])
-{
-    register uint32 a, b, c, d;
-
-    a = buf[0];
-    b = buf[1];
-    c = buf[2];
-    d = buf[3];
-
-    MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-    MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-    MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-    MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-    MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-    MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-    MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-    MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-    MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-    MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-    MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-    MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-    MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-    MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-    MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-    MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
-    MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-    MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-    MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-    MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-    MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-    MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-    MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-    MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-    MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-    MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-    MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-    MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-    MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-    MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-    MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-    MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
-    MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-    MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-    MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-    MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-    MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-    MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-    MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-    MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-    MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-    MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-    MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-    MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-    MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-    MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-    MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-    MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
-    MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-    MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-    MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-    MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-    MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-    MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-    MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-    MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-    MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-    MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-    MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-    MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-    MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-    MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-    MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-    MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
-    buf[0] += a;
-    buf[1] += b;
-    buf[2] += c;
-    buf[3] += d;
-}
-
-
-
-
-struct rngs {
-   const char *path;
-   int minlength, maxlength;
-} rngs[] = {
-   { "/dev/random",              16,  16 }, /* 16 bytes = 128 bits suffice */
-   { "/proc/interrupts",          0,   0 },
-   { "/proc/slabinfo",            0,   0 },
-   { "/proc/stat",                0,   0 },
-   { "/dev/urandom",             32,  64 },
-};
-#define RNGS (sizeof(rngs)/sizeof(struct rngs))
-
-int Verbose = 0;
-
-/* The basic function to hash a file */
-static off_t
-hash_file(struct MD5Context *ctx, int fd)
-{
-   off_t count = 0;
-   ssize_t r;
-   unsigned char buf[BUFFERSIZE];
-
-   while ((r = read(fd, buf, sizeof(buf))) > 0) {
-      MD5Update(ctx, buf, r);
-      count += r;
-   }
-   /* Separate files with a null byte */
-   buf[0] = 0;
-   MD5Update(ctx, buf, 1);
-   return count;
-}
-
-int main( int argc, char **argv )
-{
-   int               i;
-   struct MD5Context ctx;
-   unsigned char     digest[16];
-   unsigned char     buf[BUFFERSIZE];
-   int               fd;
-   int               c;
-   pid_t             pid;
-   char              *file = NULL;
-   int               r;
-   struct timeval    tv;
-   struct timezone   tz;
-
-   while ((c = getopt( argc, argv, "vf:" )) != -1)
-      switch (c) {
-      case 'v': ++Verbose;     break;
-      case 'f': file = optarg; break;
-      }
-
-   MD5Init( &ctx );
-   
-   gettimeofday( &tv, &tz );
-   MD5Update( &ctx, (unsigned char *)&tv, sizeof( tv ) );
-   pid = getppid();
-   MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid ));
-   pid = getpid();
-   MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid ));
-
-   if (file) {
-      int count = 0;
-      
-      if (file[0] == '-' && !file[1])
-	 fd = fileno(stdin);
-      else
-	 fd = open( file, O_RDONLY );
-
-      if (fd < 0) {
-	 fprintf( stderr, "Could not open %s\n", file );
-      } else {
-         count = hash_file( &ctx, fd );
-	 if (Verbose)
-	    fprintf( stderr, "Got %d bytes from %s\n", count, file );
-
-	 if (file[0] != '-' || file[1]) close( fd );
-      }
-   }
-
-   for (i = 0; i < RNGS; i++) {
-      if ((fd = open( rngs[i].path, O_RDONLY|O_NONBLOCK )) >= 0) {
-	 int count = sizeof(buf);
-
-	 if (rngs[i].maxlength && count > rngs[i].maxlength)
-	    count = rngs[i].maxlength;
-	 r = read( fd, buf, count );
-	 if (r > 0)
-	    MD5Update( &ctx, buf, r );
-	 else
-	    r = 0;
-	 close( fd );
-	 if (Verbose)
-	    fprintf( stderr, "Got %d bytes from %s\n", r, rngs[i].path );
-	 if (rngs[i].minlength && r >= rngs[i].minlength)
-	    break;
-      } else if (Verbose)
-	 fprintf( stderr, "Could not open %s\n", rngs[i].path );
-   }
-
-   MD5Final( digest, &ctx );
-   for (i = 0; i < 16; i++) printf( "%02x", digest[i] );
-   putchar ( '\n' );
-   
-   /*
-    * The following is important for cases like disk full, so shell scripts
-    * can bomb out properly rather than think they succeeded.
-    */
-   if (fflush(stdout) < 0 || fclose(stdout) < 0)
-      return 1;
-
-   return 0;
-}
diff --git a/package/xorg/x11.pc b/package/xorg/x11.pc
deleted file mode 100644
index c086eccc1..000000000
--- a/package/xorg/x11.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-xthreadlib=-lpthread
-
-Name: X11
-Description: X Library
-Version: 1.0.3
-Requires: xproto kbproto
-Requires.private: xau xdmcp
-Cflags: -I${includedir} 
-Libs: -L${libdir} -lX11
-Libs.private: -lpthread
diff --git a/package/xorg/xau.pc b/package/xorg/xau.pc
deleted file mode 100644
index 618581d9d..000000000
--- a/package/xorg/xau.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Xau
-Description: X authorization file management libary
-Version: 1.0.1
-Requires: xproto
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXau
diff --git a/package/xorg/xdmcp.pc b/package/xorg/xdmcp.pc
deleted file mode 100644
index dbdf2ae09..000000000
--- a/package/xorg/xdmcp.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Xdmcp
-Description: X Display Manager Control Protocol library
-Version: 1.0.1
-Requires: xproto
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXdmcp
diff --git a/package/xorg/xext.pc b/package/xorg/xext.pc
deleted file mode 100644
index 8b1799c42..000000000
--- a/package/xorg/xext.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Xext
-Description: Misc X Extension Library
-Version: 1.0.1
-Requires: xextproto
-Requires.private: x11 xau
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXext
diff --git a/package/xorg/xextproto.pc b/package/xorg/xextproto.pc
deleted file mode 100644
index adc0cf498..000000000
--- a/package/xorg/xextproto.pc
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
- 
-Name: XExtProto
-Description: XExt extension headers
-Version: 7.0.2
-Cflags: -I${includedir}
diff --git a/package/xorg/xinerama.pc b/package/xorg/xinerama.pc
deleted file mode 100644
index 8c3af1ab5..000000000
--- a/package/xorg/xinerama.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Xinerama
-Description: The Xinerama Library
-Version: 1.0.1
-Requires: xineramaproto
-Requires.private: x11 xext
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXinerama
diff --git a/package/xorg/xorg-6.8.2-joystick_h.patch b/package/xorg/xorg-6.8.2-joystick_h.patch
deleted file mode 100644
index 10da5189f..000000000
--- a/package/xorg/xorg-6.8.2-joystick_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c.orig	2007-02-13 21:17:02.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c	2007-02-13 21:17:32.000000000 -0800
-@@ -1,5 +1,7 @@
- /* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.1tsi Exp $ */
- 
-+#undef __STRICT_ANSI__
-+
- #include <sys/types.h>
- #include <unistd.h>
- #include <string.h>
diff --git a/package/xorg/xorg-6.8.2-linux_config.patch b/package/xorg/xorg-6.8.2-linux_config.patch
deleted file mode 100644
index 25ab16028..000000000
--- a/package/xorg/xorg-6.8.2-linux_config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xc/extras/drm/shared/drm.h.orig	2004-09-20 22:25:23.042737520 +0200
-+++ xc/extras/drm/shared/drm.h	2004-09-20 22:25:33.282180888 +0200
-@@ -38,7 +38,6 @@
- #define _DRM_H_
- 
- #if defined(__linux__)
--#include <linux/config.h>
- #include <asm/ioctl.h>		/* For _IO* macros */
- #define DRM_IOCTL_NR(n)		_IOC_NR(n)
- #define DRM_IOC_VOID		_IOC_NONE
diff --git a/package/xorg/xorg-6.8.2-xterm.patch b/package/xorg/xorg-6.8.2-xterm.patch
deleted file mode 100644
index 2820b747e..000000000
--- a/package/xorg/xorg-6.8.2-xterm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/programs/xterm/Imakefile.orig	2004-08-13 14:57:19.000000000 +0200
-+++ xc/programs/xterm/Imakefile	2004-09-20 22:04:49.505263720 +0200
-@@ -93,7 +93,7 @@
- #endif
- 
- #ifdef UTF8support
--    UTF8_OPTION = -DOPT_WIDE_CHARS -DOPT_LUIT_PROG
-+    UTF8_OPTION = -DOPT_WIDE_CHARS -DOPT_LUIT_PROG -DOPT_256_COLORS
-         UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
-         UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
- #endif
diff --git a/package/xorg/xorg-config.patch b/package/xorg/xorg-config.patch
deleted file mode 100644
index 389801e1d..000000000
--- a/package/xorg/xorg-config.patch
+++ /dev/null
@@ -1,162 +0,0 @@
---- xc/config/cf/host.def~	Thu May 12 15:28:01 MDT 2005
-+++ xc/config/cf/host.def	Thu May 12 15:28:01 MDT 2005
-@@ -0,0 +1,45 @@
-+#define KDriveXServer		YES
-+#define TinyXServer		YES
-+#define XfbdevServer		YES
-+#define CrossCompiling		YES
-+#define ProjectRoot		/usr/X11R6
-+#define NothingOutsideProjectRoot	YES
-+
-+#define HasFreetype2		YES
-+#define Freetype2Dir		REPLACE_STAGING_DIR
-+#define HasFontconfig		YES
-+#define FontconfigDir		REPLACE_STAGING_DIR
-+#define HasLibpng		YES
-+#define HasZlib		YES
-+#define HaveLib64		NO
-+#define LibDirName		lib
-+#define SystemUsrLibDir	/usr/lib
-+#define TkLibDir		/usr/lib
-+
-+#define HasExpat		YES
-+#define ExpatDir		REPLACE_STAGING_DIR
-+#define XprtServer		NO
-+#define BuildXprintClients	NO
-+#define TouchScreen		NO
-+#define HasTsLib		NO
-+#define BuildDocs		NO
-+#define BuildXF86DRI		NO
-+#define BuildGlxExt		NO
-+#define BuildOSMesaLib		NO
-+#define BuildLBX		NO
-+#define BuildLowMem		NO
-+#define BuildIPv6		NO
-+#define HasPam			NO
-+#define HasPamMisc		NO
-+#define BuildXterm		NO
-+#define BuildXFree86ConfigTools		NO
-+/*
-+#define XF86CardDrivers		mga glint nv tga s3virge sis rendition \
-+				neomagic i740 tdfx savage \
-+				cirrus vmware tseng trident chips apm \
-+				GlideDriver fbdev i128 \
-+				ati AgpGartDrivers DevelDrivers ark \
-+				cyrix siliconmotion vesa vga \
-+				XF86OSCardDrivers XF86ExtraCardDrivers
-+*/
-+
-+#define XInputDrivers		mouse keyboard
---- xc/config/cf/cross.def~	Thu May 12 15:28:01 MDT 2005
-+++ xc/config/cf/cross.def	Thu May 12 15:28:01 MDT 2005
-@@ -1,45 +1,63 @@
--/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
-+/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */
- /*
-  * This file contains redefinitions of some symbols to enable
-  * cross compilation: e.g. paths for include files and paths to
-  * compiler images.  It will have to be edited to reflect these
-  * given your local configuration.
-  */
--#if 0
-+/* Undefine any architectures detected */
- #undef i386Architecture
--#define Arm32Architecture
-+#undef AMD64Architecture
-+#undef PpcArchitecture
-+#undef SparcArchitecture
-+#undef AlphaArchitecture
-+#undef Arm32Architecture
-+#undef ia64Architecture
-+#undef MipsArchitecture
-+
-+/* Cross compiling for: */
-+#define REPLACE_XORG_ARCHArchitecture
-+
-+/* MTRR detection in linux.cf is exec'ed before cross.def, so redo it here */
-+#undef HasMTRRSupport
-+#if defined (i386Architecture) || defined (AMD64Architecture)
-+# define HasMTRRSupport	YES
-+#else
-+# define HasMTRRSupport	NO	/* no for non-ix86 */
-+#endif
- 
- #undef OptimizedCDebugFlags
--#define OptimizedCDebugFlags 	-O2
--#define ServerCDebugFlags	-O2
-+#define OptimizedCDebugFlags 	-Os
-+#define ServerCDebugFlags	-Os
- #undef StandardDefines
--#define StandardDefines 	-Dlinux -D__arm__ -D_POSIX_SOURCE \
-+#define StandardDefines 	-Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \
- 				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
- #undef CcCmd
--#define StdIncDir /skiff/local/arm-linux/include
--#define PreIncDir 
-+#define StdIncDir REPLACE_STAGING_DIR/include
-+#define PreIncDir
- #undef PostIncDir
--#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
--#define CcCmd /skiff/local/bin/arm-linux-gcc
-+#define PostIncDir REPLACE_GCCINC_DIR
-+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc
- #undef CplusplusCmd
--#define HasCplusplus YES
--#define CplusplusCmd /skiff/local/bin/arm-linux-g++
-+#define HasCplusplus NO
-+#define CplusplusCmd NO
- #define DoRanlibCmd YES
--#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
-+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib
- #undef ExtraLoadFlags
- #define ExtraLoadFlags
- #define FbNoPixelAddrCode
- #undef TermcapLibrary
--#define TermcapLibrary -ltermcap
-+#define TermcapLibrary -lncurses
- 
- #undef LdPostLib
--#define LdPostLib	-L/skiff/local/arm-linux/lib
-+#define LdPostLib	-LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib
-+#undef LdCmd
-+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld
- 
- #undef ExtensionOSDefines
- #define ExtensionOSDefines
- 
- #define ServerXdmcpDefines	/**/
- 
- #define HostCcCmd  cc
--#endif
- #include <cross.rules>
---- xc/include/Xfuncs.h.orig	2006-07-07 17:09:16.000000000 -0600
-+++ xc/include/Xfuncs.h	2006-07-07 17:11:33.000000000 -0600
-@@ -44,18 +44,28 @@
- #if defined(SYSV) && !defined(SCO325) && !defined(sun)
- #include <memory.h>
- void bcopy();
-+#ifndef bzero
- #define bzero(b,len) memset(b, 0, len)
-+#endif
-+#ifndef bcmp
- #define bcmp(b1,b2,len) memcmp(b1, b2, len)
-+#endif
- #else
- #include <string.h>
- #if defined(SCO325) || defined(sun)
- #include <strings.h>
- #endif
- #define _XFUNCS_H_INCLUDED_STRING_H
-+#ifndef bcopy
- #define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-+#endif
-+#ifndef bzero
- #define bzero(b,len) memset(b, 0, (size_t)(len))
-+#endif
-+#ifndef bcmp
- #define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
- #endif
-+#endif
- #endif /* X_USEBFUNCS */
- 
- /* the new Xfuncs.h */
diff --git a/package/xorg/xorg-mmx.patch b/package/xorg/xorg-mmx.patch
deleted file mode 100644
index 53219523a..000000000
--- a/package/xorg/xorg-mmx.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xc/programs/Xserver/fb/Imakefile.orig	2006-07-20 11:41:36.000000000 -0600
-+++ xc/programs/Xserver/fb/Imakefile	2006-07-20 11:43:50.000000000 -0600
-@@ -3,16 +3,6 @@
- XCOMM 
- XCOMM Id: Imakefile,v 1.1 1999/11/02 03:54:44 keithp Exp $
- 
--#if defined(i386Architecture) && defined(HasGcc34) && HasGcc34
--MMXOPTIONS= -mmmx -Winline --param inline-unit-growth=10000 \
--	--param large-function-growth=10000 -DUSE_GCC34_MMX
--
--SpecialCObjectRule(fbmmx,fbmmx.c,$(MMXOPTIONS))
--SpecialCObjectRule(fbpict,fbpict.c,$(MMXOPTIONS))
--SpecialCObjectRule(fbfill,fbfill.c,$(MMXOPTIONS))
--
--#endif
--
- #if DoLoadableServer
- #if !BuildModuleInSubdir
- #define IHaveModules
diff --git a/package/xorg/xorg-noxf86cfg.patch b/package/xorg/xorg-noxf86cfg.patch
deleted file mode 100644
index 37828e480..000000000
--- a/package/xorg/xorg-noxf86cfg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xc/programs/Xserver/hw/xfree86/Imakefile.orig	2006-07-20 12:51:58.000000000 -0600
-+++ xc/programs/Xserver/hw/xfree86/Imakefile	2006-07-20 12:52:04.000000000 -0600
-@@ -84,10 +84,6 @@
- DRIVERSDK = sdk
- #endif
- 
--#if !BuildServersOnly || BuildXFree86ConfigTools
--XF86CFGDIRS = xf86cfg xf86config
--#endif
--
- SUBDIRS = os-support common $(I2CDIR) $(XAADIR) $(XF1BPPDIR) $(XF4BPPDIR) \
-           $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
- 	  drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
diff --git a/package/xorg/xorg-uclibc.patch b/package/xorg/xorg-uclibc.patch
deleted file mode 100644
index 23b8b5fc0..000000000
--- a/package/xorg/xorg-uclibc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- xc/programs/xfs/os/config.c.orig	2005-04-26 03:13:52.000000000 -0600
-+++ xc/programs/xfs/os/config.c	2005-04-26 03:14:09.000000000 -0600
-@@ -665,6 +665,8 @@
-     val = config_parse_int (val, &ret, &scan);
-     if (ret == -1)
- 	return val;
-+#ifdef SNFFORMAT
-     SnfSetFormat (bit, byte, glyph, scan);
-+#endif
-     return val;
- }
---- xc/fonts/util/ucs2any.c	2004-03-04 17:46:21.000000000 +0000
-+++ xc/fonts/util/ucs2any.c	2004-09-11 12:49:37.000000000 +0000
-@@ -61,17 +61,6 @@
- /* global variable for argv[0] */
- const char *my_name = NULL;
- 
--#ifdef NEED_BASENAME
--static char *
--basename(char *pathname)
--{
--	char	*ptr;
--
--	ptr = strrchr(pathname, '/');
--	return ((ptr == NULL) ? pathname : &ptr[1]);
--}
--#endif
--
- /* "CLASS" "z" string and memory manipulation */
- 
- static void *
diff --git a/package/xorg/xorg-x11-6.8.2-gcc4-fix.patch b/package/xorg/xorg-x11-6.8.2-gcc4-fix.patch
deleted file mode 100644
index 6062dba7f..000000000
--- a/package/xorg/xorg-x11-6.8.2-gcc4-fix.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- xc/programs/Xserver/fb/fbmmx.c.orig	2005-03-01 19:01:35.401903000 -0500
-+++ xc/programs/Xserver/fb/fbmmx.c	2005-03-01 19:01:39.330305792 -0500
-@@ -29,6 +29,8 @@
- 
- #ifdef RENDER
- 
-+#include <mmintrin.h>
-+
- #include "picturestr.h"
- #include "mipict.h"
- #include "fbpict.h"
-@@ -48,6 +50,10 @@
- #define CHECKPOINT()
- #endif
- 
-+#define mmx_and(a,b)	((Vector1x64)_mm_and_si64((__m64)(a),(__m64)(b)))
-+#define mmx_or(a,b)	((Vector1x64)_mm_or_si64((__m64)(a),(__m64)(b)))
-+#define mmx_xor(a,b)	((Vector1x64)_mm_xor_si64((__m64)(a),(__m64)(b)))
-+
- typedef struct
- {
-     ullong mmx_zero;
-@@ -102,7 +108,7 @@
- static __inline__ Vector4x16
- negate (Vector4x16 mask)
- {
--    return (Vector4x16)__builtin_ia32_pxor (
-+    return (Vector4x16)mmx_xor (
- 	(Vector1x64)mask,
- 	(Vector1x64)c.mmx_4x00ff);
- }
-@@ -163,9 +169,9 @@
- 
-     t1 = shift ((Vector1x64)pixel, -48);
-     t2 = shift (t1, 16);
--    t1 = __builtin_ia32_por (t1, t2);
-+    t1 = mmx_or (t1, t2);
-     t2 = shift (t1, 32);
--    t1 = __builtin_ia32_por (t1, t2);
-+    t1 = mmx_or (t1, t2);
- 
-     return (Vector4x16)t1;
- }
-@@ -178,9 +184,9 @@
-     t1 = shift ((Vector1x64)pixel,  48);
-     t1 = shift (t1, -48);
-     t2 = shift (t1, 16);
--    t1 = __builtin_ia32_por (t1, t2);
-+    t1 = mmx_or (t1, t2);
-     t2 = shift (t1, 32);
--    t1 = __builtin_ia32_por (t1, t2);
-+    t1 = mmx_or (t1, t2);
- 
-     return (Vector4x16)t1;
- }
-@@ -192,15 +198,15 @@
- 
-     x = y = z = (Vector1x64)pixel;
- 
--    x = __builtin_ia32_pand (x, (Vector1x64)c.mmx_ffff0000ffff0000);
--    y = __builtin_ia32_pand (y, (Vector1x64)c.mmx_000000000000ffff);
--    z = __builtin_ia32_pand (z, (Vector1x64)c.mmx_0000ffff00000000);
-+    x = mmx_and (x, (Vector1x64)c.mmx_ffff0000ffff0000);
-+    y = mmx_and (y, (Vector1x64)c.mmx_000000000000ffff);
-+    z = mmx_and (z, (Vector1x64)c.mmx_0000ffff00000000);
- 
-     y = shift (y, 32);
-     z = shift (z, -32);
- 
--    x = __builtin_ia32_por (x, y);
--    x = __builtin_ia32_por (x, z);
-+    x = mmx_or (x, y);
-+    x = mmx_or (x, z);
- 
-     return (Vector4x16)x;
- }
-@@ -234,7 +240,7 @@
- over_rev_non_pre (Vector4x16 src, Vector4x16 dest)
- {
-     Vector4x16 srca = expand_alpha (src);
--    Vector4x16 srcfaaa = (Vector4x16)__builtin_ia32_por((Vector1x64)srca, (Vector1x64)c.mmx_full_alpha);
-+    Vector4x16 srcfaaa = (Vector4x16)mmx_or((Vector1x64)srca, (Vector1x64)c.mmx_full_alpha);
- 
-     return over(pix_multiply(invert_colors(src), srcfaaa), srca, dest);
- }
-@@ -300,9 +306,9 @@
-     Vector1x64 t1 = shift (p, 36 - 11);
-     Vector1x64 t2 = shift (p, 16 - 5);
-     
--    p = __builtin_ia32_por (t1, p);
--    p = __builtin_ia32_por (t2, p);
--    p = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_rgb);
-+    p = mmx_or (t1, p);
-+    p = mmx_or (t2, p);
-+    p = mmx_and (p, (Vector1x64)c.mmx_565_rgb);
-     
-     pixel = __builtin_ia32_pmullw ((Vector4x16)p, (Vector4x16)c.mmx_565_unpack_multiplier);
-     return __builtin_ia32_psrlw (pixel, 8);
-@@ -324,27 +330,27 @@
-     Vector1x64 t = (Vector1x64)target;
-     Vector1x64 r, g, b;
-     
--    r = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_r);
--    g = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_g);
--    b = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_b);
-+    r = mmx_and (p, (Vector1x64)c.mmx_565_r);
-+    g = mmx_and (p, (Vector1x64)c.mmx_565_g);
-+    b = mmx_and (p, (Vector1x64)c.mmx_565_b);
-     
-     r = shift (r, - (32 - 8) + pos * 16);
-     g = shift (g, - (16 - 3) + pos * 16);
-     b = shift (b, - (0  + 3) + pos * 16);
- 
-     if (pos == 0)
--	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_0);
-+	t = mmx_and (t, (Vector1x64)c.mmx_mask_0);
-     else if (pos == 1)
--	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_1);
-+	t = mmx_and (t, (Vector1x64)c.mmx_mask_1);
-     else if (pos == 2)
--	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_2);
-+	t = mmx_and (t, (Vector1x64)c.mmx_mask_2);
-     else if (pos == 3)
--	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_3);
-+	t = mmx_and (t, (Vector1x64)c.mmx_mask_3);
-     
--    p = __builtin_ia32_por (r, t);
--    p = __builtin_ia32_por (g, p);
-+    p = mmx_or (r, t);
-+    p = mmx_or (g, p);
-     
--    return (Vector4x16)__builtin_ia32_por (b, p);
-+    return (Vector4x16)mmx_or (b, p);
- }
- 
- static __inline__ void
---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h.orig	2006-07-07 17:38:25.000000000 -0600
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h	2006-07-07 17:38:34.000000000 -0600
-@@ -146,9 +146,6 @@
- extern Bool                 RADEONProbe
- 			    FunctionPrototype((DriverPtr, int));
- 
--extern SymTabRec            RADEONChipsets[];
--extern PciChipsets          RADEONPciChipsets[];
--
- /* radeon_driver.c */
- extern void                 RADEONLoaderRefSymLists
- 			    FunctionPrototype((void));
diff --git a/package/xorg/xorg.conf b/package/xorg/xorg.conf
deleted file mode 100644
index fecf11ca6..000000000
--- a/package/xorg/xorg.conf
+++ /dev/null
@@ -1,118 +0,0 @@
-# XF86Config-4 (XFree86 server configuration file) generated by dexconf, the
-# Debian X Configuration tool, using values from the debconf database.
-#
-# Edit this file with caution, and see the XF86Config-4 manual page.
-# (Type "man XF86Config-4" at the shell prompt.)
-#
-# If you want your changes to this file preserved by dexconf, only make changes
-# before the "### BEGIN DEBCONF SECTION" line above, and/or after the
-# "### END DEBCONF SECTION" line below.
-#
-# To change things within the debconf section, run the command:
-#   dpkg-reconfigure xserver-xfree86
-# as root.  Also see "How do I add custom sections to a dexconf-generated
-# XF86Config or XF86Config-4 file?" in /usr/share/doc/xfree86-common/FAQ.gz.
-
-Section "Files"
-	FontPath	"/usr/X11R6/lib/X11/fonts/100dpi"
-	FontPath	"/usr/X11R6/lib/X11/fonts/75dpi"
-	FontPath	"/usr/X11R6/lib/X11/fonts/misc"
-EndSection
-
-Section "Module"
-	Load	"bitmap"
-	Load	"dbe"
-	Load	"ddc"
-	Load    "extmod"
-	Load	"freetype"
-	Load	"int10"
-	Load    "vbe"
-EndSection
-
-Section "InputDevice"
-	Identifier     "Generic Keyboard"
-	Driver         "kbd"
-	Option         "CoreKeyboard"
-	Option         "XkbLayout" "en_US"
-EndSection
-
-Section "InputDevice"
-	Identifier	"PS2 Mouse"
-	Driver		"mouse"
-	Option		"SendCoreEvents"	"true"
-	Option		"Device"		"/dev/psaux"
-	Option		"Protocol"		"auto"
-	Option		"ZAxisMapping"		"4 5"
-EndSection
-
-Section "InputDevice"
-	Identifier	"USB Mouse"
-	Driver		"mouse"
-	Option		"CorePointer"
-	Option		"Device"		"/dev/input/mice"
-	Option		"Protocol"		"auto"
-	Option		"ZAxisMapping"		"4 5"
-EndSection
-
-Section "Device"
-	Identifier	"Generic VGA Card"
-	#Driver		"vesa"
-	#Driver		"vga"
-	Driver		"fbdev"
-	Option "UseFBDev" "True"
-EndSection
-
-Section "Monitor"
-	Identifier	"Generic Monitor"
-	#HorizSync	30 - 82
-	#VertRefresh	50 - 85
-	Option		"DPMS"
-EndSection
-
-Section "Screen"
-	Identifier	"Default Screen"
-	Device		"Generic VGA Card"
-	Monitor		"Generic Monitor"
-	#DefaultDepth	8
-	SubSection "Display"
-		Viewport	0 0
-		Depth		4
-		#Modes		"640x480"
-	EndSubSection
-	SubSection "Display"
-		Viewport	0 0
-		Depth		8
-		#Modes		"640x480"
-	EndSubSection
-	SubSection "Display"
-		Viewport	0 0
-		Depth		16
-		#Modes		"640x480"
-	EndSubSection
-	SubSection "Display"
-		Viewport	0 0
-		Depth		24
-		#Modes		"640x480"
-	EndSubSection
-EndSection
-
-Section "ServerFlags"
-	Option		"BlankTime" "10"
-	Option		"StandbyTime" "15"
-	Option		"SuspendTime" "20"
-	Option		"OffTime" "30"
-	Option		"AllowMouseOpenFail" "true"
-EndSection
-
-Section "ServerLayout"
-	Identifier	"Default Layout"
-	Screen		"Default Screen"
-	InputDevice	"Generic Keyboard" "CoreKeyboard"
-	InputDevice	"USB Mouse" "CorePointer"
-	InputDevice	"PS2 Mouse"
-EndSection
-
-Section "DRI"
-	Mode	0666
-EndSection
-
diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
deleted file mode 100644
index ae258989b..000000000
--- a/package/xorg/xorg.mk
+++ /dev/null
@@ -1,228 +0,0 @@
-#############################################################
-#
-# xorg X Window System
-#
-#############################################################
-
-ifneq ($(strip $(BR2_PACKAGE_TINYX)),y)
-ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
-
-XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \
-	xauth/xauth xinit/xinit xsetroot/xsetroot xset/xset \
-	mkfontscale/mkfontscale mkfontdir/mkfontdir \
-	setxkbmap/setxkbmap #xterm/xterm
-
-XORG_LIBS:= Xft Xrender Xaw Xmu Xt Xcursor Xrandr Xi Xinerama Xfixes \
-	SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc fontenc xkbfile
-
-
-#############################################################
-# Stuff below this line shouldn't need changes.
-# if you do change, look in rxvt & matchbox for the impact!
-#############################################################
-#
-# Where resources are found.
-#
-XORG_SOURCE:=X11R6.8.2-src.tar.bz2
-XORG_SITE:=http://xorg.freedesktop.org/X11R6.8.2/src-single/
-XORG_CAT:=$(BZCAT)
-XORG_DIR:=$(BUILD_DIR)/xc
-XORG_LDIR:=$(XORG_DIR)/lib
-XORG_PROGS:=$(XORG_DIR)/programs
-TARGET_BINX:=/usr/X11R6/bin
-TARGET_LIBX:=/usr/X11R6/lib
-XORG_BINX:=$(TARGET_DIR)$(TARGET_BINX)
-XORG_LIBX:=$(TARGET_DIR)$(TARGET_LIBX)
-XORG_CF:=$(XORG_DIR)/config/cf/cross.def
-XORG_HOST_DEF:=$(XORG_DIR)/config/cf/host.def
-
-
-DEJAVU_VERSION=2.14
-DEJAVU_SOURCE=dejavu-ttf-$(DEJAVU_VERSION).tar.bz2
-DEJAVU_CAT:=$(BZCAT)
-DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/dejavu
-DEJAVU_DIR:=$(BUILD_DIR)/dejavu-ttf-$(DEJAVU_VERSION)
-
-# Install Xorg xserver
-XSERVER_BINARY:=Xorg
-XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER_BINARY)
-TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER_BINARY)
-
-# figure out Xorg's idea of corresponding architecture name
-ifeq ($(BR2_alpha),y)
-XARCH=Alpha
-endif
-ifeq ($(BR2_arm),y)
-XARCH=Arm32
-endif
-ifeq ($(BR2_armeb),y)
-XARCH=Arm32
-endif
-ifeq ($(BR2_i386),y)
-XARCH=i386
-endif
-ifeq ($(BR2_mips),y)
-XARCH=Mips
-endif
-ifeq ($(BR2_mipsel),y)
-XARCH=Mips
-endif
-ifeq ($(BR2_powerpc),y)
-XARCH=Ppc
-endif
-ifeq ($(BR2_sparc),y)
-XARCH=Sparc
-endif
-ifeq ($(BR2_x86_64),y)
-XARCH=AMD64
-endif
-
-$(DL_DIR)/$(XORG_SOURCE):
-	$(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE)
-
-$(XORG_DIR)/.unpacked: $(DL_DIR)/$(XORG_SOURCE)
-	$(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ \*.patch
-	touch $(XORG_DIR)/.unpacked
-
-$(XORG_DIR)/.configured: $(XORG_DIR)/.unpacked
-	$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_HOST_DEF)
-	$(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF)
-	$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF)
-	$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF)
-	$(SED) 's:#define StdIncDir.*:#define StdIncDir $(STAGING_DIR)/usr/include:g' $(XORG_CF)
-	$(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(XORG_CF)
-	$(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(XORG_CF)
-	$(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(XORG_CF)
-	$(SED) 's:#.*define.*HasPam.*YES::g' $(XORG_DIR)/config/cf/linux.cf
-	$(SED) 's:#.*define.*CrossCompiling.*NO:#define CrossCompiling YES:g' $(XORG_DIR)/config/cf/Imake.tmpl
-	$(SED) 's:#.*undef.*CrossCompileDir.*:#define CrossCompileDir $(STAGING_DIR)/bin:g' $(XORG_DIR)/config/cf/Imake.tmpl
-	$(SED) 's:REPLACE_XORG_ARCH:$(XARCH):g' $(XORG_DIR)/config/cf/cross.def
-	touch $(XORG_DIR)/.configured
-
-$(XORG_XSERVER): $(XORG_DIR)/.configured
-	rm -f $(TARGET_XSERVER) $(XORG_XSERVER)
-	( cd $(XORG_DIR); $(MAKE) \
-		PKG_CONFIG=$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY) \
-		World XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
-	touch -c $(XORG_XSERVER)
-
-$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
-	mkdir -p $(STAGING_DIR)/usr/X11R6
-	ln -fs ../../include $(STAGING_DIR)/usr/X11R6/include
-	ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX)
-	( cd $(XORG_DIR); $(MAKE) \
-		DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
-	cp package/xorg/x11.pc package/xorg/xext.pc \
-		package/xorg/xproto.pc package/xorg/kbproto.pc \
-		package/xorg/xau.pc package/xorg/xdmcp.pc \
-		package/xorg/xextproto.pc package/xorg/xrandr.pc \
-		package/xorg/xinerama.pc $(STAGING_DIR)/lib/pkgconfig
-	touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
-
-$(TARGET_XSERVER): $(XORG_XSERVER)
-	mkdir -p $(XORG_BINX)
-	for file in $(XORG_APPS); do \
-		cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX); \
-		chmod a+x $(XORG_PROGS)/$$file; \
-		$(STRIPCMD) $(XORG_PROGS)/$$file || /bin/true; \
-	done
-	cp $(XORG_XSERVER) $(TARGET_XSERVER)
-	(cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X)
-	$(STRIPCMD) $(TARGET_XSERVER)
-	mkdir -p $(XORG_LIBX)/modules
-	cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/
-	( cd $(XORG_DIR)/fonts; $(MAKE) \
-		DESTDIR=$(TARGET_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
-	cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14.bdf $(XORG_LIBX)/X11/fonts/misc/
-	cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14-L1.bdf $(XORG_LIBX)/X11/fonts/misc/
-	cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14B.bdf $(XORG_LIBX)/X11/fonts/misc/
-	cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14B-L1.bdf $(XORG_LIBX)/X11/fonts/misc/
-	cp -LRf $(XORG_DIR)/fonts/bdf/misc/cursor.bdf $(XORG_LIBX)/X11/fonts/misc/
-	cp -f package/xorg/fonts.alias $(XORG_LIBX)/X11/fonts/misc/
-	( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir )
-	rm -rf $(XORG_LIBX)/X11/fonts/100dpi
-	rm -rf $(XORG_LIBX)/X11/fonts/75dpi
-	rm -rf $(XORG_LIBX)/X11/fonts/cyrillic
-	rm -rf $(XORG_LIBX)/X11/fonts/local
-	(cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11)
-	cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/xkb $(XORG_LIBX)/X11/
-	mv $(XORG_LIBX)/X11/xkb/xkbcomp $(XORG_BINX)/
-	(cd $(XORG_LIBX)/X11/xkb; ln -s ../../../bin/xkbcomp)
-	rm -rf $(XORG_LIBX)/X11/xkb/compiled
-	(cd $(XORG_LIBX)/X11/xkb; ln -s /tmp compiled)
-	cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/icons $(XORG_LIBX)/X11/
-	-cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/locale $(XORG_LIBX)/X11/
-	cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb.txt $(XORG_LIBX)/X11/
-	cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XKeysymDB $(XORG_LIBX)/X11/
-	cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XErrorDB $(XORG_LIBX)/X11/
-	mkdir -p $(TARGET_DIR)/etc/X11/
-	$(SED) "s,^sysclientrc=.*,sysclientrc=/etc/X11/Xsession,g" $(XORG_BINX)/startx
-	$(SED) "s,^sysserverrc=.*,sysserverrc=/etc/X11/Xserver,g" $(XORG_BINX)/startx
-	cp -LRf package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/
-	cp -LRf package/xorg/Xsession $(TARGET_DIR)/etc/X11/
-	cp -LRf package/xorg/Xserver $(TARGET_DIR)/etc/X11/
-	touch -c $(TARGET_XSERVER)
-
-$(DL_DIR)/$(DEJAVU_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DEJAVU_SITE)/$(DEJAVU_SOURCE)
-
-$(DEJAVU_DIR)/.unpacked: $(DL_DIR)/$(DEJAVU_SOURCE)
-	$(DEJAVU_CAT) $(DL_DIR)/$(DEJAVU_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(DEJAVU_DIR)/.unpacked
-
-$(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked
-	mkdir -p $(XORG_LIBX)/X11/fonts/ttf-dejavu
-	rm -f $(DEJAVU_DIR)/*Condensed*.ttf
-	rm -f $(DEJAVU_DIR)/*ExtraLight*.ttf
-	cp -LRf $(DEJAVU_DIR)/DejaVu*-Bold.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	cp -LRf $(DEJAVU_DIR)/DejaVu*-BoldOblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	cp -LRf $(DEJAVU_DIR)/DejaVu*-Oblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	cp -LRf $(DEJAVU_DIR)/DejaVuSans.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	cp -LRf $(DEJAVU_DIR)/DejaVuSansMono.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	cp -LRf $(DEJAVU_DIR)/DejaVuSerif.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	cp -LRf $(DEJAVU_DIR)/DejaVuSerif.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	cp package/xorg/fonts.cache-1 $(XORG_LIBX)/X11/fonts/ttf-dejavu/
-	( cd $(XORG_LIBX)/X11/fonts/ttf-dejavu/; mkfontdir )
-	touch -c $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf
-
-$(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf
-	mkdir -p $(XORG_LIBX)
-	set -e; for dirs in $(XORG_LIBS); do \
-		file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"`; \
-		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $$file; \
-		cp -f $$file $(XORG_LIBX); \
-		file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"`; \
-		cp -pRf $$file $(XORG_LIBX); \
-	done
-	(cd $(TARGET_DIR)/usr/lib; ln -snf $(TARGET_LIBX) X11)
-	touch $(TARGET_DIR)/etc/ld.so.conf
-	if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ]; then \
-		echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf; \
-	fi
-	touch -c $(XORG_LIBX)/libX11.so.6.2
-
-$(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c
-	$(TARGET_CROSS)gcc -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie
-
-xorg: zlib png pkgconfig expat fontconfig libdrm $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \
-	$(XORG_LIBX)/libX11.so.6.2 $(TARGET_DIR)/usr/bin/mcookie
-
-xorg-source: $(DL_DIR)/$(XORG_SOURCE) $(DL_DIR)/$(DEJAVU_SOURCE)
-
-xorg-clean:
-	-rm -rf $(TARGET_DIR)/usr/X11R6
-	-$(MAKE) -C $(XORG_DIR) clean
-
-xorg-dirclean:
-	-rm -rf $(XORG_DIR)
-	-rm -rf $(TARGET_DIR)/usr/X11R6
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-TARGETS+=xorg
-endif
-endif
diff --git a/package/xorg/xproto.pc b/package/xorg/xproto.pc
deleted file mode 100644
index 25459272c..000000000
--- a/package/xorg/xproto.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-includex11dir=${prefix}/include/X11
- 
-Name: Xproto
-Description: Xproto headers
-Version: 7.0.7
-Cflags: -I${includedir}
diff --git a/package/xorg/xrandr.pc b/package/xorg/xrandr.pc
deleted file mode 100644
index db9809883..000000000
--- a/package/xorg/xrandr.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Xrandr
-Description: X RandR Library
-Version: 1.1.1
-Requires: xproto randrproto >= 1.1
-Requires.private: x11 xext xrender
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXrandr