[pkgsrc/trunk]: pkgsrc/x11 For reasons beyond my compressions, (b)make handles

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3150c1718e9
branches:  trunk
changeset: 522645:a3150c1718e9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Dec 16 01:04:43 2006 +0000

description:
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.

diffstat:

 x11/compositeproto/builtin.mk |  6 ++++--
 x11/fixesproto/builtin.mk     |  6 ++++--
 x11/randrproto/builtin.mk     |  6 ++++--
 x11/renderproto/builtin.mk    |  6 ++++--
 x11/xextproto/builtin.mk      |  6 ++++--
 x11/xproto/builtin.mk         |  6 ++++--
 6 files changed, 24 insertions(+), 12 deletions(-)

diffs (120 lines):

diff -r bf713ac5c97b -r a3150c1718e9 x11/compositeproto/builtin.mk
--- a/x11/compositeproto/builtin.mk     Sat Dec 16 00:11:56 2006 +0000
+++ b/x11/compositeproto/builtin.mk     Sat Dec 16 01:04:43 2006 +0000
@@ -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 @@
 ### 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 -r bf713ac5c97b -r a3150c1718e9 x11/fixesproto/builtin.mk
--- a/x11/fixesproto/builtin.mk Sat Dec 16 00:11:56 2006 +0000
+++ b/x11/fixesproto/builtin.mk Sat Dec 16 01:04:43 2006 +0000
@@ -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 @@
 ### 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 -r bf713ac5c97b -r a3150c1718e9 x11/randrproto/builtin.mk
--- a/x11/randrproto/builtin.mk Sat Dec 16 00:11:56 2006 +0000
+++ b/x11/randrproto/builtin.mk Sat Dec 16 01:04:43 2006 +0000
@@ -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 @@
 ### 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 -r bf713ac5c97b -r a3150c1718e9 x11/renderproto/builtin.mk
--- a/x11/renderproto/builtin.mk        Sat Dec 16 00:11:56 2006 +0000
+++ b/x11/renderproto/builtin.mk        Sat Dec 16 01:04:43 2006 +0000
@@ -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 @@
 ### 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 -r bf713ac5c97b -r a3150c1718e9 x11/xextproto/builtin.mk
--- a/x11/xextproto/builtin.mk  Sat Dec 16 00:11:56 2006 +0000
+++ b/x11/xextproto/builtin.mk  Sat Dec 16 01:04:43 2006 +0000
@@ -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 @@
 ### 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 -r bf713ac5c97b -r a3150c1718e9 x11/xproto/builtin.mk
--- a/x11/xproto/builtin.mk     Sat Dec 16 00:11:56 2006 +0000
+++ b/x11/xproto/builtin.mk     Sat Dec 16 01:04:43 2006 +0000
@@ -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 @@
 ### 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