Tue Mar 11 18:32:28 2008 UTC ()
PKG_BUILD_OPTIONS.apr is used, so make sure it is present when
this file is included again.


(joerg)
diff -r1.7 -r1.8 pkgsrc/devel/apr0/buildlink3.mk
cvs diff -r1.7 -r1.8 pkgsrc/devel/apr0/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/apr0/Attic/buildlink3.mk 2008/01/12 11:36:29 1.7
+++ pkgsrc/devel/apr0/Attic/buildlink3.mk 2008/03/11 18:32:28 1.8
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: buildlink3.mk,v 1.7 2008/01/12 11:36:29 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2008/03/11 18:32:28 joerg Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ 4APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= apr 7BUILDLINK_DEPENDS+= apr
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr}
11BUILDLINK_PACKAGES+= apr 11BUILDLINK_PACKAGES+= apr
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr
13 13
14.if !empty(APR_BUILDLINK3_MK:M+) 14.if !empty(APR_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.apr+= apr-0.9.* apr>=0.9.5.2.0.51nb1 15BUILDLINK_API_DEPENDS.apr+= apr-0.9.* apr>=0.9.5.2.0.51nb1
16BUILDLINK_ABI_DEPENDS.apr+= apr>=0.9.16.2.0.61 16BUILDLINK_ABI_DEPENDS.apr+= apr>=0.9.16.2.0.61
17BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr0 17BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr0
18BUILDLINK_INCDIRS.apr?= include/apr-0 18BUILDLINK_INCDIRS.apr?= include/apr-0
19 19
20WRAPPER_REORDER_CMDS+= reorder:l:aprutil-0:crypt 20WRAPPER_REORDER_CMDS+= reorder:l:aprutil-0:crypt
21 21
22BUILDLINK_FILES.apr+= bin/apr-config 22BUILDLINK_FILES.apr+= bin/apr-config
23BUILDLINK_FILES.apr+= bin/apu-config 23BUILDLINK_FILES.apr+= bin/apu-config
24BUILDLINK_FILES.apr+= lib/*.exp 24BUILDLINK_FILES.apr+= lib/*.exp
25 25
 26.endif # APR_BUILDLINK3_MK
 27
26.include "../../mk/bsd.fast.prefs.mk" 28.include "../../mk/bsd.fast.prefs.mk"
27 29
28pkgbase := apr 30pkgbase := apr
29.include "../../mk/pkg-build-options.mk" 31.include "../../mk/pkg-build-options.mk"
30 32
31.endif # APR_BUILDLINK3_MK 
32 
33.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4) 33.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
34. include "../../databases/db4/buildlink3.mk" 34. include "../../databases/db4/buildlink3.mk"
35.endif 35.endif
36 36
37.if !empty(PKG_BUILD_OPTIONS.apr:Mldap) 37.if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
38. include "../../databases/openldap-client/buildlink3.mk" 38. include "../../databases/openldap-client/buildlink3.mk"
39.endif 39.endif
40 40
41.include "../../converters/libiconv/buildlink3.mk" 41.include "../../converters/libiconv/buildlink3.mk"
42.include "../../textproc/expat/buildlink3.mk" 42.include "../../textproc/expat/buildlink3.mk"
43.include "../../mk/dlopen.buildlink3.mk" 43.include "../../mk/dlopen.buildlink3.mk"
44 44
45BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 45BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}