pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/renderproto Restore LOCALBASE check as pkg-config ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc889110b22b
branches:  trunk
changeset: 522669:dc889110b22b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Dec 17 16:06:31 2006 +0000

description:
Restore LOCALBASE check as pkg-config handling must not be skipped as
it would be for a builtin package.

diffstat:

 x11/renderproto/builtin.mk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 4a36a2215025 -r dc889110b22b x11/renderproto/builtin.mk
--- a/x11/renderproto/builtin.mk        Sun Dec 17 15:39:59 2006 +0000
+++ b/x11/renderproto/builtin.mk        Sun Dec 17 16:06:31 2006 +0000
@@ -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 @@
 ### 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



Home | Main Index | Thread Index | Old Index