Update makepkg-* to match upstream