Use X11BASE to find the X11R6 directory. Give rid up a bunch of extra cruft in patch-aa and split into one patch per file.