resolve-lib -> port-resolve-lib-helper

diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 9b5a6d3..fa96c37 100644 (file)
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.11 2018/07/09 13:57:13 espie Exp $
+#      $OpenBSD: Makefile,v 1.12 2018/07/09 14:53:30 espie Exp $
 #      $NetBSD: Makefile,v 1.4 1994/12/22 10:48:04 cgd Exp $
 
 MAN=   clang-local.1 help.1 intro.1 gcc-local.1
@@ -8,10 +8,10 @@ MAN+= check-lib-depends.1 check-manpages.1 check-problems.1 \
        clean-old-distfiles.1 dpb-replay.1 dpb.1 \
        out-of-date.1 outdated-perl-ports.1 \
        pkg_subst.1 \
-       port-getpkgpath-helper.1 port-search-helper.1 \
+       port-getpkgpath-helper.1 port-resolve-lib-helper.1 \
+       port-search-helper.1 \
        portbump.1 portcheck.1 portgen.1 \
        portimport.1 portlock.1 portslogger.1 proot.1 \
-       register-plist.1 resolve-lib.1 \
-       update-patches.1 update-plist.1
+       register-plist.1 update-patches.1 update-plist.1
 
 .include <bsd.prog.mk>

diff --git a/share/man/man1/port-resolve-lib-helper.1 b/share/man/man1/port-resolve-lib-helper.1
new file mode 100644 (file)
index 0000000..c7d6da1
--- /dev/null
+++ b/share/man/man1/port-resolve-lib-helper.1
@@ -0,0 +1,74 @@
+.\"    $OpenBSD: port-resolve-lib-helper.1,v 1.1 2018/07/09 14:53:30 espie Exp $
+.\"
+.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" 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 9 2018 $
+.Dt PORT-RESOLVE-LIB-HELPER 1
+.Os
+.Sh NAME
+.Nm port-resolve-lib-helper
+.Nd resolve library specs during ports build
+.Sh SYNOPSIS
+.Nm
+.Op Fl needed
+.Op Fl silent
+.Ar spec ...
+.Sh DESCRIPTION
+.Nm
+resolve library specs against a list of installed libraries.
+.Nm
+takes a list of file names with full path on stdin,
+and matches each library
+.Ar spec
+against those libraries,
+using
+.Xr library-specs 7
+conventions.
+.Pp
+In particular,
+.Ev X11BASE
+and
+.Ev LOCALBASE
+are used to locate X11 libraries and port libraries.
+.Pp
+.Nm
+will print the best libraries found in a format suitable for
+.Cm @wantlib
+.Po
+see
+.Xr pkg_create 1
+.Pc .
+.Pp
+Each
+.Ar spec
+not found will result in an error message and exit code.
+.Pp
+If the option
+.Fl silent
+is used, nothing will be displayed.
+.Pp
+The option
+.Fl needed
+is used to sort out
+.Ev LIB_DEPENDS :
+.Nm
+will succeed if at least one of the libraries matches against a shared
+library passed on the command line.
+.Pp
+This is a helper script used by
+.Xr bsd.port.mk 5
+to complete all wantlib information for
+.Xr pkg_create 1
+and other tools.

diff --git a/share/man/man1/resolve-lib.1 b/share/man/man1/resolve-lib.1
deleted file mode 100644 (file)
index 8e94515..0000000
--- a/share/man/man1/resolve-lib.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"    $OpenBSD: resolve-lib.1,v 1.1 2018/06/26 05:38:49 espie Exp $
-.\"
-.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: June 26 2018 $
-.Dt RESOLVE-LIB 1
-.Os
-.Sh NAME
-.Nm resolve-lib
-.Nd resolve library specs during ports build
-.Sh SYNOPSIS
-.Nm resolve-lib
-.Op Fl needed
-.Op Fl silent
-.Ar spec ...
-.Sh DESCRIPTION
-.Nm
-resolve library specs against a list of installed libraries.
-.Nm
-takes a list of file names with full path on stdin,
-and matches each library
-.Ar spec
-against those libraries,
-using
-.Xr library-specs 7
-conventions.
-.Pp
-In particular,
-.Ev X11BASE
-and
-.Ev LOCALBASE
-are used to locate X11 libraries and port libraries.
-.Pp
-.Nm
-will print the best libraries found in a format suitable for
-.Cm @wantlib
-.Po
-see
-.Xr pkg_create 1
-.Pc .
-.Pp
-Each
-.Ar spec
-not found will result in an error message and exit code.
-.Pp
-If the option
-.Fl silent
-is used, nothing will be displayed.
-.Pp
-The option
-.Fl needed
-is used to sort out
-.Ev LIB_DEPENDS :
-.Nm
-will succeed if at least one of the libraries matches against a shared
-library passed on the command line.