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.

5 files changed, 20 insertions, 20 deletions

diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk
index de0ebe61d87..6bb26a98655 100644
--- a/mk/defs.AIX.mk
+++ b/mk/defs.AIX.mk
@@ -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 @@ GROUPADD?=	/usr/sbin/groupadd
 .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 --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 33ff12e0a4d..8b660d7be2a 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -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 @@ GROUPADD?=		${LOCALBASE}/sbin/groupadd
 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 --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 5d32916214d..df32e4e13f5 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -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 @@ GROUPADD?=	/usr/sbin/groupadd
 .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 --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 8eebae5e86d..13591f4d4b3 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -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 @@ GROUPADD?=	/usr/sbin/groupadd
 .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 --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 0e127c92035..c979cddd928 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -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 @@ GROUPADD?=	/usr/sbin/groupadd
 .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