Patch by Wade Berrier. It still errors out on sysdeputil.c for me, but this is no worse than it was before, so committing.
sysdeputil needs treatment, perhaps it get's Claudio Leonel started