Sat Sep 13 04:46:45 2008 UTC ()
Fix logic when setting BUILTIN_PREFIX.expat.


(cube)
diff -r1.12 -r1.12.18.1 pkgsrc/textproc/expat/builtin.mk
cvs diff -r1.12 -r1.12.18.1 pkgsrc/textproc/expat/builtin.mk (expand / switch to unified diff)

--- pkgsrc/textproc/expat/builtin.mk 2006/10/26 19:13:48 1.12
+++ pkgsrc/textproc/expat/builtin.mk 2008/09/13 04:46:45 1.12.18.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.12 2006/10/26 19:13:48 wiz Exp $ 1# $NetBSD: builtin.mk,v 1.12.18.1 2008/09/13 04:46:45 cube Exp $
2 2
3BUILTIN_PKG:= expat 3BUILTIN_PKG:= expat
4 4
5BUILTIN_FIND_FILES_VAR:= H_EXPAT 5BUILTIN_FIND_FILES_VAR:= H_EXPAT
6BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h /usr/include/expat.h 6BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h /usr/include/expat.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if !defined(IS_BUILTIN.expat) 14.if !defined(IS_BUILTIN.expat)
@@ -71,23 +71,23 @@ MAKEVARS+= USE_BUILTIN.expat @@ -71,23 +71,23 @@ MAKEVARS+= USE_BUILTIN.expat
71 71
72### 72###
73### The section below only applies if we are not including this file 73### The section below only applies if we are not including this file
74### solely to determine whether a built-in implementation exists. 74### solely to determine whether a built-in implementation exists.
75### 75###
76CHECK_BUILTIN.expat?= no 76CHECK_BUILTIN.expat?= no
77.if !empty(CHECK_BUILTIN.expat:M[nN][oO]) 77.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
78 78
79. if !empty(USE_BUILTIN.expat:M[nN][oO]) 79. if !empty(USE_BUILTIN.expat:M[nN][oO])
80BUILDLINK_API_DEPENDS.expat+= expat>=1.95.4 80BUILDLINK_API_DEPENDS.expat+= expat>=1.95.4
81. endif 81. endif
82 82
83. if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) 83. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
84. if !empty(H_EXPAT:M${X11BASE}/) 84. if !empty(H_EXPAT:M${X11BASE}/*)
85BUILDLINK_PREFIX.expat= ${X11BASE} 85BUILDLINK_PREFIX.expat= ${X11BASE}
86. include "../../mk/x11.buildlink3.mk" 86. include "../../mk/x11.buildlink3.mk"
87. include "../../mk/x11.builtin.mk" 87. include "../../mk/x11.builtin.mk"
88. else 88. else
89BUILDLINK_PREFIX.expat= /usr 89BUILDLINK_PREFIX.expat= /usr
90. endif 90. endif
91. endif 91. endif
92 92
93.endif # CHECK_BUILTIN.expat 93.endif # CHECK_BUILTIN.expat