===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkg-config/pkg-config,v
retrieving revision 1.96
retrieving revision 1.97
diff -c -r1.96 -r1.97
*** src/usr.bin/pkg-config/pkg-config	2023/06/08 08:55:27	1.96
--- src/usr.bin/pkg-config/pkg-config	2023/09/22 07:28:31	1.97
***************
*** 1,5 ****
  #!/usr/bin/perl
! # $OpenBSD: pkg-config,v 1.96 2023/06/08 08:55:27 espie Exp $
  
  # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
  # Copyright (c) 2011-2020 Jasper Lievisse Adriaanse <jasper@openbsd.org>
--- 1,5 ----
  #!/usr/bin/perl
! # $OpenBSD: pkg-config,v 1.97 2023/09/22 07:28:31 espie Exp $
  
  # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
  # Copyright (c) 2011-2020 Jasper Lievisse Adriaanse <jasper@openbsd.org>
***************
*** 279,285 ****
--- 279,305 ----
  exit $rc;
  
  ###########################################################################
+ sub set_variables_from_env($file)
+ {
+ 	    state (%done, @l);
  
+ 	    if (!defined $done{$file}) {
+ 		    my $pkg = $file;
+ 
+ 		    $pkg =~ s/(^.*\/)?(.*?)\.pc$/$2/g;
+ 		    $pkg = uc($pkg);
+ 		    if (!@l) {
+ 			    @l = grep {/PKG_CONFIG_/} keys %ENV;
+ 		    }
+ 		    for my $k (@l) {
+ 			    next unless $k =~ m/PKG_CONFIG_${pkg}_(\w+)/;
+ 			    $variables->{lc($1)} = $ENV{$k};
+ 		    }
+ 		    $done{$file} = 1;
+ 	    }
+ 
+ }
+ 
  sub handle_config($p, $op, $v, $list)
  {
  	my $cfg = cache_find_config($p);
***************
*** 300,321 ****
  	}
  
  	my $get_props = sub($property) {
! 	    my $pkg;
! 
! 	    # See if there's anything in the environment that we need to
! 	    # take into account.
! 	    ($pkg = $p) =~ s/(^.*\/)?(.*?)\.pc$/$2/g;
! 	    $pkg = uc($pkg);
! 
! 	    if (grep {/PKG_CONFIG_${pkg}.*/} keys %ENV) {
! 		    # Now that we know we have something to look for, do
! 		    # the inefficient iteration.
! 		    while (my ($k, $v) = each %ENV) {
! 			    if ($k =~ /^PKG_CONFIG_${pkg}_(\w+)/) {
! 				    $variables->{lc($1)} = $v;
! 			    }
! 		    }
! 	    }
  
  	    my $deps = $cfg->get_property($property, $variables);
  	    return unless defined $deps;
--- 320,326 ----
  	}
  
  	my $get_props = sub($property) {
! 	    set_variables_from_env($p);
  
  	    my $deps = $cfg->get_property($property, $variables);
  	    return unless defined $deps;