diff options
| author |   jasper <jasper@openbsd.org> | 2011-03-14 08:40:13 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2011-03-14 08:40:13 +0000 |
| commit | 48899091d2cbefc670ae2e0081026e94a005d9aa (patch) | |
| tree | f30762c9c044d1f5afc6393e21e1ef789dcfab21 | |
| parent | - implement PKG_CONFIG_SYSROOT_DIR (diff) | |
| download | wireguard-openbsd-48899091d2cbefc670ae2e0081026e94a005d9aa.tar.xz wireguard-openbsd-48899091d2cbefc670ae2e0081026e94a005d9aa.zip | |
whitespace cleanup
| -rw-r--r-- | usr.bin/pkg-config/pkg-config | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config index b2945e43342..fb54af0509a 100644 --- a/usr.bin/pkg-config/pkg-config +++ b/usr.bin/pkg-config/pkg-config @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: pkg-config,v 1.32 2011/03/14 08:35:08 jasper Exp $ +# $OpenBSD: pkg-config,v 1.33 2011/03/14 08:40:13 jasper Exp $ #$CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $ # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org> @@ -35,7 +35,7 @@ if (defined($ENV{PKG_CONFIG_LOGFILE}) && $ENV{PKG_CONFIG_LOGFILE}) { $logfile = $ENV{PKG_CONFIG_LOGFILE}; } -my $allow_uninstalled = +my $allow_uninstalled = defined $ENV{PKG_CONFIG_DISABLE_UNINSTALLED} ? 0 : 1; my $found_uninstalled = 0; @@ -112,7 +112,7 @@ GetOptions( 'debug' => \$D, # Initial value of printerr depends on the options... if (!defined $mode{printerr}) { - if (defined $mode{libs} || defined $mode{cflags} + if (defined $mode{libs} || defined $mode{cflags} || defined $mode{version} || defined $mode{list}) { $mode{printerr} = 1; } else { @@ -312,7 +312,7 @@ sub get_config my ($f) = @_; my $cfg; - eval { + eval { $cfg = OpenBSD::PkgConfig->read_file($f); }; if (!$@) { @@ -344,7 +344,7 @@ sub find_config return get_config($f); } if ($mode{printerr}) { - print STDERR + print STDERR "Package $p was not found in the pkg-config search path\n"; } return undef; @@ -471,8 +471,8 @@ sub do_list my ($p, $x, $y, @files, $fname, $name); my $error = 0; - foreach my $p (@PKGPATH) { - push(@files, <$p/*.pc>); + foreach my $p (@PKGPATH) { + push(@files, <$p/*.pc>); } # Scan the lengths of the package names so I can make a format @@ -493,8 +493,8 @@ sub do_list next; } $fname = basename($f, '.pc'); - printf("%${x}s %s - %s\n", $fname, - stringize($cfg->get_property('Name', $variables)), + printf("%${x}s %s - %s\n", $fname, + stringize($cfg->get_property('Name', $variables)), stringize($cfg->get_property('Description', $variables), ' ')); } @@ -572,7 +572,7 @@ sub compare sub versionmatch { my ($cfg, $op, $want) = @_; - + # can't possibly match if we can't find the file return 0 if !defined $cfg; |