bump. It would be nice to have a solution for catinstall being unset on -current so I don't need these patches.