diff --git a/package/x11/fontconfig/fontconfig.conf b/package/x11/fontconfig/fontconfig.conf
new file mode 100644
index 000000000..a4287568f
--- /dev/null
+++ b/package/x11/fontconfig/fontconfig.conf
@@ -0,0 +1,7 @@
+fontconfig_postmake ()
+{
+ echo "Copying default example configs ..."
+ cp -fv $confdir/local.conf.data $root/etc/fonts/local.conf
+}
+
+hook_add postmake 5 fontconfig_postmake
diff --git a/package/x11/fontconfig/local.conf.data b/package/x11/fontconfig/local.conf.data
new file mode 100644
index 000000000..c47c4a306
--- /dev/null
+++ b/package/x11/fontconfig/local.conf.data
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+ /usr/X11R7/lib/X11/fonts
+
+
+
+
+
+ Helvetica
+
+
+ Arial
+
+
+
+
+
+ Lucida
+
+
+ Arial
+
+
+
+
+
+ Fixed
+
+
+ Andale Mono
+
+
+
+
+
+ Charter
+
+
+ Agate
+
+
+
+
+
+ Clean
+
+
+ Andale Mono
+
+
+
+
+
+ Times
+
+
+ Times New Roman
+
+
+
+
+
diff --git a/package/xorg/font-adobe-100dpi/font-adobe-100dpi.desc b/package/xorg/font-adobe-100dpi/font-adobe-100dpi.desc
index 718b3fd0e..be9be4829 100644
--- a/package/xorg/font-adobe-100dpi/font-adobe-100dpi.desc
+++ b/package/xorg/font-adobe-100dpi/font-adobe-100dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-adobe-75dpi/font-adobe-75dpi.desc b/package/xorg/font-adobe-75dpi/font-adobe-75dpi.desc
index cc87605b9..3e83c7a1d 100644
--- a/package/xorg/font-adobe-75dpi/font-adobe-75dpi.desc
+++ b/package/xorg/font-adobe-75dpi/font-adobe-75dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.desc b/package/xorg/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.desc
index bd074970a..05d8de8f0 100644
--- a/package/xorg/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.desc
+++ b/package/xorg/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.desc b/package/xorg/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.desc
index 541976fd4..3ebf55cd2 100644
--- a/package/xorg/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.desc
+++ b/package/xorg/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-adobe-utopia-type1/font-adobe-utopia-type1.desc b/package/xorg/font-adobe-utopia-type1/font-adobe-utopia-type1.desc
index fe75c77a4..baa3f78ba 100644
--- a/package/xorg/font-adobe-utopia-type1/font-adobe-utopia-type1.desc
+++ b/package/xorg/font-adobe-utopia-type1/font-adobe-utopia-type1.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-arabic-misc/font-arabic-misc.desc b/package/xorg/font-arabic-misc/font-arabic-misc.desc
index 97aacece3..143441f33 100644
--- a/package/xorg/font-arabic-misc/font-arabic-misc.desc
+++ b/package/xorg/font-arabic-misc/font-arabic-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bh-100dpi/font-bh-100dpi.desc b/package/xorg/font-bh-100dpi/font-bh-100dpi.desc
index e37e637ea..609901632 100644
--- a/package/xorg/font-bh-100dpi/font-bh-100dpi.desc
+++ b/package/xorg/font-bh-100dpi/font-bh-100dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bh-75dpi/font-bh-75dpi.desc b/package/xorg/font-bh-75dpi/font-bh-75dpi.desc
index a2f3aa00c..b38ebeecf 100644
--- a/package/xorg/font-bh-75dpi/font-bh-75dpi.desc
+++ b/package/xorg/font-bh-75dpi/font-bh-75dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.desc b/package/xorg/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.desc
index 320f46031..900871f83 100644
--- a/package/xorg/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.desc
+++ b/package/xorg/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.desc b/package/xorg/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.desc
index 214422828..9a80169c1 100644
--- a/package/xorg/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.desc
+++ b/package/xorg/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bh-ttf/font-bh-ttf.desc b/package/xorg/font-bh-ttf/font-bh-ttf.desc
index 8b12edf69..c29551e01 100644
--- a/package/xorg/font-bh-ttf/font-bh-ttf.desc
+++ b/package/xorg/font-bh-ttf/font-bh-ttf.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bh-type1/font-bh-type1.desc b/package/xorg/font-bh-type1/font-bh-type1.desc
index 4630cd5ee..16d324cb8 100644
--- a/package/xorg/font-bh-type1/font-bh-type1.desc
+++ b/package/xorg/font-bh-type1/font-bh-type1.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bitstream-100dpi/font-bitstream-100dpi.desc b/package/xorg/font-bitstream-100dpi/font-bitstream-100dpi.desc
index e3fe9cb4b..9348582d3 100644
--- a/package/xorg/font-bitstream-100dpi/font-bitstream-100dpi.desc
+++ b/package/xorg/font-bitstream-100dpi/font-bitstream-100dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bitstream-75dpi/font-bitstream-75dpi.desc b/package/xorg/font-bitstream-75dpi/font-bitstream-75dpi.desc
index 469af9d0f..d7438b81f 100644
--- a/package/xorg/font-bitstream-75dpi/font-bitstream-75dpi.desc
+++ b/package/xorg/font-bitstream-75dpi/font-bitstream-75dpi.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bitstream-speedo/font-bitstream-speedo.desc b/package/xorg/font-bitstream-speedo/font-bitstream-speedo.desc
index 4bdaf99af..4f743795a 100644
--- a/package/xorg/font-bitstream-speedo/font-bitstream-speedo.desc
+++ b/package/xorg/font-bitstream-speedo/font-bitstream-speedo.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-bitstream-type1/font-bitstream-type1.desc b/package/xorg/font-bitstream-type1/font-bitstream-type1.desc
index 3c8bfd2cc..0e9828b65 100644
--- a/package/xorg/font-bitstream-type1/font-bitstream-type1.desc
+++ b/package/xorg/font-bitstream-type1/font-bitstream-type1.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc b/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc
index 856b6a638..d45327522 100644
--- a/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc
+++ b/package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-cursor-misc/font-cursor-misc.desc b/package/xorg/font-cursor-misc/font-cursor-misc.desc
index 1ba6665b5..016a14f05 100644
--- a/package/xorg/font-cursor-misc/font-cursor-misc.desc
+++ b/package/xorg/font-cursor-misc/font-cursor-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-daewoo-misc/font-daewoo-misc.desc b/package/xorg/font-daewoo-misc/font-daewoo-misc.desc
index 0e8429edd..97513ecaa 100644
--- a/package/xorg/font-daewoo-misc/font-daewoo-misc.desc
+++ b/package/xorg/font-daewoo-misc/font-daewoo-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-dec-misc/font-dec-misc.desc b/package/xorg/font-dec-misc/font-dec-misc.desc
index 098958017..8e7f2795d 100644
--- a/package/xorg/font-dec-misc/font-dec-misc.desc
+++ b/package/xorg/font-dec-misc/font-dec-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-ibm-type1/font-ibm-type1.desc b/package/xorg/font-ibm-type1/font-ibm-type1.desc
index 2c63939f5..4f6a122ca 100644
--- a/package/xorg/font-ibm-type1/font-ibm-type1.desc
+++ b/package/xorg/font-ibm-type1/font-ibm-type1.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-isas-misc/font-isas-misc.desc b/package/xorg/font-isas-misc/font-isas-misc.desc
index 40f41a312..0d1d07480 100644
--- a/package/xorg/font-isas-misc/font-isas-misc.desc
+++ b/package/xorg/font-isas-misc/font-isas-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-jis-misc/font-jis-misc.desc b/package/xorg/font-jis-misc/font-jis-misc.desc
index bbd3eeb8f..859799a7c 100644
--- a/package/xorg/font-jis-misc/font-jis-misc.desc
+++ b/package/xorg/font-jis-misc/font-jis-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-micro-misc/font-micro-misc.desc b/package/xorg/font-micro-misc/font-micro-misc.desc
index a56d1efac..7800656f9 100644
--- a/package/xorg/font-micro-misc/font-micro-misc.desc
+++ b/package/xorg/font-micro-misc/font-micro-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc b/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc
index f9f8e1b15..f341aa4a5 100644
--- a/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc
+++ b/package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc b/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc
index 8cfe8de3e..e026d3884 100644
--- a/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc
+++ b/package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-misc-meltho/font-misc-meltho.desc b/package/xorg/font-misc-meltho/font-misc-meltho.desc
index 667417cb2..95907dd25 100644
--- a/package/xorg/font-misc-meltho/font-misc-meltho.desc
+++ b/package/xorg/font-misc-meltho/font-misc-meltho.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-misc-misc/font-misc-misc.desc b/package/xorg/font-misc-misc/font-misc-misc.desc
index b8055b656..8245857ec 100644
--- a/package/xorg/font-misc-misc/font-misc-misc.desc
+++ b/package/xorg/font-misc-misc/font-misc-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-mutt-misc/font-mutt-misc.desc b/package/xorg/font-mutt-misc/font-mutt-misc.desc
index 112273bef..3836be18d 100644
--- a/package/xorg/font-mutt-misc/font-mutt-misc.desc
+++ b/package/xorg/font-mutt-misc/font-mutt-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-schumacher-misc/font-schumacher-misc.desc b/package/xorg/font-schumacher-misc/font-schumacher-misc.desc
index c36191822..f9967078f 100644
--- a/package/xorg/font-schumacher-misc/font-schumacher-misc.desc
+++ b/package/xorg/font-schumacher-misc/font-schumacher-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc b/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc
index c48c939bf..5d668bdd7 100644
--- a/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc
+++ b/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-sony-misc/font-sony-misc.desc b/package/xorg/font-sony-misc/font-sony-misc.desc
index c2f97e08d..3081f1712 100644
--- a/package/xorg/font-sony-misc/font-sony-misc.desc
+++ b/package/xorg/font-sony-misc/font-sony-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-sun-misc/font-sun-misc.desc b/package/xorg/font-sun-misc/font-sun-misc.desc
index b893bccd0..2107f4312 100644
--- a/package/xorg/font-sun-misc/font-sun-misc.desc
+++ b/package/xorg/font-sun-misc/font-sun-misc.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc b/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc
index 60f6fa006..018b730f7 100644
--- a/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc
+++ b/package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/font-xfree86-type1/font-xfree86-type1.desc b/package/xorg/font-xfree86-type1/font-xfree86-type1.desc
index 659638eeb..b10daa191 100644
--- a/package/xorg/font-xfree86-type1/font-xfree86-type1.desc
+++ b/package/xorg/font-xfree86-type1/font-xfree86-type1.desc
@@ -31,7 +31,7 @@
[A] The Open Group X Project Team {Original Sourcecode}
[M] The ROCK Linux Project
-[C] base/x11
+[C] base/x11 extra/font
[F] CORE
[L] OpenSource
diff --git a/package/xorg/twm/twm.conf b/package/xorg/twm/twm.conf
index 85e50a316..3af4b82aa 100644
--- a/package/xorg/twm/twm.conf
+++ b/package/xorg/twm/twm.conf
@@ -1 +1,13 @@
. "$base/package/xorg/xorg_config.sh"
+
+twm_postmake ()
+{
+ echo "Copy TWM config files ..."
+ cp -v src/system.twmrc sample-twmrc/original.twmrc
+ mkdir -p $root/usr/X11R7/lib/X11/twm/
+ cp -v sample-twmrc/*.twmrc $root/usr/X11R7/lib/X11/twm/
+
+ register_wm twm TWM /usr/X11/bin/twm
+}
+
+hook_add postmake 5 twm_postmake
diff --git a/package/xorg/util-macros/util-macros.conf b/package/xorg/util-macros/util-macros.conf
index 8b4d815fe..b436641aa 100644
--- a/package/xorg/util-macros/util-macros.conf
+++ b/package/xorg/util-macros/util-macros.conf
@@ -4,10 +4,23 @@ hook_add premake 5 xorg_premake
xorg_premake ()
{
- mkdir -p $root/usr/X11R7
- ln -svf X11R7 $root/usr/X11
+# mkdir -p $root/usr/X11R7
+
+ if [ "$arch_sizeof_char_p" = 8 ] ; then
+# mkdir -p $root/usr/X11R7/lib
+ ln -s lib $root/usr/X11R7/lib64
+ fi
+
+ rm -fv $root/usr/X11
+ rm -fv $root/usr/bin/X11
+ rm -fv $root/usr/lib/X11
+ rm -fv $root/usr/include/X11
+
+ ln -sv X11R7 $root/usr/X11
+ ln -sv ../X11/bin $root/usr/bin/X11
+ ln -sv ../X11/lib/X11 $root/usr/lib/X11
+ ln -sv ../X11/include/X11 $root/usr/include/X11
+
# for Mesa3D
- ln -svf X11R7 $root/usr/X11R6
- # for gtk+ et al.
- ln -svf ../X11/include/X11 $root/usr/include/X11
+ ln -sv X11R7 $root/usr/X11R6
}
diff --git a/package/xorg/xdm/xdm.conf b/package/xorg/xdm/xdm.conf
index 85e50a316..71e6830a4 100644
--- a/package/xorg/xdm/xdm.conf
+++ b/package/xorg/xdm/xdm.conf
@@ -1 +1,3 @@
. "$base/package/xorg/xorg_config.sh"
+
+hook_add postmake 5 "register_xdm xdm 'X11 display manager' /usr/X11R7/bin/xdm"
diff --git a/package/xorg/xfs/xfs.conf b/package/xorg/xfs/xfs.conf
index 85e50a316..85c5b7ed3 100644
--- a/package/xorg/xfs/xfs.conf
+++ b/package/xorg/xfs/xfs.conf
@@ -1 +1,9 @@
. "$base/package/xorg/xorg_config.sh"
+
+xfs_postmake ()
+{
+ echo "Installing xfs init script ..."
+ install_init xfs $confdir/xfs.init
+}
+
+hook_add postmake 5 xfs_postmake
diff --git a/package/xorg/xfs/xfs.init b/package/xorg/xfs/xfs.init
new file mode 100644
index 000000000..d241f554a
--- /dev/null
+++ b/package/xorg/xfs/xfs.init
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x11/xorg/xfs.init
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+#
+# ROCK Linux: /etc/rc.d/init.d/xfs
+#
+# Desc: X Font Server
+# Runlevel: 80 rcX
+#
+
+main_begin
+
+ block_begin(start, `Starting xfs.')
+ check(`/usr/X11/bin/xfs -daemon')
+ block_end
+
+ block_begin(stop, `Stopping xfs')
+ check(`killall -15 /usr/X11/bin/xfs')
+ block_end
+
+main_end
+
diff --git a/package/xorg/xkbcomp/xkbcomp.conf b/package/xorg/xkbcomp/xkbcomp.conf
index 85e50a316..e5c34d727 100644
--- a/package/xorg/xkbcomp/xkbcomp.conf
+++ b/package/xorg/xkbcomp/xkbcomp.conf
@@ -1 +1,10 @@
. "$base/package/xorg/xorg_config.sh"
+
+# xkbcomp_postmake ()
+# {
+# echo "Fixing compiled keymaps directory ..."
+# mkdir -p $root/var/lib/xkb
+# cp -fu programs/xkbcomp/compiled/README $root/var/lib/xkb
+# }
+#
+# hook_add postmake 5 xkbcomp_postmake
diff --git a/package/xorg/xorg-server/config.hlp b/package/xorg/xorg-server/config.hlp
new file mode 100644
index 000000000..bcfa978de
--- /dev/null
+++ b/package/xorg/xorg-server/config.hlp
@@ -0,0 +1,29 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x11/xorg/config.hlp
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+MENU_PKG_XORG
+ Here you'll find options for X.Org.
+
+ROCKCFG_PKG_XFREE86_XINERAMA
+ This options enables support for Xinerama globally - so many packages
+ are build with special multi-head support.
+
diff --git a/package/xorg/xorg-server/config.in b/package/xorg/xorg-server/config.in
new file mode 100644
index 000000000..796c55bb0
--- /dev/null
+++ b/package/xorg/xorg-server/config.in
@@ -0,0 +1,61 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x11/xorg/config.in
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if pkgcheck xfree86 X || pkgcheck xorg-server X
+then
+ menu_begin MENU_PKG_XORG 'X.Org / XFree86 Options'
+
+ if pkgcheck xfree86 X && pkgcheck xorg-server X
+ then
+ bool 'Build X.Org (instead of Xfree86)' \
+ ROCKCFG_PKG_XORG_BUILD 1
+
+ if [ $ROCKCFG_PKG_XORG_BUILD = 1 ] ; then
+ pkgremove xfree86
+ else
+ pkgremove xorg
+ fi
+ else
+ if pkgcheck xfree86 X; then
+ comment 'Using XFree86 (xorg already disabled)'
+ fi
+ if pkgcheck xorg X; then
+ comment 'Using X.Org (xfree86 already disabled)'
+ fi
+ fi
+
+ bool 'Enable Xinerama support globally' \
+ ROCKCFG_PKG_XORG_XINERAMA 1
+ menu_end
+fi
+
+if ! pkgcheck xfree86 X; then
+ pkgremove xfree86
+ pkgremove xfree86-cyrillic-fonts
+ pkgremove xfree86-doc
+fi
+
+if ! pkgcheck xorg-server X; then
+ pkgremove libdrm
+ pkgremove fontconfig
+fi
+
diff --git a/package/xorg/xorg-server/parse-config b/package/xorg/xorg-server/parse-config
new file mode 100644
index 000000000..3ab91d29b
--- /dev/null
+++ b/package/xorg/xorg-server/parse-config
@@ -0,0 +1,33 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x11/xorg/parse-config
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if [ "$ROCKCFG_PKG_XORG_XINERAMA" = 1 ] ; then
+ var_append confopt " " "--with-xinerama"
+fi
+
+if [ "$stagelevel" -gt 1 -a -d "/usr/X11/bin" ]; then
+ # ouch! some packages seam to be using
+ # this variables in ./configure
+ export XBINDIR=/usr/X11/bin
+ export XLIBDIR=/usr/X11/lib
+fi
+
diff --git a/package/xorg/xorg-server/startxdm.sh b/package/xorg/xorg-server/startxdm.sh
new file mode 100644
index 000000000..7e546dead
--- /dev/null
+++ b/package/xorg/xorg-server/startxdm.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+XDM=/usr/X11/bin/xdm
+
+[ -e /etc/conf/xdm ] && . /etc/conf/xdm
+
+[ "$1" = "-nodaemon" ] && case $XDM in
+ *gdm*|*kdm*|*xdm*) ;;
+ *) shift ;;
+esac
+
+$XDM "$@"
+
diff --git a/package/xorg/xorg-server/stone_mod_xorg.sh b/package/xorg/xorg-server/stone_mod_xorg.sh
new file mode 100644
index 000000000..3ff91a395
--- /dev/null
+++ b/package/xorg/xorg-server/stone_mod_xorg.sh
@@ -0,0 +1,99 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x11/xorg/stone_mod_xorg.sh
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+#
+# [MAIN] 50 xorg X11/X.Org (Graphical User Interface)
+
+set_wm() {
+ echo "export WINDOWMANAGER=\"$1\"" > /etc/profile.d/windowmanager
+}
+
+set_xdm() {
+ echo "export XDM=\"$1\"" > /etc/conf/xdm
+}
+
+main() {
+ while
+ WINDOWMANAGER=""
+ if [ -f /etc/profile.d/windowmanager ]; then
+ . /etc/profile.d/windowmanager
+ fi
+
+ XDM=""
+ if [ -f /etc/conf/xdm ]; then
+ . /etc/conf/xdm
+ fi
+
+ cmd="gui_menu xorg 'X.Org Configuration Menu'
+
+ 'Run xorgcfg (recommended, new interactive config)'
+ 'gui_cmd xorgcfg xorgcfg -config /etc/X11/xorg.conf'
+
+ 'Run X -configure (automated config)'
+ 'gui_cmd Xorg Xorg -configure ; mv /root/xorg.conf.new /etc/X11/xorg.conf'
+
+ 'Run xorgconfig (old textual config)'
+ 'gui_cmd xorgconfig xorgconfig'"
+
+ cmd="$cmd '' ''"
+
+ for x in /usr/share/rock-registry/xdm/* ; do
+ if [ -f $x ] ; then
+ . $x
+
+ if [ "$XDM" = "$exec" ]; then
+ pre='[*]' ; else
+ pre='[ ]' ; fi
+
+ cmd="$cmd
+ '$pre Use $name in runlevel 5'
+ 'set_xdm \"$exec\"'"
+ fi
+ done
+
+ cmd="$cmd '' ''"
+
+ for x in /usr/share/rock-registry/wm/* ; do
+ if [ -f $x ] ; then
+ . $x
+
+ if [ "$WINDOWMANAGER" = "$exec" ]; then
+ pre='[*]' ; else
+ pre='[ ]' ; fi
+
+ cmd="$cmd
+ '$pre Use $name as default Windowmanager'
+ 'set_wm \"$exec\"'"
+ fi
+ done
+
+ cmd="$cmd '' ''"
+
+ cmd="$cmd
+ 'Edit/View /etc/X11/xorg.conf'
+ 'gui_edit xorg.conf /etc/X11/xorg.conf'
+ 'Edit/View /etc/profile.d/windowmanager'
+ 'gui_edit WINDOWMANAGER /etc/profile.d/windowmanager'"
+
+ eval $cmd
+ do : ; done
+}
+
diff --git a/package/xorg/xorg-server/xorg-server.conf b/package/xorg/xorg-server/xorg-server.conf
index 4cc9d983c..8c224a38b 100644
--- a/package/xorg/xorg-server/xorg-server.conf
+++ b/package/xorg/xorg-server/xorg-server.conf
@@ -1,5 +1,28 @@
. "$base/package/xorg/xorg_config.sh"
-hook_add preconf 5 "tar $taropt $archdir/MesaLib-$mesa_ver.tar.bz2 ; dirs ; ls -l"
+xorg_server_postmake ()
+{
+ echo "Create /etc/X11 (if it's not already there) ..."
+ mkdir -p $root/etc/X11
+
+ echo "Copying default example configs ..."
+ cp $confdir/xorg.conf.data $root/etc/X11/xorg.conf.example
+ cp -fv $root/etc/X11/xorg.conf{.example,}
+
+ echo "Installing X-Windows Setup Script ..."
+ cp -fv $confdir/stone_mod_xorg.sh $root/etc/stone.d/mod_xorg.sh
+ echo "export WINDOWMANAGER=kde" > $root/etc/profile.d/windowmanager
+
+ echo "Installing the xdm start script (multiplexer) ..."
+ cp $confdir/startxdm.sh $root/usr/X11R7/bin/startxdm
+ chmod +x $root/usr/X11R7/bin/startxdm
+
+ echo "Installing X-Windows Cron Script ..."
+ cp -fv $confdir/xorg.cron $root/etc/cron.daily/80-xorg
+ chmod +x $root/etc/cron.daily/80-xorg
+}
+
+hook_add preconf 5 "tar $taropt $archdir/MesaLib-$mesa_ver.tar.bz2"
+hook_add postmake 5 xorg_server_postmake
var_append extraconfopt " " '--with-mesa-source=`dirs`/Mesa-$mesa_ver'
diff --git a/package/xorg/xorg-server/xorg-server.desc b/package/xorg/xorg-server/xorg-server.desc
index 5525a718a..343640416 100644
--- a/package/xorg/xorg-server/xorg-server.desc
+++ b/package/xorg/xorg-server/xorg-server.desc
@@ -41,4 +41,4 @@
[P] X -----5---9 110.832
[D] 3473516090 xorg-server-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/xserver
-[D] 0 MesaLib-6.5.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/mesa3d/
+[D] 3434560735 MesaLib-6.5.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/mesa3d/
diff --git a/package/xorg/xorg-server/xorg.conf.data b/package/xorg/xorg-server/xorg.conf.data
new file mode 100644
index 000000000..534693142
--- /dev/null
+++ b/package/xorg/xorg-server/xorg.conf.data
@@ -0,0 +1,595 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x11/xorg/xorg.conf.data
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+# File generated by xf86config.
+# and additional hand edited by Rene Rebe - ROCK Linux Project
+#
+# YOU MUST ONLY ADD A CARD SECTION AND MODIFY SOME MONITOR SETTINGS
+# TO GET A WORKING X CONFIGURATION.
+#
+
+#
+# Copyright (c) 1999 by The XFree86 Project, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# Except as contained in this notice, the name of the XFree86 Project shall
+# not be used in advertising or otherwise to promote the sale, use or other
+# dealings in this Software without prior written authorization from the
+# XFree86 Project.
+#
+
+# **********************************************************************
+# Refer to the XF86Config(4/5) man page for details about the format of
+# this file.
+# **********************************************************************
+
+# **********************************************************************
+# Module section -- this section is used to specify
+# which dynamically loadable modules to load.
+# **********************************************************************
+#
+Section "Module"
+
+ Load "dbe" # DBE (double buffer extension)
+ Load "ddc" # Display Data Channel extension
+
+# This loads the miscellaneous extensions module
+ SubSection "extmod"
+ # Option "omit xfree86-dga" # don't initialise the DGA extension
+ # Option "omit XFree86-VidModeExtension" # disable mode-switching-supoprt
+ EndSubSection
+
+# This loads the Type1 and FreeType font modules
+ Load "type1"
+ Load "freetype"
+
+# Load "glx" # GLX extension (OpenGL visuals)
+# Load "dri" # Direct Rendering Interface extension (OpenGL)
+
+# Load "v4l" # Video 4 Linux extension (provides a xv adapter)
+EndSection
+
+# this enabled normal users to use DRI - the Direct Rendering Extension.
+# it is also possible to use a group to control access.
+#
+Section "DRI"
+ Mode 0666
+EndSection
+
+# **********************************************************************
+# Files section. This allows default font and rgb paths to be set
+# **********************************************************************
+
+Section "Files"
+
+# The location of the RGB database. Note, this is the name of the
+# file minus the extension (like ".txt" or ".db"). There is normally
+# no need to change the default.
+
+ RgbPath "/usr/X11R7/share/X11/rgb"
+
+# Multiple FontPath entries are allowed (which are concatenated together),
+# as well as specifying multiple comma-separated entries in one FontPath
+# command (or a combination of both methods)
+#
+# If you don't have a floating point coprocessor and emacs, Mosaic or other
+# programs take long to start up, try moving the Type1 and Speedo directory
+# to the end of this list (or comment them out).
+#
+
+ FontPath "/usr/X11R7/lib/X11/fonts/75dpi/:unscaled"
+ FontPath "/usr/X11R7/lib/X11/fonts/100dpi/:unscaled"
+ FontPath "/usr/X11R7/lib/X11/fonts/CID/"
+ FontPath "/usr/X11R7/lib/X11/fonts/PEX/"
+ FontPath "/usr/X11R7/lib/X11/fonts/Speedo/"
+ FontPath "/usr/X11R7/lib/X11/fonts/Type1/"
+ FontPath "/usr/X11R7/lib/X11/fonts/cyrillic/"
+ FontPath "/usr/X11R7/lib/X11/fonts/encodings/"
+ FontPath "/usr/X11R7/lib/X11/fonts/freefont/"
+ FontPath "/usr/X11R7/lib/X11/fonts/latin2/"
+ FontPath "/usr/X11R7/lib/X11/fonts/local/"
+ FontPath "/usr/X11R7/lib/X11/fonts/misc/"
+ FontPath "/usr/X11R7/lib/X11/fonts/sharefont"
+ FontPath "/usr/X11R7/lib/X11/fonts/TrueType"
+
+ FontPath "/usr/share/ghostscript/fonts/"
+
+# The module search path. The default path is shown here.
+
+# ModulePath "/usr/X11R7/lib/xorg/modules"
+
+EndSection
+
+# **********************************************************************
+# Server flags section.
+# **********************************************************************
+
+Section "ServerFlags"
+
+# Uncomment this to cause a core dump at the spot where a signal is
+# received. This may leave the console in an unusable state, but may
+# provide a better stack trace in the core dump to aid in debugging
+
+# Option "NoTrapSignals"
+
+# Uncomment this to disable the server abort sequence
+# This allows clients to receive this key event.
+
+# Option "DontZap"
+
+# Uncomment this to disable the / mode switching
+# sequences. This allows clients to receive these key events.
+
+# Option "Dont Zoom"
+
+# Uncomment this to disable tuning with the xvidtune client. With
+# it the client can still run and fetch card and monitor attributes,
+# but it will not be allowed to change them. If it tries it will
+# receive a protocol error.
+
+# Option "DisableVidModeExtension"
+
+# Uncomment this to enable the use of a non-local xvidtune client.
+
+# Option "AllowNonLocalXvidtune"
+
+# Uncomment this to disable dynamically modifying the input device
+# (mouse and keyboard) settings.
+
+# Option "DisableModInDev"
+
+# Uncomment this to enable the use of a non-local client to
+# change the keyboard or mouse settings (currently only xset).
+
+# Option "AllowNonLocalModInDev"
+
+EndSection
+
+# **********************************************************************
+# Input devices
+# **********************************************************************
+
+# **********************************************************************
+# Core keyboard's InputDevice section
+# **********************************************************************
+
+Section "InputDevice"
+
+ Identifier "Keyboard1"
+ Driver "kbd"
+
+# For most OSs the protocol can be omitted (it defaults to "Standard").
+# When using XQUEUE (only for SVR3 and SVR4, but not Solaris),
+# uncomment the following line.
+
+# Option "Protocol" "Xqueue"
+
+ Option "AutoRepeat" "250 30"
+
+# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
+# Option "Xleds" "1 2 3"
+
+# Option "LeftAlt" "Meta"
+# Option "RightAlt" "ModeShift"
+
+# To customise the XKB settings to suit your keyboard, modify the
+# lines below (which are the defaults). For example, for a non-U.S.
+# keyboard, you will probably want to use:
+# Option "XkbModel" "pc102"
+# If you have a US Microsoft Natural keyboard, you can use:
+# Option "XkbModel" "microsoft"
+#
+# Then to change the language, change the Layout setting.
+# For example, a german layout can be obtained with:
+# Option "XkbLayout" "de"
+# or:
+# Option "XkbLayout" "de"
+# Option "XkbVariant" "nodeadkeys"
+#
+# If you'd like to switch the positions of your capslock and
+# control keys, use:
+# Option "XkbOptions" "ctrl:swapcaps"
+
+# These are the default XKB settings for XFree86
+# Option "XkbRules" "xfree86"
+# Option "XkbModel" "pc101"
+# Option "XkbLayout" "us"
+# Option "XkbVariant" ""
+# Option "XkbOptions" ""
+
+# Option "XkbDisable"
+
+ Option "XkbRules" "xfree86"
+ Option "XkbModel" "pc105"
+# Option "XkbLayout" "de" # german keyboard layout
+# Option "XkbVariant" "nodeadkeys" # normally not wanted
+
+EndSection
+
+
+# **********************************************************************
+# Core Pointer's InputDevice section
+# **********************************************************************
+
+# auto-detected mouse
+Section "InputDevice"
+
+# Identifier and driver
+
+ Identifier "Mouse1"
+ Driver "mouse"
+ Option "Protocol" "ImPS/2"
+ Option "Device" "/dev/input/mice"
+ Option "ZaxisMapping" "4 5"
+
+ #Option "Emulate3Buttons" "true" # for a two button touch-pad
+EndSection
+
+# for a normal ps2 mouse:
+#Section "InputDevice"
+#
+# Identifier and driver
+#
+# Identifier "Mouse1"
+# Driver "mouse"
+# Option "Protocol" "PS/2"
+# Option "Device" "/dev/misc/psaux"
+#
+# #Option "Emulate3Buttons" "true" # for a two button touch-pad
+#EndSection
+
+# for a normal serial mouse
+#Section "InputDevice"
+#
+# Identifier "Mouse1"
+# Driver "mouse"
+# Option "Protocol" "Microsoft"
+# Option "Device" "/dev/tts/0"
+#
+# #Option "Emulate3Buttons" "true" # for a two button touch-pad
+#EndSection
+
+# for a usb Logitech wheel mouse
+#Section "InputDevice"
+#
+# Identifier "Mouse1"
+# Driver "mouse"
+# Option "Protocol" "IMPS/2"
+# Option "Device" "/dev/input/mouse0"
+# Option "Buttons" "5"
+# Option "ZaxisMapping" "4 5"
+#
+#EndSection
+
+
+# **********************************************************************
+# Other input device sections
+# this is optional and is required only if you
+# are using extended input devices. This is for example only. Refer
+# to the XF86Config man page for a description of the options.
+# **********************************************************************
+#
+# Section "InputDevice"
+# Identifier "Mouse2"
+# Driver "mouse"
+# Option "Protocol" "MouseMan"
+# Option "Device" "/dev/mouse2"
+# EndSection
+#
+# Section "InputDevice"
+# Identifier "Spaceball"
+# Driver "magellan"
+# Option "Device" "/dev/cua0"
+# EndSection
+#
+# Section "InputDevice"
+# Identifier "Spaceball2"
+# Driver "spaceorb"
+# Option "Device" "/dev/cua0"
+# EndSection
+#
+# Section "InputDevice"
+# Identifier "Touchscreen0"
+# Driver "microtouch"
+# Option "Device" "/dev/ttyS0"
+# Option "MinX" "1412"
+# Option "MaxX" "15184"
+# Option "MinY" "15372"
+# Option "MaxY" "1230"
+# Option "ScreenNumber" "0"
+# Option "ReportingMode" "Scaled"
+# Option "ButtonNumber" "1"
+# Option "SendCoreEvents"
+# EndSection
+#
+# Section "InputDevice"
+# Identifier "Touchscreen1"
+# Driver "elo2300"
+# Option "Device" "/dev/ttyS0"
+# Option "MinX" "231"
+# Option "MaxX" "3868"
+# Option "MinY" "3858"
+# Option "MaxY" "272"
+# Option "ScreenNumber" "0"
+# Option "ReportingMode" "Scaled"
+# Option "ButtonThreshold" "17"
+# Option "ButtonNumber" "1"
+# Option "SendCoreEvents"
+# EndSection
+
+# Section "InputDevice"
+# Identifier "Tablet1"
+# Driver "summa"
+# Option "Device" "/dev/ttyS0"
+# Option "MinX" "231"
+# Option "MaxX" "3868"
+# Option "MinY" "3858"
+# Option "MaxY" "272"
+# Option "ScreenNumber" "0"
+# Option "ReportingMode" "Scaled"
+# Option "ButtonThreshold" "17"
+# Option "ButtonNumber" "1"
+# Option "SendCoreEvents"
+# Option "BaudRate" "19200"
+# Option "DataBits" "8"
+# Option "StopBits" "1"
+# Option "Parity" "Odd"
+# Option "FlowControl" "Xoff"
+# Option "VTime" "10"
+# Option "VMin" "1"
+# EndSection
+
+
+# **********************************************************************
+# Monitor section
+# **********************************************************************
+
+# Any number of monitor sections may be present
+
+Section "Monitor"
+
+ Identifier "Monitor1"
+
+# NOTE: THE VALUES HERE ARE EXAMPLES ONLY. REFER TO YOUR MONITOR'S
+# USER MANUAL FOR THE CORRECT NUMBERS !!
+
+# normally uncomment this lines
+# HorizSync 24.0 - 80.0
+# VertRefresh 50-100
+
+# overwrite the screen dimensions (in mm) e.g. to get another virtual dpi
+# value
+# DisplaySize 345 260
+
+# HorizSync is in kHz unless units are specified.
+# HorizSync may be a comma separated list of discrete values, or a
+# comma separated list of ranges of values.
+# HorizSync 30-64 # multisync
+# HorizSync 31.5, 35.2 # multiple fixed sync frequencies
+# HorizSync 15-25, 30-50 # multiple ranges of sync frequencies
+
+# VertRefresh is in Hz unless units are specified.
+# VertRefresh may be a comma separated list of discrete values, or a
+# comma separated list of ranges of values.
+# VertRefresh 50-100
+
+# some mode examples 1,2 selfmade - 3 from fbset
+# (only needed for low-level tricks, exotic Laptops or other LCD's)
+#
+# Mode "1152x900"
+# DotClock 120
+# HTimings 1152 1200 1312 1528
+# VTimings 900 910 946 985
+# EndMode
+# Mode "1152x900-2"
+# DotClock 100
+# HTimings 1152 1200 1312 1528
+# VTimings 900 910 946 985
+# EndMode
+# Mode "1152x864"
+# DotClock 105.810
+# HTimings 1152 1184 1312 1504
+# VTimings 864 868 872 902
+# Flags "-HSync" "-VSync"
+# EndMode
+
+# for framebuffer devices you might want to simply add
+# the 'fbset -x' output here.
+
+EndSection
+
+
+# **********************************************************************
+# Graphics device section
+# **********************************************************************
+
+# Any number of graphics device sections may be present
+
+Section "Device"
+ Identifier "Card1"
+
+ # Use this for framebuffer devices - should work on most systems.
+ Driver "fbdev"
+ Option "fbdev" "/dev/fb/0"
+
+# Driver "vga" # mga, ati, nv, sis, vesa ...
+# # Option "BackingStore"
+
+# # Some driver accept an UseFBDev option (e.g. radeon) to switch the
+# # mode via the Linux framebuffer layer. Needed e.g. as workaround for
+# # iBooks.
+# # Option "UseFBDev"
+
+# # The BuID is only required for multi-monitor configs or some fbdev drivers
+# # BusID "PCI:1:5:0"
+# # Screen 0 # Screen of a dual-head mga card
+
+# # Option "NoHal" # do not use the binary-only Matrox HAL library
+# # Option "AGPMode2x"
+
+EndSection
+
+# Matrox Millenium 4xx, Ati or NVidia second-head
+#Section "Device"
+# Identifier "Card2"
+# Driver "mga" # or other dual-able cards like ati, nv
+# # Option "BackingStore"
+
+# BusID "PCI:1:5:0"
+# Screen 1
+#
+# # Option "NoHal" # do not use the binary-only Matrox HAL library
+# # Option "AGPMode2x"
+
+# # Option "Tv" "yes"
+# # Option "TVStandard" "PAL"
+# # Option "CableType" "SCART_COMPOSITE"
+#EndSection
+
+# **********************************************************************
+# Screen sections
+# **********************************************************************
+
+# Any number of screen sections may be present. Each describes
+# the configuration of a single screen. A single specific screen section
+# may be specified from the X server command line with the "-screen"
+# option.
+Section "Screen"
+ Identifier "Screen1"
+ Device "Card1"
+ Monitor "Monitor1"
+ DefaultDepth 24
+
+ Subsection "Display"
+ Depth 4
+ Modes "1024x768" "800x600" "640x480"
+ ViewPort 0 0
+ EndSubsection
+ Subsection "Display"
+ Depth 8
+ Modes "1024x768" "800x600" "640x400"
+ ViewPort 0 0
+ EndSubsection
+ Subsection "Display"
+ Depth 16
+ Modes "1024x768" "800x600" "640x480"
+ ViewPort 0 0
+ EndSubsection
+ Subsection "Display"
+ Depth 24
+ Modes "1024x768" "800x600" "640x480"
+ ViewPort 0 0
+ EndSubsection
+ Subsection "Display"
+ Depth 32
+ Modes "1024x768" "800x600" "640x480"
+ ViewPort 0 0
+ EndSubsection
+EndSection
+
+#Section "Screen"
+# Identifier "Screen2"
+# Device "Card2"
+# Monitor "Monitor1"
+# DefaultDepth 16
+#
+# Subsection "Display"
+# Depth 16
+# Modes "1024x768" "800x600" "640x480"
+# ViewPort 0 0
+# EndSubsection
+#EndSection
+
+#Section "Screen"
+# Identifier "ScreenTV"
+# Device "CardTV"
+# Monitor "Monitor1"
+# DefaultDepth 16
+#
+# Subsection "Display"
+# Depth 16
+# Modes "640x480"
+# ViewPort 0 0
+# EndSubsection
+#EndSection
+
+
+# **********************************************************************
+# ServerLayout sections.
+# **********************************************************************
+
+# Any number of ServerLayout sections may be present. Each describes
+# the way multiple screens are organised. A specific ServerLayout
+# section may be specified from the X server command line with the
+# "-layout" option. In the absence of this, the first section is used.
+# When now ServerLayout section is present, the first Screen section
+# is used alone.
+
+Section "ServerLayout"
+
+# The Identifier line must be present
+ Identifier "Simple Layout"
+
+# Each Screen line specifies a Screen section name, and optionally
+# the relative position of other screens. The four names after
+# primary screen name are the screens to the top, bottom, left and right
+# of the primary screen. In this example, screen 2 is located to the
+# right of screen 1.
+
+ Screen "Screen1" #LeftOf "Screen2"
+ #Screen "Screen2"
+ #Screen "ScreenTV"
+
+# Each InputDevice line specifies an InputDevice section name and
+# optionally some options to specify the way the device is to be
+# used. Those options include "CorePointer", "CoreKeyboard" and
+# "SendCoreEvents".
+
+ InputDevice "Mouse1" "CorePointer"
+ InputDevice "Keyboard1" "CoreKeyboard"
+
+# It is possible to specify secondary input devices which might not
+# be pressend on X startup. Nice for laptops with temporary external
+# mices ;-)!
+
+# InputDevice "Mouse2" "SendCoreEvents"
+# InputDevice "Tablet1"
+
+EndSection
+
diff --git a/package/xorg/xorg-server/xorg.cron b/package/xorg/xorg-server/xorg.cron
new file mode 100644
index 000000000..06490c7af
--- /dev/null
+++ b/package/xorg/xorg-server/xorg.cron
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo "Running mkfontscale / mkfontdir ..."
+for dir in /usr/X11R7/lib/X11/fonts/* ; do
+ [ -d $dir ] || continue
+ echo -n "$dir "
+ mkfontscale $dir
+ mkfontdir $dir
+done ; unset dir
+echo
+
+if [ "`which fc-cache`" ] ; then
+ echo "Running fc-cache ..."
+ fc-cache -v
+fi
+
diff --git a/package/xorg/xorg_config.sh b/package/xorg/xorg_config.sh
index 7f3eca90e..c3e17b416 100644
--- a/package/xorg/xorg_config.sh
+++ b/package/xorg/xorg_config.sh
@@ -1,6 +1,4 @@
-# hook_add premake 5 " " "ln -svf X11R7 $root/usr/X11"
-
prefix="$root/usr/X11R7"
set_confopt
@@ -13,6 +11,20 @@ if [[ "$xpkg" == font-* && "$xpkg" != font-util ]] ; then
hook_add preconf 5 xorg_fonts_preconf
fi
+createdocs=0
+forcefpic=0
+
+var_remove GCC3_WRAPPER_INSERT " " "-fstack-protector"
+
+# don't put the modules in a :dev package
+splitreg 45 . '/lib/modules/'
+
+# documentation files
+splitreg 50 doc 'usr/X11.*/lib/X11/doc'
+
+# this fixes many cyclic dependencies..
+var_append flistrfilter "|" ".*mkhtmlindex.pl.*X11/doc/html.*"
+
SUDO=""
DESTDIR="$root/"
PREFIX="$prefix"