xbps-git: revbump (misc tweaks to pkg conflicts).