--- xc/programs/Xserver/include/Imakefile.orig	Sat Mar  1 06:30:25 2003
+++ xc/programs/Xserver/include/Imakefile	Sat Mar  1 06:31:13 2003
@@ -13,6 +13,7 @@
 LinkSourceFile(xf86_libc.h,$(XF86OSSRC))
 LinkSourceFile(xf86_ansic.h,$(XF86OSSRC))
 LinkSourceFile(xf86Version.h,$(XF86SRC))
+LinkSourceFile(xf86Date.h,$(XF86SRC))
 LinkSourceFile(compiler.h,$(XF86COMSRC))
 #endif
 
diff -uNr xc/programs/xinit/startx.cpp xc-new/programs/xinit/startx.cpp
--- xc/programs/xinit/startx.cpp	Mon Jan 28 13:27:34 2002
+++ xc-new/programs/xinit/startx.cpp	Sun Oct 12 15:10:16 2003
@@ -82,7 +82,6 @@
 whoseargs="client"
 while [ x"$1" != x ]; do
     case "$1" in
-    # '' required to prevent cpp from treating "/*" as a C comment.
     /''*|\./''*)
 	if [ "$whoseargs" = "client" ]; then
 	    if [ x"$clientargs" = x ]; then
@@ -105,7 +104,6 @@
 	if [ "$whoseargs" = "client" ]; then
 	    clientargs="$clientargs $1"
 	else
-	    # display must be the FIRST server argument
 	    if [ x"$serverargs" = x ] && \
 		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
 		display="$1"
@@ -120,7 +118,6 @@
 
 XCOMM process client arguments
 if [ x"$client" = x ]; then
-    # if no client arguments either, use rc file instead
     if [ x"$clientargs" = x ]; then
 	client="$defaultclientargs"
     else
@@ -130,7 +127,6 @@
 
 XCOMM process server arguments
 if [ x"$server" = x ]; then
-    # if no server arguments or display either, use rc file instead
     if [ x"$serverargs" = x -a x"$display" = x ]; then
 	server="$defaultserverargs"
     else
Index: xc/lib/freetype2/Imakefile
===================================================================
RCS file: /cvs/xc/lib/freetype2/Imakefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xc/lib/freetype2/Imakefile	5 Nov 2003 16:54:28 -0000	1.16
+++ xc/lib/freetype2/Imakefile	5 Nov 2003 22:25:20 -0000	1.17
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/freetype2/Imakefile,v 1.9 2003/01/01 22:08:39 torrey Exp $
+XCOMM $XFree86: xc/lib/freetype2/Imakefile,v 1.17 2003/11/05 22:25:20 torrey Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags
@@ -64,9 +64,10 @@
 
 HEADERS=ft2build.h
 
-SRCS_BASE = ftbase.c \
-            ftbdf.c \
+SRCS_BASE = ftapi.c \
+            ftbase.c \
             ftbbox.c \
+            ftbdf.c \
             ftdebug.c \
             ftglyph.c \
             ftinit.c \
@@ -79,9 +80,10 @@
             ftwinfnt.c \
             ftxf86.c
 
-OBJS_BASE = ftbase.o \
-            ftbdf.o \
+OBJS_BASE = ftapi.o \
+            ftbase.o \
             ftbbox.o \
+            ftbdf.o \
             ftdebug.o \
             ftglyph.o \
             ftinit.o \
@@ -207,6 +209,7 @@
 
 LinkSourceFile(ft2build.h,$(FREETYPETOP)/include)
 
+LinkSourceFile(ftapi.c,$(FREETYPESRC)/base)
 LinkSourceFile(ftbase.c,$(FREETYPESRC)/base)
 LinkSourceFile(ftbdf.c,$(FREETYPESRC)/base)
 LinkSourceFile(ftbbox.c,$(FREETYPESRC)/base)