[pkgsrc/trunk]: pkgsrc/mk Finish off the locking work, by adding locks around...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca7b4e7cad24
branches:  trunk
changeset: 480495:ca7b4e7cad24
user:      agc <agc%pkgsrc.org@localhost>
date:      Sat Sep 11 07:26:03 2004 +0000

description:
Finish off the locking work, by adding locks around "make install" and
"make package", from a nudge by Greg Oster. No objections, but lots of
mail, received from pkgsrc developers, to committing this during the
stability freeze, but I'd really like this to go in pkgsrc-2004Q3.

diffstat:

 mk/bsd.pkg.mk |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r 7b49f562ff4e -r ca7b4e7cad24 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Sep 11 03:36:54 2004 +0000
+++ b/mk/bsd.pkg.mk     Sat Sep 11 07:26:03 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1496 2004/09/10 19:51:50 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1497 2004/09/11 07:26:03 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -2997,6 +2997,7 @@
 
 .PHONY: acquire-extract-lock acquire-patch-lock acquire-tools-lock
 .PHONY: acquire-buildlink-lock acquire-configure-lock acquire-build-lock
+.PHONY: acquire-install-lock acquire-package-lock
 acquire-extract-lock:
        ${_ACQUIRE_LOCK}
 acquire-patch-lock:
@@ -3009,9 +3010,14 @@
        ${_ACQUIRE_LOCK}
 acquire-build-lock:
        ${_ACQUIRE_LOCK}
+acquire-install-lock:
+       ${_ACQUIRE_LOCK}
+acquire-package-lock:
+       ${_ACQUIRE_LOCK}
 
 .PHONY: release-extract-lock release-patch-lock release-tools-lock
 .PHONY: release-buildlink-lock release-configure-lock release-build-lock
+.PHONY: release-install-lock release-package-lock
 release-extract-lock:
        ${_RELEASE_LOCK}
 release-patch-lock:
@@ -3024,6 +3030,10 @@
        ${_RELEASE_LOCK}
 release-build-lock:
        ${_RELEASE_LOCK}
+release-install-lock:
+       ${_RELEASE_LOCK}
+release-package-lock:
+       ${_RELEASE_LOCK}
 
 ################################################################
 # Skeleton targets start here
@@ -3077,12 +3087,12 @@
 
 .PHONY: install
 .if !target(install)
-install: uptodate-pkgtools ${_PKGSRC_BUILD_TARGETS} ${INSTALL_COOKIE}
+install: uptodate-pkgtools ${_PKGSRC_BUILD_TARGETS} acquire-install-lock ${INSTALL_COOKIE} release-install-lock
 .endif
 
 .PHONY: package
 .if !target(package)
-package: uptodate-pkgtools install ${PACKAGE_COOKIE}
+package: uptodate-pkgtools install acquire-package-lock ${PACKAGE_COOKIE} release-package-lock
 .endif
 
 .PHONY: replace