- Get rid of USE_TCL_THREAD and USE_TK_THREAD usages

13 files changed, 8 insertions, 28 deletions

diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 0608a81..35861bc 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -26,7 +26,6 @@ USE_BISON=	build
 USE_TK=		84+
 USE_TCL_BUILD=	84+
 USE_TCL_RUN=	84+
-USE_TCL_THREADS=yes
 USE_JAVA=	yes
 USE_XORG=	xmu
 JAVA_VERSION=	1.6+
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index b15e993..5600bb3 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -47,7 +47,7 @@ PLIST_SUB+=	PYTHONOPT="@comment "
 USE_TCL=	84+
 TCLSUFFIX=	-${TCL_NODOT}
 MAKE_ENV+=	WITH_TCL=yes TCL_LIBDIR=${TCL_LIBDIR:Q}
-PLIST_SUB+=	TCLOPT="" TCL_VER=${TCL_VER}${_TCL_THREADS_SUFFIX}
+PLIST_SUB+=	TCLOPT="" TCL_VER=${TCL_VER}
 CPPFLAGS+=	-I${TCL_INCLUDEDIR:Q}
 SUB_FILES+=	pkgIndex.tcl
 
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 039233f..27faea4 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
-TCL_LIBRARY=	-L${LOCALBASE}/lib -ltcl${USE_TCL}${_TCL_THREADS_SUFFIX}
+TCL_LIBRARY=	-L${LOCALBASE}/lib -ltcl${USE_TCL}
 
 CONFIGURE_ARGS=	\
     BINDIR="${PREFIX}/bin" \
@@ -31,7 +31,7 @@ CONFIGURE_ARGS=	\
     TCL_VERSION="${TCL_VER}" \
     TCL_INCLUDE="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \
     TCL_LIBRARY="${TCL_LIBRARY}" \
-    TK_LIBRARY="${TCL_LIBRARY} -ltk${USE_TK}${_TCL_THREADS_SUFFIX} -lX11" \
+    TK_LIBRARY="${TCL_LIBRARY} -ltk${USE_TK} -lX11" \
     OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \
     WARNINGS=""
 
@@ -39,10 +39,4 @@ ALL_TARGET=	all strip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if defined(USE_TCL_THREADS)
-TCL_LIBRARY+=	${PTHREAD_LIBS}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile
index 0ea8b34..51b80d4 100644
--- a/graphics/aolserver-nsgd/Makefile
+++ b/graphics/aolserver-nsgd/Makefile
@@ -30,7 +30,6 @@ RUN_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
 USE_GMAKE=	yes
 
 USE_TCL=	84+
-USE_TCL_THREADS=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index 8745f59..d88c42a 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -41,7 +41,6 @@ CONFLICTS=	ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
 USE_TK=		84+
 INVALID_TK_VER =	86
 .if defined(WITH_THREADS)
-USE_TK_THREADS =	yes
 THR_CPP=	${PTHREAD_CFLAGS}
 THR_LD =	${PTHREAD_LIBS}
 .endif
@@ -58,8 +57,8 @@ post-patch:
 		-e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \
 		-e "s,^#\(DLLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/stublibs,g" \
 		-e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \
-		-e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_VER:S/.//}${_TCL_THREADS_SUFFIX}\
-		-ltcl${TCL_VER:S/.//}${_TCL_THREADS_SUFFIX} ${THR_LD}," \
+		-e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_VER:S/.//}\
+		-ltcl${TCL_VER:S/.//} ${THR_LD}," \
 		${WRKSRC}/Makefile.config
 
 	@${REINPLACE_CMD} \
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 0dae9c9..d95f364 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -84,16 +84,13 @@ CONFIGURE_ARGS+=-no-tk
 .else
 USE_TK=		84+
 INVALID_TK_VER =	86
-.if defined(WITH_THREADS)
-USE_TK_THREADS =	yes
-.endif
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 PLIST_SUB+=	TK=""
 CONFLICTS+=	ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
 CONFIGURE_ARGS+=	-tkdefs \
 			"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
-			-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||}${_TCL_THREADS_SUFFIX} \
-			-ltcl${TCL_VER:S|.||}${_TCL_THREADS_SUFFIX} ${THR_LD}"
+			-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||} \
+			-ltcl${TCL_VER:S|.||} ${THR_LD}"
 .endif
 
 .if ${ARCH} == sparc64
diff --git a/lang/xotcl/Makefile b/lang/xotcl/Makefile
index 1571549..6c73956 100644
--- a/lang/xotcl/Makefile
+++ b/lang/xotcl/Makefile
@@ -19,7 +19,6 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USE_TCL=		84+
-USE_TCL_THREADS=	yes
 
 INSTALL_TARGET=	install
 ALL_TARGET=	all test-nohttp
diff --git a/net-im/amsn/Makefile b/net-im/amsn/Makefile
index 09448e1..ebd6c28 100644
--- a/net-im/amsn/Makefile
+++ b/net-im/amsn/Makefile
@@ -36,8 +36,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_TCL=	86
 USE_TK=		86
-WITH_TCL_THREADS=	86
-WITH_TK_THREADS=	86
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/aolserver-nsmcrypt/Makefile b/security/aolserver-nsmcrypt/Makefile
index 6afd337..7b4139c 100644
--- a/security/aolserver-nsmcrypt/Makefile
+++ b/security/aolserver-nsmcrypt/Makefile
@@ -33,7 +33,6 @@ USE_GMAKE=	yes
 MAKEFILE=	Makefile.ns
 
 USE_TCL=	84+
-USE_TCL_THREADS=	yes
 
 PLIST_FILES=	${AOLSERVERBASE}/bin/nsmcrypt.so \
 		${AOLSERVERBASE}/lib/libnsmcrypt.a \
diff --git a/security/aolserver-nsmhash/Makefile b/security/aolserver-nsmhash/Makefile
index fb7bc6e..c2fa955 100644
--- a/security/aolserver-nsmhash/Makefile
+++ b/security/aolserver-nsmhash/Makefile
@@ -33,7 +33,6 @@ USE_GMAKE=	yes
 MAKEFILE=	Makefile.ns
 
 USE_TCL=	84+
-USE_TCL_THREADS=	yes
 
 PLIST_FILES=	${AOLSERVERBASE}/bin/nsmhash.so \
 		${AOLSERVERBASE}/lib/libnsmhash.a \
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index f1e24f6..b4e73cb 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -107,7 +107,6 @@ CONFIGURE_ARGS+=	--with-swig=no
 
 .if defined(WITH_TCL)
 USE_TCL=		84
-USE_TCL_THREADS=	yes
 CONFIGURE_ARGS+=	--with-tcl \
 			--with-tclcflags=-I${TCL_INCLUDEDIR} \
 			--with-tcllibs=-ltcl${TCL_VER:S/.//}
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 632d282..fa064d2 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -40,7 +40,6 @@ SUB_LIST+=	${SUB_VARS} AOLSERVERBASE="${PREFIX}/${AOLSERVERBASE}"
 PLIST_SUB+=	${SUB_VARS} AOLSERVERBASE="${AOLSERVERBASE}"
 
 USE_TCL=		84+
-USE_TCL_THREADS=	yes
 INVALID_TCL_VER=	86
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index 2e131f5..9fa6bde 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -18,7 +18,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix
 TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
 
 USE_TCL=	84+
-USE_TCL_THREADS=	yes
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes