Fix merge issues, remove excess files - match perl-5.40.1 distok sthen@sooner rather than later deraadt@
stock perl 5.8.0 from CPAN
perl 5.004_04