--- vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in.xorg	2005-03-04 09:09:37.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in	2005-03-04 09:09:56.000000000 +0000
@@ -8,6 +8,8 @@
 #define BuildGlxExt NO
 #define XnestServer NO
 #define XprtServer NO
+#define BuildXFree86ConfigTools NO
+#define BuildScanpci NO
 
 #ifdef SunArchitecture
 #define ProjectRoot /usr/openwin
--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc.xorg	2005-03-04 09:05:36.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc	2005-03-04 09:05:47.000000000 +0000
@@ -413,25 +413,6 @@
   }
 }
 
-static void printRegion(RegionPtr reg)
-{
-  int nrects = REGION_NUM_RECTS(reg);
-
-  fprintf(stderr,"Region num rects %2d extents %3d,%3d %3dx%3d\n",nrects,
-          (REGION_EXTENTS(pScreen,reg))->x1,
-          (REGION_EXTENTS(pScreen,reg))->y1,
-          (REGION_EXTENTS(pScreen,reg))->x2-(REGION_EXTENTS(pScreen,reg))->x1,
-          (REGION_EXTENTS(pScreen,reg))->y2-(REGION_EXTENTS(pScreen,reg))->y1);
-
-  for (int i = 0; i < nrects; i++) {
-    fprintf(stderr,"    rect %3d,%3d %3dx%3d\n",
-            REGION_RECTS(reg)[i].x1,
-            REGION_RECTS(reg)[i].y1,
-            REGION_RECTS(reg)[i].x2-REGION_RECTS(reg)[i].x1,
-            REGION_RECTS(reg)[i].y2-REGION_RECTS(reg)[i].y1);
-  }
-}
-
 CARD32 XserverDesktop::deferredUpdateTimerCallback(OsTimerPtr timer,
                                                    CARD32 now, pointer arg)
 {
--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/Imakefile.xorg	2005-03-04 09:05:54.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/Imakefile	2005-03-04 09:06:19.000000000 +0000
@@ -128,7 +128,7 @@
        LIBREGEX = RegexLibrary
 
 #if DoLoadableServer
-    LIBCWRAPPER = os/libcwrapper.o
+    LIBCWRAPPER = os/libcwrapper.o os/libos.a
 #endif
 
 #if BuildXprint
--- vnc-4_1-unixsrc/unix/xc.patch.xorg	2005-03-04 09:07:52.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc.patch	2005-03-04 09:08:37.000000000 +0000
@@ -8,19 +8,19 @@
 + XCOMM
 + XCOMM X VNC server
 + XCOMM
-+ MFBDIR = mfb
-+ CFB8DIR = cfb
-+ CFB16DIR = cfb16
-+ CFB24DIR = cfb24
-+ CFB32DIR = cfb32
-+ FBDIR = fb
++ MFBSUBDIR = mfb
++ CFB8SUBDIR = cfb
++ CFB16SUBDIR = cfb16
++ CFB24SUBDIR = cfb24
++ CFB32SUBDIR = cfb32
++ FBSUBDIR = fb
 + XVNCDDXDIR = vnc/Xvnc
 + #if VncUseFb
-+ XVNCDIRS = $(STDDIRS) $(FBDIR) $(XVNCDDXDIR) $(DEPDIRS)
++ XVNCDIRS = $(STDDIRS) $(FBSUBDIR) $(XVNCDDXDIR) $(DEPDIRS)
 + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs
 + #else
-+ XVNCDIRS = $(STDDIRS) $(MFBDIR) \
-+ 	    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
++ XVNCDIRS = $(STDDIRS) $(MFBSUBDIR) \
++ 	    $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) $(CFB32SUBDIR) \
 + 	    $(XVNCDDXDIR) $(DEPDIRS)
 + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) CFBLibs PostFbLibs
 + #endif