summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-06-20 07:59:54 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-06-20 07:59:54 +0000
commit5a5ad2f3df7e6a1f2332f8746b4beea49f9f0e7f (patch)
tree47720d367187e9e6f1605881f084d38a3115ad9e
parent9eae0d87ce0ae2c665944f7bb0a86a12c706e482 (diff)
Document locks mechanism changes to default.
-rw-r--r--share/man/man5/bsd.port.mk.56
-rw-r--r--share/man/man7/ports.79
2 files changed, 9 insertions, 6 deletions
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index cf1c2278641..780afaca654 100644
--- 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.248 2010/06/17 13:28:17 jmc Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.249 2010/06/20 07:59:53 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 17 2010 $
+.Dd $Mdocdate: June 20 2010 $
.Dt BSD.PORT.MK 5
.Os
.Sh NAME
@@ -1272,6 +1272,8 @@ to ${LIBTOOL} ${LIBTOOL_FLAGS}.
where other ports have already been installed (default: /usr/local)
.It Ev LOCKDIR
User settings.
+Defaults to
+.Pa /tmp/portslocks .
If set, points to a directory common for all instances of concurrent ports
builds.
.It Ev LOCK_CMD
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 1d8a8a84d74..99c2b6188a0 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -23,10 +23,10 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ports.7,v 1.80 2010/05/01 10:30:41 espie Exp $
+.\" $OpenBSD: ports.7,v 1.81 2010/06/20 07:59:53 espie Exp $
.\" $FreeBSD: ports.7,v 1.7 1998/06/23 04:38:50 hoek Exp $
.\"
-.Dd $Mdocdate: May 1 2010 $
+.Dd $Mdocdate: June 20 2010 $
.Dt PORTS 7
.Os
.Sh NAME
@@ -338,10 +338,11 @@ Remove the symbolic links created by
.Sh LOCK INFRASTRUCTURE
The ports tree can be used concurrently for building several ports at the
same time, thanks to a locking mechanism.
-By default, this mechanism is disabled.
+By default, locks are stored under
+.Pa /tmp/portslocks .
Defining
.Ev LOCKDIR
-to a proper value will activate it.
+will point them elsewhere, or disable the mechanism if set to an empty value.
.Pp
All locks will be stored in
.Pa ${LOCKDIR} .