[pkgsrc/trunk]: pkgsrc/textproc/expat Make it possible to use a builtin expat...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b50363d2da8b
branches:  trunk
changeset: 509120:b50363d2da8b
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Mar 03 17:47:58 2006 +0000

description:
Make it possible to use a builtin expat rooted at /usr (common to some
Linux distros).  Still preferred to be pkgsrc by default in pkgsrc/mk, but
allows PREFER.expat=native to work on such systems now.

diffstat:

 textproc/expat/builtin.mk |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r e3589d09b6b5 -r b50363d2da8b textproc/expat/builtin.mk
--- a/textproc/expat/builtin.mk Fri Mar 03 16:56:35 2006 +0000
+++ b/textproc/expat/builtin.mk Fri Mar 03 17:47:58 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/03/03 17:47:58 tv Exp $
 
 BUILTIN_PKG:=  expat
 
 BUILTIN_FIND_FILES_VAR:=       H_EXPAT
-BUILTIN_FIND_FILES.H_EXPAT=    ${X11BASE}/include/expat.h
+BUILTIN_FIND_FILES.H_EXPAT=    ${X11BASE}/include/expat.h /usr/include/expat.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
@@ -14,9 +14,13 @@
 .if !defined(IS_BUILTIN.expat)
 IS_BUILTIN.expat=      no
 .  if exists(${H_EXPAT})
+.    if !empty(H_EXPAT:M${X11BASE}/)
 BUILTIN_IMAKE_CHECK:=  expat:BuildExpatLibrary
-.    include "../../mk/buildlink3/imake-check.mk"
+.      include "../../mk/buildlink3/imake-check.mk"
 IS_BUILTIN.expat=      ${BUILTIN_IMAKE_CHECK.expat}
+.    else
+IS_BUILTIN.expat=      yes
+.    endif
 .  endif
 .endif
 MAKEVARS+=     IS_BUILTIN.expat