From 15fa28b6da0a62de7b2848185cfda0f4de5bb021 Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Tue, 27 Apr 2004 13:43:05 +0000
Subject: 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.

---
 mk/defs.NetBSD.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mk/defs.NetBSD.mk')

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
-- 
cgit v1.2.3