[BACK]Return to pkg-config CVS log [TXT][DIR] Up to [local] / src / usr.bin / pkg-config

Diff for /src/usr.bin/pkg-config/pkg-config between version 1.48 and 1.49

version 1.48, 2011/06/06 11:18:55 version 1.49, 2011/06/06 12:32:17
Line 40 
Line 40 
         defined $ENV{PKG_CONFIG_DISABLE_UNINSTALLED} ? 0 : 1;          defined $ENV{PKG_CONFIG_DISABLE_UNINSTALLED} ? 0 : 1;
 my $found_uninstalled = 0;  my $found_uninstalled = 0;
   
 my $version = 0.23; # pretend to be this version of pkgconfig  my $version = 0.25; # pretend to be this version of pkgconfig
   
 my %configs = ();  my %configs = ();
 setup_self();  setup_self();
Line 568 
Line 568 
         # is there a valid non-numeric suffix to deal with later?          # is there a valid non-numeric suffix to deal with later?
         # accepter are (in order): a(lpha) < b(eta) < rc < ' '.          # accepter are (in order): a(lpha) < b(eta) < rc < ' '.
         # suffix[0] is the 'alpha' part, suffix[1] is the '1' part in 'alpha1'.          # suffix[0] is the 'alpha' part, suffix[1] is the '1' part in 'alpha1'.
         if ($a =~ m/(rc|beta|b|alpha|a)([\d]+)$/) {          if ($a =~ s/(rc|beta|b|alpha|a)(\d+)$//) {
                 print STDERR "valid suffix $1$2 found in $a.\n" if $D;                  print STDERR "valid suffix $1$2 found in $a.\n" if $D;
                 $suffix_a[0] = $1;                  $suffix_a[0] = $1;
                 $suffix_a[1] = $2;                  $suffix_a[1] = $2;
                 $a =~ s/$suffix_a[0]$suffix_a[1]//g;  
         }          }
   
         if ($b =~ m/(rc|beta|b|alpha|a)([\d]+)$/) {          if ($b =~ s/(rc|beta|b|alpha|a)(\d+)$//) {
                 print STDERR "valid suffix $1$2 found in $b.\n" if $D;                  print STDERR "valid suffix $1$2 found in $b.\n" if $D;
                 $suffix_b[0] = $1;                  $suffix_b[0] = $1;
                 $suffix_b[1] = $2;                  $suffix_b[1] = $2;
                 $b =~ s/$suffix_b[0]$suffix_b[1]//g;  
         }          }
   
         my @a = split /\./, $a;          my @a = split /\./, $a;
Line 592 
Line 590 
                         return $rc if defined($rc);                          return $rc if defined($rc);
                 } else {                  } else {
                         # extended comparison.                          # extended comparison.
                         if (((scalar(@a) == 1) || (scalar(@b) == 1)) &&                          if (((@a == 1) || (@b == 1)) &&
                             ($a[0] == $b[0])){                              ($a[0] == $b[0])){
                                 # one of the arrays has reached the last element,                                  # one of the arrays has reached the last element,
                                 # compare the suffix.                                  # compare the suffix.
Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49