While I'm here, attempt to use more standard variables (PATCH*) in the pre-patch command (patch is in shar format).