dolock -> portlock

(no discussion about this one)

diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index feaa34e..6bac28d 100644 (file)
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,15 +1,15 @@
-#      $OpenBSD: Makefile,v 1.8 2018/06/26 05:38:49 espie Exp $
+#      $OpenBSD: Makefile,v 1.9 2018/07/09 11:36:57 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
 
 # ports tools doc
 MAN+=  check-lib-depends.1 check-manpages.1 check-problems.1 \
-       clean-old-distfiles.1 dolock.1 dpb-replay.1 dpb.1 \
+       clean-old-distfiles.1 dpb-replay.1 dpb.1 \
        getpkgpath.1 out-of-date.1 outdated-perl-ports.1 \
        pkg_subst.1 portbump.1 portcheck.1 portgen.1 \
-       portimport.1 portslogger.1 proot.1 register-plist.1 \
-       resolve-lib.1 retrieve-index.1 update-patches.1 \
-       update-plist.1
+       portimport.1 portlock.1 portslogger.1 proot.1 \
+       register-plist.1 resolve-lib.1 retrieve-index.1 \
+       update-patches.1 update-plist.1
 
 .include <bsd.prog.mk>

diff --git a/share/man/man1/dolock.1 b/share/man/man1/dolock.1
deleted file mode 100644 (file)
index 67e288e..0000000
--- a/share/man/man1/dolock.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"    $OpenBSD: dolock.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 DOLOCK 1
-.Os
-.Sh NAME
-.Nm dolock
-.Nd lock port for concurrent builds
-.Sh SYNOPSIS
-.Nm dolock
-.Op Fl g Ar group
-.Op Fl m Ar mode
-.Ar lockname Op comment ...
-.Sh DESCRIPTION
-.Nm
-creates a lock named
-.Ar lockname
-using
-.Xr open 2 .
-If the lock is already held, it will display one single wait message on
-stderr, sleep and retry until satisfaction.
-.Pp
-If necessary, creates the lock directory, using
-.Fl m Ar mode
-as a mode argument or the default if that option is not specified,
-and
-.Fl g Ar group
-as the group owner if that option is specified.
-.Pp
-This implements a locking mechanism for ports building, see
-.Sq LOCK INFRASTRUCTURE
-in
-.Xr ports 7
-for details.
-See also
-.Xr dpb 1
-for a complementary lock infrastructure when using dpb.

diff --git a/share/man/man1/portlock.1 b/share/man/man1/portlock.1
new file mode 100644 (file)
index 0000000..aa94c3a
--- /dev/null
+++ b/share/man/man1/portlock.1
@@ -0,0 +1,51 @@
+.\"    $OpenBSD: portlock.1,v 1.1 2018/07/09 11:36:57 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 PORTLOCK 1
+.Os
+.Sh NAME
+.Nm portlock
+.Nd lock port for concurrent builds
+.Sh SYNOPSIS
+.Nm
+.Op Fl g Ar group
+.Op Fl m Ar mode
+.Ar lockname Op comment ...
+.Sh DESCRIPTION
+.Nm
+creates a lock named
+.Ar lockname
+using
+.Xr open 2 .
+If the lock is already held, it will display one single wait message on
+stderr, sleep and retry until satisfaction.
+.Pp
+If necessary, creates the lock directory, using
+.Fl m Ar mode
+as a mode argument or the default if that option is not specified,
+and
+.Fl g Ar group
+as the group owner if that option is specified.
+.Pp
+This implements a locking mechanism for ports building, see
+.Sq LOCK INFRASTRUCTURE
+in
+.Xr ports 7
+for details.
+See also
+.Xr dpb 1
+for a complementary lock infrastructure when using dpb.

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 77d78fd..f057b2c 100644 (file)
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.484 2018/06/19 19:06:47 kn Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.485 2018/07/09 11:36:57 espie Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 19 2018 $
+.Dd $Mdocdate: July 9 2018 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -1915,7 +1915,7 @@ If set, points to a local directory common for all instances of
 concurrent ports builds.
 .It Ev LOCK_CMD
 Expands to a command that will acquire a lock, namely
-.Xr dolock 1 .
+.Xr portlock 1 .
 See also
 .Xr ports 7 .
 .It Ev LOCK_VERBOSE