xbps: fix merged patch from master.