- patches now upstream, so remove local versions - add missing GMAKE dependency (I am fixing this requirement in OASIS directly too)