Modernize build, rename extant patch file.
Note:  test with gcc49