[pkgsrc/trunk]: pkgsrc/x11/xextensions Revision 1.2 of this file added a chec...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/badaccc12c9d
branches:  trunk
changeset: 495485:badaccc12c9d
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Jun 11 08:49:33 2005 +0000

description:
Revision 1.2 of this file added a check for the presence of xextensions.pc
to decide whether the builtin version was enough or not.  This check was
removed in 1.3 during the conversion to the new builtin structure, hence
breaking, at least, compositeext (on which many other packages depend).
Given this, readd the check.

diffstat:

 x11/xextensions/builtin.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 21fb422dcd3a -r badaccc12c9d x11/xextensions/builtin.mk
--- a/x11/xextensions/builtin.mk        Sat Jun 11 05:22:03 2005 +0000
+++ b/x11/xextensions/builtin.mk        Sat Jun 11 08:49:33 2005 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:32 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2005/06/11 08:49:33 jmmv Exp $
 
 BUILTIN_PKG:=  xextensions
 
-BUILTIN_FIND_FILES_VAR:=               H_XEXTENSIONS
+BUILTIN_FIND_FILES_VAR:=               H_XEXTENSIONS PC_XEXTENSIONS
 BUILTIN_FIND_FILES.H_XEXTENSIONS=      \
        ${X11BASE}/include/X11/extensions/extutil.h
+BUILTIN_FIND_FILES.PC_XEXTENSIONS=     \
+       ${X11BASE}/lib/pkgconfig/xextensions.pc
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
@@ -19,7 +21,7 @@
 # we'll consider this X11 package to be built-in even if it's a part
 # of one of the pkgsrc-installed X11 distributions.
 #  
-.  if exists(${H_XEXTENSIONS})
+.  if exists(${H_XEXTENSIONS}) && exists(${PC_XEXTENSIONS})
 IS_BUILTIN.xextensions=        yes
 .  endif
 .endif