pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/textproc/expat If the builtin expat is in /usr, not X1...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb77ee86f8f5
branches:  trunk
changeset: 509217:eb77ee86f8f5
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Mar 06 19:21:34 2006 +0000

description:
If the builtin expat is in /usr, not X11BASE, don't depend on X11 build
infrastructure.

diffstat:

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

diffs (25 lines):

diff -r 731b4b91d87c -r eb77ee86f8f5 textproc/expat/builtin.mk
--- a/textproc/expat/builtin.mk Mon Mar 06 18:50:21 2006 +0000
+++ b/textproc/expat/builtin.mk Mon Mar 06 19:21:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/03 17:47:58 tv Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/03/06 19:21:34 tv Exp $
 
 BUILTIN_PKG:=  expat
 
@@ -81,9 +81,13 @@
 .  endif
 
 .  if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
+.    if !empty(H_EXPAT:M${X11BASE}/)
 BUILDLINK_PREFIX.expat=        ${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
+.      include "../../mk/x11.buildlink3.mk"
+.      include "../../mk/x11.builtin.mk"
+.    else
+BUILDLINK_PREFIX.expat=        /usr
+.    endif
 .  endif
 
 .endif # CHECK_BUILTIN.expat



Home | Main Index | Thread Index | Old Index