Fix merge issues, remove excess files - match perl-5.28.1 dist

looking good sthen@, Great! bluhm@

1 files changed, 12 insertions, 12 deletions

diff --git a/gnu/usr.bin/perl/cpan/IO-Compress/lib/File/GlobMapper.pm b/gnu/usr.bin/perl/cpan/IO-Compress/lib/File/GlobMapper.pm
index 76d4bed1178..a96cf3e8324 100644
--- a/gnu/usr.bin/perl/cpan/IO-Compress/lib/File/GlobMapper.pm
+++ b/gnu/usr.bin/perl/cpan/IO-Compress/lib/File/GlobMapper.pm
@@ -149,7 +149,7 @@ sub _parseBit
 
         if ($2 eq ',')
         { 
-            return _unmatched "("
+            return _unmatched("(")
                 if $depth ;
             
             $out .= '|';
@@ -160,7 +160,7 @@ sub _parseBit
         }
         elsif ($2 eq ')')
         { 
-            return _unmatched ")"
+            return _unmatched(")")
                 if ! $depth ;
 
             -- $depth ;
@@ -170,22 +170,22 @@ sub _parseBit
             # TODO -- quotemeta & check no '/'
             # TODO -- check for \]  & other \ within the []
             $string =~ s#(.*?\])##
-                or return _unmatched "[" ;
+                or return _unmatched("[");
             $out .= "$1)" ;
         }
         elsif ($2 eq ']')
         {
-            return _unmatched "]" ;
+            return _unmatched("]");
         }
         elsif ($2 eq '{' || $2 eq '}')
         {
-            return _retError "Nested {} not allowed" ;
+            return _retError("Nested {} not allowed");
         }
     }
 
     $out .= quotemeta $string;
 
-    return _unmatched "("
+    return _unmatched("(")
         if $depth ;
 
     return $out ;
@@ -219,7 +219,7 @@ sub _parseInputGlob
         }
         elsif ($2 eq ')')
         { 
-            return _unmatched ")"
+            return _unmatched(")")
                 if ! $depth ;
 
             -- $depth ;
@@ -229,16 +229,16 @@ sub _parseInputGlob
             # TODO -- quotemeta & check no '/' or '(' or ')'
             # TODO -- check for \]  & other \ within the []
             $string =~ s#(.*?\])##
-                or return _unmatched "[";
+                or return _unmatched("[");
             $out .= "$1)" ;
         }
         elsif ($2 eq ']')
         {
-            return _unmatched "]" ;
+            return _unmatched("]");
         }
         elsif ($2 eq '}')
         {
-            return _unmatched "}" ;
+            return _unmatched("}");
         }
         elsif ($2 eq '{')
         {
@@ -248,7 +248,7 @@ sub _parseInputGlob
             my $tmp ;
             unless ( $string =~ s/(.*?)$noPreBS\}//)
             {
-                return _unmatched "{";
+                return _unmatched("{");
             }
             #$string =~ s#(.*?)\}##;
 
@@ -263,7 +263,7 @@ sub _parseInputGlob
         }
     }
 
-    return _unmatched "("
+    return _unmatched("(")
         if $depth ;
 
     $out .= quotemeta $string ;