pacman: use regex for matching MAKEPKG_CONF
pacman: remove 2 local patches now in MSYS2-pacman