=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkg-config/pkg-config,v retrieving revision 1.42 retrieving revision 1.43 diff -c -r1.42 -r1.43 *** src/usr.bin/pkg-config/pkg-config 2011/03/21 13:28:06 1.42 --- src/usr.bin/pkg-config/pkg-config 2011/05/18 11:12:13 1.43 *************** *** 1,5 **** #!/usr/bin/perl ! # $OpenBSD: pkg-config,v 1.42 2011/03/21 13:28:06 espie Exp $ # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $ # Copyright (c) 2006 Chris Kuethe --- 1,5 ---- #!/usr/bin/perl ! # $OpenBSD: pkg-config,v 1.43 2011/05/18 11:12:13 jasper Exp $ # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $ # Copyright (c) 2006 Chris Kuethe *************** *** 234,264 **** } } ! my $deps = $cfg->get_property('Requires', $variables); ! if (defined $deps) { ! for my $dep (@$deps) { ! if ($dep =~ m/^(.*?)\s*([<=>]+)\s*([\d\.]+)$/) { ! handle_config($1, $2, $3, $list); ! } else { ! handle_config($dep, undef, undef, $list); ! } ! } ! print STDERR "package $p requires ", ! join(',', @$deps), "\n" if $D; ! } ! $deps = $cfg->get_property('Requires.private', $variables); ! if (defined $deps) { ! for my $dep (@$deps) { ! if ($dep =~ m/^(.*?)\s*([<=>]+)\s*([\d\.]+)$/) { ! handle_config($1, $2, $3, $list); ! } else { ! handle_config($dep, undef, undef, $list); } } ! print STDERR "package $p requires (private)", ! join(',', @$deps), "\n" if $D; ! } } # look for the .pc file in each of the PKGPATH elements. Return the path or --- 234,259 ---- } } ! my $get_props = sub { ! my $property = shift; ! my $deps = $cfg->get_property($property, $variables); ! if (defined $deps) { ! for my $dep (@$deps) { ! if ($dep =~ m/^(.*?)\s*([<=>]+)\s*([\d\.]+)$/) { ! handle_config($1, $2, $3, $list); ! } else { ! handle_config($dep, undef, undef, $list); ! } } + print STDERR "package $p ", lc($property), " ", + join(',', @$deps), "\n" if $D; } ! }; ! ! &$get_props("Requires"); ! &$get_props("Requires.private"); ! } # look for the .pc file in each of the PKGPATH elements. Return the path or