pkg: move '-' branch separator into PKGVERS_BRANCH