Use the original regex code instead of the default libuxre on -STABLE
and remove a valloc re-declaration, fixing the slightly ironic
requirement of running -CURRENT to build an ancient vi. This does result
in two patches for the same file (Makefile), but they do apply in the
correct order and I can't think of a better way to do it. I'm open to
suggestions if anyone knows a more correct method.