Merge perl-5.18.2 plus local patches, remove old files

OK espie@ sthen@ deraadt@

1 files changed, 2 insertions, 2 deletions

diff --git a/gnu/usr.bin/perl/installman b/gnu/usr.bin/perl/installman
index 5f0a7a6f4f7..cd8b0947ff0 100644
--- a/gnu/usr.bin/perl/installman
+++ b/gnu/usr.bin/perl/installman
@@ -139,7 +139,7 @@ sub pod2man {
 
 	unless ($has_pod)
 	{
-	    warn "no documentation in $mod\n";
+	    warn "no documentation in $mod\n" unless $opts{silent};
 	    next;
 	}
 
@@ -155,7 +155,7 @@ sub pod2man {
                                   );
 	my $xmanpage = $manpage;
 	$xmanpage =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-        print "  $xmanpage\n";
+        print "  $xmanpage\n" unless $opts{silent};
         if (!$opts{notify} && $parser->parse_from_file($mod, $tmp)) {
             if (-s $tmp) {
                 if (rename($tmp, $manpage)) {