these patches were insane. we had 4 patch files. we had 7 files patched.

these patches were insane.  we had 4 patch files.  we had 7 files patched.
2 files were patched by 3 of the patches.  2 other files patched by 2 of
the patches, and 3 other single patched files.  now, we have 7 separate
patch files.

also, if we're going to enable some of libXpm here, do it all so that it
works with xpkgwedge!