Fix typo on comment line in patch file.
Let import-package deal with previously rm'd pkgs.

If a package ever existed in the repository (e.g. in wip) but was
deleted, import-package would not import a new version of that
package. Change this:
- check the CVS/Repository files under the pkg directory, and allow
  the CVS directory to be present if it matches the current location
- exit with error if the Repository file does not match (as
  replacement for the check added last month by othyro/wiz)
- exit with error if CVS/Entries files contain anything else than
  directories.
- don't `cvs add` directories that contain a CVS directory

and unrelated:
- cleanup temp files on exit
- use "type" instead of "which" to check for bmake presence
- changed the final prompt (it confused me and I pressed enter
  without "y")

No objections on pkgsrc-wip-discuss.