[pkgsrc/trunk]: pkgsrc/x11 Don't assume that we have a builtin version of the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/947b6499e11f
branches:  trunk
changeset: 522642:947b6499e11f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 15 20:43:00 2006 +0000

description:
Don't assume that we have a builtin version of the X11 proto packages,
if LOCALBASE and X11BASE are identical.

diffstat:

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

diffs (108 lines):

diff -r 79d2c9110282 -r 947b6499e11f x11/compositeproto/builtin.mk
--- a/x11/compositeproto/builtin.mk     Fri Dec 15 20:32:52 2006 +0000
+++ b/x11/compositeproto/builtin.mk     Fri Dec 15 20:43:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/04/19 12:27:02 reed Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/12/15 20:43:00 joerg Exp $
 
 BUILTIN_PKG:=  compositeproto
 
@@ -14,7 +14,7 @@
 ### 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)
+.if !defined(IS_BUILTIN.compositeproto) || ${X11BASE} == ${LOCALBASE}
 IS_BUILTIN.compositeproto=     no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff -r 79d2c9110282 -r 947b6499e11f x11/fixesproto/builtin.mk
--- a/x11/fixesproto/builtin.mk Fri Dec 15 20:32:52 2006 +0000
+++ b/x11/fixesproto/builtin.mk Fri Dec 15 20:43:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/04/19 12:27:02 reed Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/12/15 20:43:00 joerg Exp $
 
 BUILTIN_PKG:=  fixesproto
 
@@ -14,7 +14,7 @@
 ### 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)
+.if !defined(IS_BUILTIN.fixesproto) || ${X11BASE} == ${LOCALBASE}
 IS_BUILTIN.fixesproto= no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff -r 79d2c9110282 -r 947b6499e11f x11/randrproto/builtin.mk
--- a/x11/randrproto/builtin.mk Fri Dec 15 20:32:52 2006 +0000
+++ b/x11/randrproto/builtin.mk Fri Dec 15 20:43:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2006/04/18 17:14:45 reed Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:00 joerg Exp $
 
 # TODO: builtin.mk failed to use native on XFree86
 # the two headers are identical with native XFree86
@@ -14,7 +14,7 @@
 ### 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)
+.if !defined(IS_BUILTIN.randrproto) || ${X11BASE} == ${LOCALBASE}
 IS_BUILTIN.randrproto= no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff -r 79d2c9110282 -r 947b6499e11f x11/renderproto/builtin.mk
--- a/x11/renderproto/builtin.mk        Fri Dec 15 20:32:52 2006 +0000
+++ b/x11/renderproto/builtin.mk        Fri Dec 15 20:43:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/07/22 04:51:29 rillig Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/12/15 20:43:00 joerg Exp $
 
 BUILTIN_PKG:=  renderproto
 
@@ -11,7 +11,7 @@
 ### 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)
+.if !defined(IS_BUILTIN.renderproto) || ${X11BASE} == ${LOCALBASE}
 IS_BUILTIN.renderproto=        no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff -r 79d2c9110282 -r 947b6499e11f x11/xextproto/builtin.mk
--- a/x11/xextproto/builtin.mk  Fri Dec 15 20:32:52 2006 +0000
+++ b/x11/xextproto/builtin.mk  Fri Dec 15 20:43:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2006/04/18 17:12:12 reed Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:01 joerg Exp $
 
 BUILTIN_PKG:=  xextproto
 
@@ -12,7 +12,7 @@
 ### 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)
+.if !defined(IS_BUILTIN.xextproto) || ${X11BASE} == ${LOCALBASE}
 IS_BUILTIN.xextproto=  no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
diff -r 79d2c9110282 -r 947b6499e11f x11/xproto/builtin.mk
--- a/x11/xproto/builtin.mk     Fri Dec 15 20:32:52 2006 +0000
+++ b/x11/xproto/builtin.mk     Fri Dec 15 20:43:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2006/04/19 12:19:47 reed Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:01 joerg Exp $
 
 BUILTIN_PKG:=  xproto
 
@@ -11,7 +11,7 @@
 ### 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)
+.if !defined(IS_BUILTIN.xproto) || ${X11BASE} == ${LOCALBASE}
 IS_BUILTIN.xproto=     no
 .  if empty(H_XFUNCPROTO:M__nonexistent__)
 IS_BUILTIN.xproto=     yes