* The merged contents file didn't work out, so nuke it and put it back
into each port directory. Most still have the now-pointless conditionals;
these now should be deleted.
* fix alpha, amiga, and arm32 to delete the maze of twisty little conditionals
c130e42b2e