summaryrefslogtreecommitdiff
path: root/x11/renderproto
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-12-17 16:06:31 +0000
committerjoerg <joerg@pkgsrc.org>2006-12-17 16:06:31 +0000
commit36e57827adb88ff8c1b01802fe5695b1b82a8977 (patch)
tree91f54e588e3b9f214a257f7725ccde59efed6301 /x11/renderproto
parent4ad25fa0963c427b8877064749b4479797215bc6 (diff)
downloadpkgsrc-36e57827adb88ff8c1b01802fe5695b1b82a8977.tar.gz
Restore LOCALBASE check as pkg-config handling must not be skipped as
it would be for a builtin package.
Diffstat (limited to 'x11/renderproto')
-rw-r--r--x11/renderproto/builtin.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk
index 7d40548c37d..37215f0b41a 100644
--- a/x11/renderproto/builtin.mk
+++ b/x11/renderproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2006/12/16 14:07:24 tv Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/12/17 16:06:31 joerg Exp $
BUILTIN_PKG:= renderproto
@@ -11,12 +11,15 @@ 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)
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.renderproto= no
+.elif !defined(IS_BUILTIN.renderproto)
IS_BUILTIN.renderproto= no
#
# Here, we skip checking whether the files are under ${LOCALBASE} since
# we'll consider this X11 package to be built-in even if it's a part
-# of one of the pkgsrc-installed X11 distributions.
+# of one of the pkgsrc-installed X11 distributions. This does not apply
+# to modular Xorg which is caught above.
#
. if empty(H_RENDER:M__nonexistent__)
IS_BUILTIN.renderproto= yes