+#define FontDir /usr/share/fonts
#endif
#ifndef FontEncDir
- #define FontEncDir $(LIBDIR)/fonts/encodings
+-#define FontEncDir $(LIBDIR)/fonts/encodings
++#define FontEncDir /usr/share/fonts/encodings
#endif
#ifndef AdmDir
-#define AdmDir /usr/adm
cyrix siliconmotion via \
vesa vga \
dummy XF86OSCardDrivers XF86ExtraCardDrivers
-@@ -425,7 +425,7 @@
- /* SiS is 64-bit unclean as of this writing. */
- # define i386DRIDrivers /**/
- # endif
--# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx
-+# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 tdfx
- # endif
- #endif /* i386Architecture || ia64Architecture */
-
-@@ -462,7 +462,7 @@
-
- /* SiS is 64-bit unclean as of this writing. */
- # ifndef DriDrivers
--# define DriDrivers i915 mga r128 radeon r200 tdfx
-+# define DriDrivers i915 gamma mga r128 radeon r200 tdfx
- # endif
- #endif /*AMD64Arcitecture*/
-
-@@ -603,7 +603,7 @@
- * SiS is 64-bit unclean as of this writing.
- */
- # ifndef DriDrivers
--# define DriDrivers tdfx mga r128 radeon r200
-+# define DriDrivers gamma tdfx mga r128 radeon r200
- # endif
- #endif /* AlphaArchitecture */
-
-@@ -637,7 +637,7 @@
- # endif
- /* The tdfx driver needs Glide, which is not available for PPC. */
- # ifndef DriDrivers
--# define DriDrivers mga r128 radeon r200
-+# define DriDrivers gamma mga r128 radeon r200
- # endif
- #endif /* PpcArchitecture || Mc68020Architecture */
-
-@@ -666,7 +666,7 @@
- XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
- # ifndef DriDrivers
--# define DriDrivers mga r128 radeon r200
-+# define DriDrivers gamma mga r128 radeon r200
- # endif
- #endif
-
-@@ -767,7 +767,7 @@
- # endif
- # define TdfxDriDriver /**/
- # ifndef DriDrivers
--# define DriDrivers r128
-+# define DriDrivers gamma r128
- # endif
- #endif /* Ppc64Architecture */
-
diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
--- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200
+++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100
diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
--- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100
+++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100
+@@ -72,7 +72,7 @@
+
+ MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
+
+-MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
++MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DBINDIR=$(BINDIR) -DLIBDIR=$(LIBDIR))
+
+ #if defined(SCOArchitecture) || defined(USLArchitecture)
+ ARCHMANDEFS=-D__SCOMAN__
@@ -88,11 +88,12 @@
#endif
InstallManPage(startx,$(MANDIR))