- Use MPICH2 unless WITH_MPICH1 is set; - Add a missing RUN_DEPENDS for mpirun. Reported by: pointyhat via Pav (1)