[pkgsrc/trunk]: pkgsrc/mk Make configure, install, and package barrier-aware ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a19eb166366
branches:  trunk
changeset: 515739:0a19eb166366
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 07 13:39:52 2006 +0000

description:
Make configure, install, and package barrier-aware even if NO_CONFIGURE,
NO_INSTALL, or NO_PACKAGE are defined.

diffstat:

 mk/configure/bsd.configure.mk |  6 ++++--
 mk/install/bsd.install.mk     |  6 ++++--
 mk/package/bsd.package.mk     |  6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r 45b405b768fe -r 0a19eb166366 mk/configure/bsd.configure.mk
--- a/mk/configure/bsd.configure.mk     Fri Jul 07 13:06:45 2006 +0000
+++ b/mk/configure/bsd.configure.mk     Fri Jul 07 13:39:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
+# $NetBSD: bsd.configure.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to configuring packages for building.
@@ -26,8 +26,10 @@
 .  if exists(${_CONFIGURE_COOKIE})
 configure:
        @${DO_NADA}
+.  elif exists(${_BARRIER_COOKIE})
+configure: wrapper configure-cookie
 .  else
-configure: wrapper configure-cookie
+configure: barrier
 .  endif
 .endif
 
diff -r 45b405b768fe -r 0a19eb166366 mk/install/bsd.install.mk
--- a/mk/install/bsd.install.mk Fri Jul 07 13:06:45 2006 +0000
+++ b/mk/install/bsd.install.mk Fri Jul 07 13:39:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.6 2006/07/06 22:29:52 jlam Exp $
+# $NetBSD: bsd.install.mk,v 1.7 2006/07/07 13:39:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
@@ -26,8 +26,10 @@
 .  if exists(${_INSTALL_COOKIE})
 install:
        @${DO_NADA}
+.  elif exists(${_BARRIER_COOKIE})
+install: ${_PKGSRC_BUILD_TARGETS} install-cookie
 .  else
-install: ${_PKGSRC_BUILD_TARGETS} install-cookie
+install: barrier
 .  endif
 .endif
 
diff -r 45b405b768fe -r 0a19eb166366 mk/package/bsd.package.mk
--- a/mk/package/bsd.package.mk Fri Jul 07 13:06:45 2006 +0000
+++ b/mk/package/bsd.package.mk Fri Jul 07 13:39:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.package.mk,v 1.4 2006/07/05 22:21:03 jlam Exp $
+# $NetBSD: bsd.package.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to binary packages.
@@ -22,13 +22,15 @@
 .  if exists(${_PACKAGE_COOKIE})
 package:
        @${DO_NADA}
-.  else
+.  elif exists(${_BARRIER_COOKIE})
 package: install
 .    if defined(SKIP_SILENT)
        @${DO_NADA}
 .    else
        @${PHASE_MSG} "${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}"."
 .    endif
+.  else
+package: barrier
 .  endif
 .endif