[pkgsrc/trunk]: pkgsrc/mk Do the same USE_USERADD/USE_GROUPADD fix as done fo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92bfbf0d7233
branches:  trunk
changeset: 474306:92bfbf0d7233
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Apr 27 13:43:05 2004 +0000

description:
Do the same USE_USERADD/USE_GROUPADD fix as done for Interix: use the
construct "DEPENDS+=${USE_USERADD:D${_USER_DEPENDS}}" to ensure that the
conditional is not expanded until after USE_*ADD is actually defined.

diffstat:

 mk/defs.AIX.mk     |  8 ++++----
 mk/defs.Darwin.mk  |  8 ++++----
 mk/defs.FreeBSD.mk |  8 ++++----
 mk/defs.NetBSD.mk  |  8 ++++----
 mk/defs.OpenBSD.mk |  8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diffs (110 lines):

diff -r fa60d9eba8e4 -r 92bfbf0d7233 mk/defs.AIX.mk
--- a/mk/defs.AIX.mk    Tue Apr 27 13:09:47 2004 +0000
+++ b/mk/defs.AIX.mk    Tue Apr 27 13:43:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.7 2004/04/19 20:19:46 jmmv Exp $
+# $NetBSD: defs.AIX.mk,v 1.8 2004/04/27 13:43:05 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -110,9 +110,9 @@
 .else
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
-.if defined(USE_USERADD) || defined(USE_GROUPADD)
-DEPENDS+=      user>=20000313:../../sysutils/user
-.endif
+_USER_DEPENDS= user>=20000313:../../sysutils/user
+DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
+DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
 CPP_PRECOMP_FLAGS?=    # unset
diff -r fa60d9eba8e4 -r 92bfbf0d7233 mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Tue Apr 27 13:09:47 2004 +0000
+++ b/mk/defs.Darwin.mk Tue Apr 27 13:43:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.71 2004/04/19 20:19:46 jmmv Exp $
+# $NetBSD: defs.Darwin.mk,v 1.72 2004/04/27 13:43:05 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -98,9 +98,9 @@
 USERADD?=              ${LOCALBASE}/sbin/useradd
 _PKG_USER_HOME?=       /var/empty      # to match other system accounts
 _PKG_USER_SHELL?=      /usr/bin/false  # to match other system accounts
-.if defined(USE_USERADD) || defined(USE_GROUPADD)
-DEPENDS+=      user>=20040331:../../sysutils/user_darwin
-.endif
+_USER_DEPENDS=         user>=20040331:../../sysutils/user_darwin
+DEPENDS+=              ${USE_USERADD:D${_USER_DEPENDS}}
+DEPENDS+=              ${USE_GROUPADD:D${_USER_DEPENDS}}
 
 # imake installs manpages in weird places
 # these values from /usr/X11R6/lib/X11/config/Imake.tmpl
diff -r fa60d9eba8e4 -r 92bfbf0d7233 mk/defs.FreeBSD.mk
--- a/mk/defs.FreeBSD.mk        Tue Apr 27 13:09:47 2004 +0000
+++ b/mk/defs.FreeBSD.mk        Tue Apr 27 13:43:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.37 2004/04/14 15:27:04 xtraeme Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.38 2004/04/27 13:43:05 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -92,9 +92,9 @@
 .else
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
-.if defined(USE_USERADD) || defined(USE_GROUPADD)
-DEPENDS+=      user>=20000313:../../sysutils/user
-.endif
+_USER_DEPENDS= user>=20000313:../../sysutils/user
+DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
+DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
 CPP_PRECOMP_FLAGS?=    # unset
diff -r fa60d9eba8e4 -r 92bfbf0d7233 mk/defs.NetBSD.mk
--- a/mk/defs.NetBSD.mk Tue Apr 27 13:09:47 2004 +0000
+++ b/mk/defs.NetBSD.mk Tue Apr 27 13:43:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.63 2004/04/09 22:43:31 jmmv Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.64 2004/04/27 13:43:05 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -85,9 +85,9 @@
 .else
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
-.if defined(USE_USERADD) || defined(USE_GROUPADD)
-DEPENDS+=      user>=20000313:../../sysutils/user
-.endif
+_USER_DEPENDS= user>=20000313:../../sysutils/user
+DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
+DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
 CPP_PRECOMP_FLAGS?=    # unset
diff -r fa60d9eba8e4 -r 92bfbf0d7233 mk/defs.OpenBSD.mk
--- a/mk/defs.OpenBSD.mk        Tue Apr 27 13:09:47 2004 +0000
+++ b/mk/defs.OpenBSD.mk        Tue Apr 27 13:43:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.31 2004/04/19 20:19:46 jmmv Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.32 2004/04/27 13:43:05 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -81,9 +81,9 @@
 .else
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
-.if defined(USE_USERADD) || defined(USE_GROUPADD)
-DEPENDS+=      user>=20000313:../../sysutils/user
-.endif
+_USER_DEPENDS= user>=20000313:../../sysutils/user
+DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
+DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
 CPP_PRECOMP_FLAGS?=    # unset