Do the minimum to solve this problem with non-threaded Tcl/Tk.

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.8
diff -N -u -p Makefile
--- Makefile    21 Nov 2009 02:50:23 -0000      1.8
+++ Makefile    30 Dec 2009 01:38:47 -0000
@@ -3,7 +3,7 @@
 COMMENT =              Tool Command Language

 DISTNAME =             tcl8.5.8
-PKGNAME =              tcl-8.5.8
+PKGNAME =              tcl-8.5.8p0
 SHARED_LIBS =          tcl85 0.5
 CATEGORIES =           lang lang/tcl
 HOMEPAGE =             http://www.tcl.tk/
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP =  Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes

-WANTLIB =              c m
+WANTLIB =              c m pthread

 MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=tcl/}
 DISTFILES =            ${DISTNAME}-src.tar.gz
@@ -48,7 +48,9 @@ FLAVOR ?=

 .if ${FLAVOR:L:Mthreaded}
 CONFIGURE_ARGS +=      --enable-threads
-WANTLIB +=             pthread
+.else
+MAKE_FLAGS +=          APP_CC_SWITCHES='$$(CC_SWITCHES) -pthread' \
+                       LDFLAGS_OPTIMIZE="-pthread"
 .endif

 WRKSRC =               ${WRKDIST}/unix





Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/Makefile,v
retrieving revision 1.12
diff -N -u -p Makefile
--- Makefile    21 Nov 2009 02:50:23 -0000      1.12
+++ Makefile    30 Dec 2009 01:39:20 -0000
@@ -3,7 +3,7 @@
 COMMENT =              graphical toolkit for Tcl

 DISTNAME =             tk8.5.8
-PKGNAME =              tk-8.5.8
+PKGNAME =              tk-8.5.8p0
 SHARED_LIBS =          tk85 0.5
 CATEGORIES =           x11 x11/tk
 HOMEPAGE =             http://www.tcl.tk/
@@ -16,7 +16,7 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes

 WANTLIB =              X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig 
freetype m z \
-                       pthread-stubs xcb
+                       pthread-stubs xcb pthread

 MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=tcl/}
 DISTFILES =            ${DISTNAME}-src.tar.gz
@@ -55,10 +55,11 @@ FLAVOR ?=

 .if ${FLAVOR:L:Mthreaded}
 CONFIGURE_ARGS +=      --enable-threads
-WANTLIB +=             pthread
 LIB_DEPENDS =          tcl85:tcl->=8.5.8,<8.5.9-${FLAVOR}:lang/tcl/8.5
 .else
 LIB_DEPENDS =          tcl85:tcl->=8.5.8,<8.5.9:lang/tcl/8.5
+MAKE_FLAGS +=          APP_CC_SWITCHES='$$(CC_SWITCHES_NO_STUBS) -pthread' \
+                       LDFLAGS_OPTIMIZE="-pthread"
 .endif

 WRKSRC =               ${WRKDIST}/unix


Reply via email to