Added the diff. For some reason, building this source directory directly is not working. What does work is to apply the patch to a fresh download of R 2.5.12.