For reasons beyond my compressions, (b)make handles

.if foo || bar
BAZ=	no
.else
BAZ=	yes
.endif

different from

.if foo
BAZ=	no
.elif bar
BAZ=	no
.else
BAZ=	yes
.endif

in some situations exposed in this builtin.mk. Workaround this for now.

6 files changed, 24 insertions, 12 deletions

diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk
index e03d9ec60e3..576e52af0fc 100644
--- a/x11/compositeproto/builtin.mk
+++ b/x11/compositeproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/12/15 20:43:00 joerg Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/12/16 01:04:43 joerg Exp $
 
 BUILTIN_PKG:=	compositeproto
 
@@ -14,7 +14,9 @@ BUILTIN_FIND_FILES.H_COMPOSITEPROTO=	\
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.compositeproto) || ${X11BASE} == ${LOCALBASE}
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.compositeproto=	no
+.elif !defined(IS_BUILTIN.compositeproto)
 IS_BUILTIN.compositeproto=	no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/fixesproto/builtin.mk b/x11/fixesproto/builtin.mk
index 3b746d51f44..cd1705df929 100644
--- a/x11/fixesproto/builtin.mk
+++ b/x11/fixesproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/12/15 20:43:00 joerg Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/12/16 01:04:43 joerg Exp $
 
 BUILTIN_PKG:=	fixesproto
 
@@ -14,7 +14,9 @@ BUILTIN_FIND_FILES.H_XFIXESWIRE=	\
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.fixesproto) || ${X11BASE} == ${LOCALBASE}
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.fixesproto=	no
+.elif !defined(IS_BUILTIN.fixesproto)
 IS_BUILTIN.fixesproto=	no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk
index 3733d4dd1e4..8616e4db31f 100644
--- a/x11/randrproto/builtin.mk
+++ b/x11/randrproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:00 joerg Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $
 
 # TODO: builtin.mk failed to use native on XFree86
 # the two headers are identical with native XFree86
@@ -14,7 +14,9 @@ BUILTIN_FIND_FILES.H_RANDR=	${X11BASE}/include/X11/extensions/randr.h
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.randrproto) || ${X11BASE} == ${LOCALBASE}
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.randrproto=	no
+.elif !defined(IS_BUILTIN.randrproto)
 IS_BUILTIN.randrproto=	no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk
index 1ab7bee5849..b3930286947 100644
--- a/x11/renderproto/builtin.mk
+++ b/x11/renderproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/12/15 20:43:00 joerg Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/12/16 01:04:43 joerg Exp $
 
 BUILTIN_PKG:=	renderproto
 
@@ -11,7 +11,9 @@ BUILTIN_FIND_FILES.H_RENDER=	${X11BASE}/include/X11/extensions/render.h
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.renderproto) || ${X11BASE} == ${LOCALBASE}
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.renderproto=	no
+.elif !defined(IS_BUILTIN.xproto)
 IS_BUILTIN.renderproto=	no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk
index 9386fa105b2..3389493274f 100644
--- a/x11/xextproto/builtin.mk
+++ b/x11/xextproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:01 joerg Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $
 
 BUILTIN_PKG:=	xextproto
 
@@ -12,7 +12,9 @@ BUILTIN_FIND_FILES.H_XEXTPROTO=	\
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.xextproto) || ${X11BASE} == ${LOCALBASE}
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.xextproto=	no
+.elif !defined(IS_BUILTIN.xproto)
 IS_BUILTIN.xextproto=	no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/xproto/builtin.mk b/x11/xproto/builtin.mk
index 1aa057b7ce9..dd13de90f77 100644
--- a/x11/xproto/builtin.mk
+++ b/x11/xproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:01 joerg Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $
 
 BUILTIN_PKG:=	xproto
 
@@ -11,7 +11,9 @@ BUILTIN_FIND_FILES.H_XFUNCPROTO=	${X11BASE}/include/X11/Xfuncproto.h
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.xproto) || ${X11BASE} == ${LOCALBASE}
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.xproto=	no
+.elif !defined(IS_BUILTIN.xproto)
 IS_BUILTIN.xproto=	no
 .  if empty(H_XFUNCPROTO:M__nonexistent__)
 IS_BUILTIN.xproto=	yes