Tue Apr 2 20:14:32 2013 UTC ()
only use the libidn buildlink3.mk file if libidn has been one of the
options chosen.


(agc)
diff -r1.28 -r1.29 pkgsrc/www/curl/buildlink3.mk

cvs diff -r1.28 -r1.29 pkgsrc/www/curl/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/curl/buildlink3.mk 2013/02/06 23:20:52 1.28
+++ pkgsrc/www/curl/buildlink3.mk 2013/04/02 20:14:31 1.29
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.28 2013/02/06 23:20:52 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.29 2013/04/02 20:14:31 agc Exp $
2 2
3BUILDLINK_TREE+= curl 3BUILDLINK_TREE+= curl
4 4
5.if !defined(CURL_BUILDLINK3_MK) 5.if !defined(CURL_BUILDLINK3_MK)
6CURL_BUILDLINK3_MK:= 6CURL_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.curl+= curl>=7.12.3 8BUILDLINK_API_DEPENDS.curl+= curl>=7.12.3
9BUILDLINK_ABI_DEPENDS.curl+= curl>=7.28.1nb2 9BUILDLINK_ABI_DEPENDS.curl+= curl>=7.28.1nb2
10BUILDLINK_PKGSRCDIR.curl?= ../../www/curl 10BUILDLINK_PKGSRCDIR.curl?= ../../www/curl
11 11
12pkgbase:= curl 12pkgbase:= curl
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14.if !empty(PKG_BUILD_OPTIONS.curl:Mlibssh2) 14.if !empty(PKG_BUILD_OPTIONS.curl:Mlibssh2)
15. include "../../security/libssh2/buildlink3.mk" 15. include "../../security/libssh2/buildlink3.mk"
16.endif 16.endif
17.if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi) 17.if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi)
18. include "../../mk/krb5.buildlink3.mk" 18. include "../../mk/krb5.buildlink3.mk"
19.endif 19.endif
20.if !empty(PKG_BUILD_OPTIONS.curl:Mldap) 20.if !empty(PKG_BUILD_OPTIONS.curl:Mldap)
21. include "../../databases/openldap-client/buildlink3.mk" 21. include "../../databases/openldap-client/buildlink3.mk"
22.endif 22.endif
23.if !empty(PKG_BUILD_OPTIONS.curl:Mrtmp) 23.if !empty(PKG_BUILD_OPTIONS.curl:Mrtmp)
24. include "../../net/rtmpdump/buildlink3.mk" 24. include "../../net/rtmpdump/buildlink3.mk"
25.endif 25.endif
 26.if !empty(PKG_BUILD_OPTIONS.curl:Mlibidn)
 27. include "../../devel/libidn/buildlink3.mk"
 28.endif
26 29
27.include "../../devel/libidn/buildlink3.mk" 
28.include "../../devel/zlib/buildlink3.mk" 30.include "../../devel/zlib/buildlink3.mk"
29.include "../../security/openssl/buildlink3.mk" 31.include "../../security/openssl/buildlink3.mk"
30.endif # CURL_BUILDLINK3_MK 32.endif # CURL_BUILDLINK3_MK
31 33
32BUILDLINK_TREE+= -curl 34BUILDLINK_TREE+= -curl