diff options
| author | jwise <jwise> | 2004-03-24 15:24:36 +0000 |
|---|---|---|
| committer | jwise <jwise> | 2004-03-24 15:24:36 +0000 |
| commit | 4c55cda1aa586f0ed9082d89c867759933d2cf4b (patch) | |
| tree | 15a1d3edc1bb24b53b1e6e73c0c6f854158901fa /x11/tk | |
| parent | c577b72ea463e6329257b6c3aa042aefca1a0dde (diff) | |
| download | pkgsrc-4c55cda1aa586f0ed9082d89c867759933d2cf4b.tar.gz | |
Now that we build tcl/tk with thread safety enabled, pull pthread buildlink
glue into the tcl buildlink glue.
Also, update buildlink dependencies appropriately.
Pointed out by wiz@netbsd.org.
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/buildlink2.mk | 5 | ||||
| -rw-r--r-- | x11/tk/buildlink3.mk | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/x11/tk/buildlink2.mk b/x11/tk/buildlink2.mk index 50f1f162e8b..439c1e88f27 100644 --- a/x11/tk/buildlink2.mk +++ b/x11/tk/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.8 2004/03/08 20:29:43 minskim Exp $ +# $NetBSD: buildlink2.mk,v 1.9 2004/03/24 15:24:36 jwise Exp $ .if !defined(TK_BUILDLINK2_MK) TK_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= tk -BUILDLINK_DEPENDS.tk?= tk>=8.4.5 +BUILDLINK_DEPENDS.tk?= tk>=8.4.6nb1 BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk EVAL_PREFIX+= BUILDLINK_PREFIX.tk=tk @@ -20,6 +20,7 @@ BUILDLINK_FILES.tk+= lib/libtkstub84.* USE_X11= YES .include "../../lang/tcl/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" # Make "-ltk" resolve into "-ltk84", so that we don't need to patch so # many Makefiles. diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index 97b6e511321..c787a5c40e0 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:17 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/03/24 15:24:36 jwise Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk} BUILDLINK_PACKAGES+= tk .if !empty(TK_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.tk+= tk>=8.4.5 +BUILDLINK_DEPENDS.tk+= tk>=8.4.6nb1 BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk BUILDLINK_FILES.tk= bin/wish* |