- Roll back to 4.6 as 4.7 is the development version and is constantly being
re-rolled.
- Move post-patch target into files/patch-xwin.c to remove sed invocation.
- Respect NOPORTDATA and DATADIR.
- Bring files/patch-aa back (to preserve history) and retire patch-makefile.
- Fixup files/patch-xwin.c so it applies cleanly to this version.