summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjasper <jasper@openbsd.org>2012-12-10 10:12:12 +0000
committerjasper <jasper@openbsd.org>2012-12-10 10:12:12 +0000
commitd4a27d1ef93bc7c58fceb4408fe18d6f4a767035 (patch)
tree7c9c1bd416d2ca75c2bdd727dc9f40450b8a8dc5
parentOpenBSD->.Ox (diff)
downloadwireguard-openbsd-d4a27d1ef93bc7c58fceb4408fe18d6f4a767035.tar.xz
wireguard-openbsd-d4a27d1ef93bc7c58fceb4408fe18d6f4a767035.zip
Document --{exact,max}-version
-rw-r--r--usr.bin/pkg-config/pkg-config4
-rw-r--r--usr.bin/pkg-config/pkg-config.110
2 files changed, 11 insertions, 3 deletions
diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config
index 414ffc7c331..54091a34faa 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.76 2012/12/08 18:50:05 jasper Exp $
+# $OpenBSD: pkg-config,v 1.77 2012/12/10 10:12:12 jasper Exp $
# $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $
# Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
@@ -589,6 +589,8 @@ Usage: $0 [options]
--uninstalled - allow for uninstalled versions to be used
--static - adjust output for static linking
--atleast-version [version] - require a certain version of a package
+--exact-version [version] - require exactly the specified version of a package
+--max-version [version] - require at most a certain version of a package
--modversion [package] - query the version of a package
--variable var package - return the definition of <var> in <package>
EOF
diff --git a/usr.bin/pkg-config/pkg-config.1 b/usr.bin/pkg-config/pkg-config.1
index 43641ffcf74..6d580856629 100644
--- a/usr.bin/pkg-config/pkg-config.1
+++ b/usr.bin/pkg-config/pkg-config.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg-config.1,v 1.28 2012/07/08 17:32:58 espie Exp $
+.\" $OpenBSD: pkg-config.1,v 1.29 2012/12/10 10:12:12 jasper Exp $
.\"
.\" Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 8 2012 $
+.Dd $Mdocdate: December 10 2012 $
.Dt PKG-CONFIG 1
.Os
.Sh NAME
@@ -84,6 +84,9 @@ compile against the package.
Enable internal development and debugging messages.
.It Cm --errors-to-stdout
Direct error messages to stdout rather than stderr.
+.It Cm --exact-version Ar version
+Exit with error if the specified packages's version does not equal the
+specified version.
.It Cm --exists
Return true if all the specified packages are installed.
This is the default operation.
@@ -102,6 +105,9 @@ Return linker flags, other than the library and path flags, required to
compile against the package.
.It Cm --list-all
List all installed packages and exit.
+.It Cm --max-version Ar version
+Exit with error if the specified package's version is greater than
+the specified version.
.It Cm --modversion
Fetch package version.
If no package is given,