branches: 1.1.1.2.2; 1.1.1.2.4; 1.1.1.2.26;Re-import nvi sources, this time based on the distributed tar ball, aftergoing through the new nvi2netbsd script