Fix merge issues, remove excess files - match perl-5.38.2 distok gkoehler@Commit and we'll fix fallout bluhm@Right away, please deraadt@
stock perl 5.8.0 from CPAN
perl 5.004_04