Allow overriding of the p4 settings via environment variables

Make regexp more robust to parse FreeBSD's patch output

p4raw-id: //depot/perl@21970

diff --git a/Porting/apply b/Porting/apply
index d3bdb0b..cfa76e0 100644 (file)
--- a/Porting/apply
+++ b/Porting/apply
@@ -1,8 +1,8 @@
 #!/usr/bin/perl -w
 my $file = pop(@ARGV);
 my %meta;
-$ENV{'P4PORT'} = 'bactrian:1667';
-$ENV{'P4CLIENT'} = 'ni-s';
+$ENV{'P4PORT'} ||= 'bactrian:1667';
+$ENV{'P4CLIENT'} ||= 'ni-s';
 open(FILE,$file) || die "Cannot open $file:$!";
 while (<FILE>)
  {
@@ -17,7 +17,7 @@ my $code = $?;
 warn "$code from patch\n";
 foreach (@results)
  {
-  if (/patching\s+file\s*(.*?)\s*$/)
+  if (/[Pp]atching\s+file\s*(\S+)/)
    {
     push(@edit,$1);
    }