pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/renderproto Fix !defined(IS_BUILTIN.xproto) inheri...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/50061a7cffd4
branches:  trunk
changeset: 522657:50061a7cffd4
user:      tv <tv%pkgsrc.org@localhost>
date:      Sat Dec 16 14:07:24 2006 +0000

description:
Fix !defined(IS_BUILTIN.xproto) inherited when this was copied from
xproto; should have been .renderproto so that the variable always gets
defined somehow.  (Under older bmake, there was a syntax error when
IS_BUILTIN.renderproto was later checked, because for x11-links, it was
never defined in the first place.)

Remove check for X11BASE==LOCALBASE.  There's even a comment there saying
we don't want to check that, so don't do it.

diffstat:

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

diffs (20 lines):

diff -r 2fb865b06576 -r 50061a7cffd4 x11/renderproto/builtin.mk
--- a/x11/renderproto/builtin.mk        Sat Dec 16 13:18:54 2006 +0000
+++ b/x11/renderproto/builtin.mk        Sat Dec 16 14:07:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.7 2006/12/16 14:07:24 tv Exp $
 
 BUILTIN_PKG:=  renderproto
 
@@ -11,9 +11,7 @@
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if ${X11BASE} == ${LOCALBASE}
-IS_BUILTIN.renderproto=        no
-.elif !defined(IS_BUILTIN.xproto)
+.if !defined(IS_BUILTIN.renderproto)
 IS_BUILTIN.renderproto=        no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since



Home | Main Index | Thread Index | Old Index