Index: bsd.own.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.own.mk,v
retrieving revision 1.53
diff -u -p -u -r1.53 bsd.own.mk
--- bsd.own.mk	1 Apr 2006 18:11:42 -0000	1.53
+++ bsd.own.mk	21 Apr 2006 09:40:26 -0000
@@ -260,7 +260,7 @@ WITHOUT_${var}=
     TOOLCHAIN \
     USB \
     WPA_SUPPLICANT_EAPOL
-.if defined(NO_${var})
+.if defined(NO_${var}) && ${NO_${var}} != 'no' && ${NO_${var}} != 'NO'
 #.warning NO_${var} is deprecated in favour of WITHOUT_${var}=
 WITHOUT_${var}=
 .endif
@@ -355,7 +355,7 @@ WITH_IDEA=
 .if defined(MK_${var})
 .error MK_${var} can't be set by a user.
 .endif
-.if defined(WITHOUT_${var})
+.if defined(WITHOUT_${var}) && ${WITHOUT_${var}} != 'no' && ${WITHOUT_${var}} != 'NO'
 MK_${var}:=	no
 .else
 MK_${var}:=	yes
@@ -375,7 +375,7 @@ MK_${var}:=	yes
 .if defined(MK_${var})
 .error MK_${var} can't be set by a user.
 .endif
-.if defined(WITH_${var})
+.if defined(WITH_${var}) && ${WITH_${var}} != 'no' && ${WITH_${var}} != 'NO'
 MK_${var}:=	yes
 .else
 MK_${var}:=	no