Wed Dec 19 14:58:45 2012 UTC ()
Add conditional xft2 include, requested by joerg.


(wiz)
diff -r1.27 -r1.28 pkgsrc/x11/tk/buildlink3.mk
cvs diff -r1.27 -r1.28 pkgsrc/x11/tk/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/tk/buildlink3.mk 2012/08/21 21:32:34 1.27
+++ pkgsrc/x11/tk/buildlink3.mk 2012/12/19 14:58:45 1.28
@@ -1,33 +1,39 @@ @@ -1,33 +1,39 @@
1# $NetBSD: buildlink3.mk,v 1.27 2012/08/21 21:32:34 marino Exp $ 1# $NetBSD: buildlink3.mk,v 1.28 2012/12/19 14:58:45 wiz Exp $
2 2
3BUILDLINK_TREE+= tk 3BUILDLINK_TREE+= tk
4 4
5.if !defined(TK_BUILDLINK3_MK) 5.if !defined(TK_BUILDLINK3_MK)
6TK_BUILDLINK3_MK:= 6TK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.tk+= tk>=8.5.7 8BUILDLINK_API_DEPENDS.tk+= tk>=8.5.7
9BUILDLINK_ABI_DEPENDS.tk+= tk>=8.5.7 9BUILDLINK_ABI_DEPENDS.tk+= tk>=8.5.7
10BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk 10BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
11 11
12BUILDLINK_FILES.tk+= bin/wish* 12BUILDLINK_FILES.tk+= bin/wish*
13# 13#
14# Make "-ltk" and "-ltk8.5" resolve into "-ltk85", so that we don't 14# Make "-ltk" and "-ltk8.5" resolve into "-ltk85", so that we don't
15# need to patch so many Makefiles. 15# need to patch so many Makefiles.
16# 16#
17BUILDLINK_TRANSFORM+= l:tk:tk85 17BUILDLINK_TRANSFORM+= l:tk:tk85
18BUILDLINK_TRANSFORM+= l:tk8.5:tk85 18BUILDLINK_TRANSFORM+= l:tk8.5:tk85
19 19
20TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh 20TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
21 21
22_TOOLS_USE_PKGSRC.wish= yes 22_TOOLS_USE_PKGSRC.wish= yes
23 23
24FIND_PREFIX:= TOOLS_PREFIX.wish=tk 24FIND_PREFIX:= TOOLS_PREFIX.wish=tk
25.include "../../mk/find-prefix.mk" 25.include "../../mk/find-prefix.mk"
26WISH= ${TOOLS_PREFIX.wish}/bin/wish 26WISH= ${TOOLS_PREFIX.wish}/bin/wish
27 27
 28pkgbase := tk
 29.include "../../mk/pkg-build-options.mk"
 30
 31.if !empty(PKG_BUILD_OPTIONS.tk:Mxft2)
 32. include "../../x11/libXft/buildlink3.mk"
 33.endif
 34
28.include "../../lang/tcl/buildlink3.mk" 35.include "../../lang/tcl/buildlink3.mk"
29.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
30.include "../../x11/libX11/buildlink3.mk" 37.include "../../x11/libX11/buildlink3.mk"
31.endif # TK_BUILDLINK3_MK 38.endif # TK_BUILDLINK3_MK
32 39
33BUILDLINK_TREE+= -tk