While here, honor the value of the CC variable while building and remove an unused chunk from a patch file. Bump PKGREVISION to 2.