Tue Oct 7 18:03:55 2008 UTC ()
Don't set BUILDLINK_PREFIX in builtin.mk if we're not using a built-in
version.  D'oh.


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

--- pkgsrc/textproc/expat/builtin.mk 2008/10/05 21:36:34 1.13
+++ pkgsrc/textproc/expat/builtin.mk 2008/10/07 18:03:55 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:34 cube Exp $ 1# $NetBSD: builtin.mk,v 1.14 2008/10/07 18:03:55 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)
@@ -68,22 +68,22 @@ USE_BUILTIN.expat!= \ @@ -68,22 +68,22 @@ USE_BUILTIN.expat!= \
68. endif # PREFER.expat 68. endif # PREFER.expat
69.endif 69.endif
70MAKEVARS+= USE_BUILTIN.expat 70MAKEVARS+= 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 
82 
83. if !empty(H_EXPAT:M${X11BASE}/*) 
84. include "../../mk/x11.builtin.mk" 
85. else 81. else
 82. if !empty(H_EXPAT:M${X11BASE}/*)
 83. include "../../mk/x11.builtin.mk"
 84. else
86BUILDLINK_PREFIX.expat= /usr 85BUILDLINK_PREFIX.expat= /usr
 86. endif
87. endif 87. endif
88 88
89.endif # CHECK_BUILTIN.expat 89.endif # CHECK_BUILTIN.expat