Let's keep things consistent, .diff is the name we use pretty much everywhere. Also tweak the glob in .port_includes.sh to be 'patches/*.patch' rather than just 'patches/*'.