Fix patches to apply on recent -current
Teach a bit of pkgng to tools