Reverse previous commit (disabling thread-safety), which was poorly though

through, unacceptably breaks threaded apps, and was made without consulting
the package's maintainer.

To quote my mail to packages@:

I am reversing this change.

With this change, tcl is _not_ usable in threaded apps, while without
this change, tcl is perfectly usable in non-threaded apps.

The fix for a package which is incorrectly written is not to break the
package it depends on, but do your job correctly when writing the
package.

With buildlink3, this is mind-numbingly easy to do.

That you neither contacted the maintainer of this package, nor did the
buildlink and dependent package changes which your change requires shows
that you have not really thought this through.

So, as I said, I am reversing this change.  Fix your own package, don't
break others.

4 files changed, 12 insertions, 17 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index aaa76838568..5ca73ef6484 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2004/06/15 16:17:48 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2004/06/15 16:39:12 jwise Exp $
 #
 
 DISTNAME=		tcl8.4.6-src
 PKGNAME=		tcl-8.4.6
-PKGREVISION=		5
+PKGREVISION=		4
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -29,9 +29,7 @@ INSTALL_TARGET=		install
 # install to avoid overwriting existing manpages in ${PREFIX}/man.
 #
 CONFIGURE_ARGS+=	--mandir=${WRKDIR}/man
-# can't enable threads until all potential users of libtcl.so
-#  link in libpthreads
-#CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 
 # Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
 CONFIGURE_ENV+=		TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
@@ -45,8 +43,7 @@ CONFIGURE_ENV+=		TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
 CONFIGURE_ENV+=		COMPILER_OPTIMIZATION_BUG=YES
 .endif
 
-# see above
-#.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 # Modify mkLinks script to remove the short-filename manpage if it was
 # linked to a longer filename.
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index df6042eae92..f0bcc275b48 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/06/15 16:17:48 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/06/15 16:39:12 jwise Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
 BUILDLINK_PACKAGES+=	tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+=		tcl>=8.4.6nb5
+BUILDLINK_DEPENDS.tcl+=		tcl>=8.4.6nb1
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
 
 BUILDLINK_FILES.tcl=	bin/tclsh*
@@ -26,7 +26,6 @@ TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 
 .endif	# TCL_BUILDLINK3_MK
 
-# see comment in Makefile
-#.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 045ffefecdc..8e4b2445036 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2004/06/15 16:17:48 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2004/06/15 16:39:12 jwise Exp $
 
 DISTNAME=	tk8.4.6-src
 PKGNAME=	tk-8.4.6
-PKGREVISION=	4
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -15,8 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-# see comment in lang/tcl/Makefile
-#CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	--enable-threads
 MAKE_ENV+=		TOUCH="${TOUCH}"
 
 USE_X11=		yes
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 1d84c448f55..68667a850a4 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/06/15 16:17:48 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/06/15 16:39:12 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.6nb4
+BUILDLINK_DEPENDS.tk+=		tk>=8.4.6nb1
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
 BUILDLINK_FILES.tk=	bin/wish*