Avoid multiple collections of the same package.

To achieve this we perform the subtract in the mk_openbsd_plists.sh script.
Tidy up commented code.