Removed the keyboard patch for HEAD builds; added mkoctfile patch, pstoedit/epstool dependencies