17 files changed, 32 insertions, 39 deletions

diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index f4127cff4749..0ae1599b30e3 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -51,7 +51,7 @@ OPTIONS_DEFAULT=	OPTIMIZATION
 .include "${.CURDIR}/Makefile.man"
 .include <bsd.port.pre.mk>
 
-EXTRA_LIBS=	${PTHREAD_LIBS}
+EXTRA_LIBS=	-pthread
 
 .if ${PORT_OPTIONS:MOPTIMIZATION}
 CMAKE_BUILD_TYPE=Release
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 475b46580c42..62bb8299532c 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -93,15 +93,10 @@ pre-everything::
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
-	s+%%PTHREAD_CFLAGS%%+-DUSE_MT ${PTHREAD_CFLAGS}+g; \
-	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g; \
 	s+%%BLAS_LIBS%%+${BLAS_LIBS}+ ; \
 	s+%%LAPACK_LIBS%%+${LAPACK_LIBS}+ ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
 		${WRKSRC}/ccx_${PORTVERSION}/src/Makefile
-	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g; \
-	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' \
-		${WRKSRC}/cgx_${PORTVERSION}/src/Makefile
 	@${REINPLACE_CMD} -e 's/c++/${CXX}/g;' \
 		${WRKSRC}/libSNL/src/makefile
 	@${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \
diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile
index 719ef94defd3..80cc37a11c3d 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -27,7 +27,7 @@
  
  ccx_2.4: $(OCCXMAIN) ccx_2.4.a  $(LIBS)
 -	./date.pl; $(CC) $(CFLAGS) -c ccx_2.4.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.4.a  -lpthread  $(LIBS)
-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.4.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.4.a %%PTHREAD_LIBS%%  $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.4.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.4.a -lpthread  $(LIBS)
  
  ccx_2.4.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index 107b36ed4af9..d0d62e44afec 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -55,8 +55,7 @@ post-patch:
 		${WRKSRC}/src/include/config.h
 	@${REINPLACE_CMD} -e 's|/usr/share/electric/lib|${DATADIR}/lib|; \
 		s|/usr/share/electric/doc|${DOCSDIR}|; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g; \
-		s|@PTHREAD_LIBS@|${PTHREAD_LIBS:S/"//g}|' \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/configure
 .for FEATURE in ${FEATURES}
diff --git a/cad/electric/files/patch-Makefile.in b/cad/electric/files/patch-Makefile.in
index 832ce013fc35..53fb875bbe81 100644
--- a/cad/electric/files/patch-Makefile.in
+++ b/cad/electric/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Jul 16 05:59:50 2004
-+++ Makefile.in	Fri Jul 14 13:19:06 2006
+--- Makefile.in.orig	2004-07-16 03:59:50.000000000 +0200
++++ Makefile.in	2013-02-07 14:08:44.000000000 +0100
 @@ -1,14 +1,14 @@
  ########################################################## USING QT
  ##### If using Qt, uncomment these five lines
@@ -79,12 +79,19 @@
  
  ##### If debugging, uncomment this line (modify debug options to taste)
  # DEBUG = -g3
-@@ -801,7 +802,7 @@
-     $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@
+@@ -796,12 +797,12 @@
+ BUILDOPTS = $(DEBUG) $(ARCHFLAGS) 
+ BUILDDIR = obj
+ HDS = src/include
+-CFLAGS = $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \
++CFLAGS += $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \
+     $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(SIMIRSIM_CFLAGS) \
+-    $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@
++    $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS)
  XCFLAGS = $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS)
  LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \
 -    $(LANGTCLLIBS) $(LANGJAVALIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-+    $(LANGTCLLIBS) $(LANGJAVALIBS) $(INTERNATIONALLIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
++    $(LANGTCLLIBS) $(LANGJAVALIBS) $(INTERNATIONALLIBS) -pthread
  FIND = find
  INSTALL = install
  DESTDIR =
diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index 2c8831848231..334148243f35 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -62,7 +62,6 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|FreeBSD-\*|*-*-freebsd*| ; \
 		 s|wish |${WISH:T} | ; \
-		 s|-lpthread|${PTHREAD_LIBS}| ; \
 		 s|"-fpic"|"-fPIC"| ; \
 		 /-l\/usr\/X11R6\/include/d' ${CONFIGURE_WRKSRC}/configure
 
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index ae5e423ce807..c2839aec100d 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -40,9 +40,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|%%LOCALBASE%%|${LOCALBASE}| ; \
-		 s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}| ; \
-		 s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' ${WRKSRC}/config.mk
+		's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/config.mk
 	@${REINPLACE_CMD} -e \
 		's|+= -g|+=| ; \
 		 s|@$$(CXX)|$$(CXX)| ; \
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 3044272eeb54..e3a2a033f06a 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -52,8 +52,7 @@ SUB_FILES=	pkg-message
 MAKE_ENV=	TK_VER=${TK_VER} TCL_VER=${TCL_VER}	\
 		TCL_INCLUDEDIR="${TCL_INCLUDEDIR}"	\
 		TK_INCLUDEDIR="${TK_INCLUDEDIR}"	\
-		MACHINE=${MACHINE} MAKE=${GMAKE}	\
-		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
+		MACHINE=${MACHINE} MAKE=${GMAKE}
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
diff --git a/cad/opencascade-tutorial/Makefile b/cad/opencascade-tutorial/Makefile
index 7c6b4c96ff12..bfe99fb30545 100644
--- a/cad/opencascade-tutorial/Makefile
+++ b/cad/opencascade-tutorial/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-gl-include=${LOCALBASE}/include	\
 		--with-qt-dir=${QTDIR}			\
 		--enable-qt-mt				\
 		--with-cascade-dir=${CASROOT}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-pthread
 
 WRKSRC=		${WRKDIR}/opencascade-${PORTVERSION}/samples/tutorial
 CONFIGURE_LOG=	adm/${OPSYS}/config.log
@@ -50,8 +50,7 @@ PLIST_SUB=	INSTDIR=${LINSTDIR}
 
 pre-configure:
 	${CHMOD} a+x ${WRKSRC}/${CONFIGURE_SCRIPT}
-	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'	\
-		-e 's|/usr/X11R6|${LOCALBASE}|'			\
+	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|'	\
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 35861bcc1409..9154c5b5a545 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -62,10 +62,11 @@ CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR}				\
 		--enable-production=yes
 CONFIGURE_ENV=	ARCH=${ARCH} LD=${CXX}
 CPPFLAGS+=	${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include	\
-		-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
+		-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
+		-DUSE_INTERP_RESULT
 # We strip the libs
 MAKE_ENV=	INSTALL_STRIP_FLAG=-s OCC_BUILDDIR="${PATCH_WRKSRC}"	\
-		OCC_INSTALLDIR="${OCCROOT}" PTHREAD_LIBS="${PTHREAD_LIBS}" LD=${CXX}
+		OCC_INSTALLDIR="${OCCROOT}" LD=${CXX}
 USE_LDCONFIG=	yes
 
 STL_COMPILER?=	gcc
@@ -140,9 +141,6 @@ pre-configure:
 		${WRKSRC}/src/WOKBuilderDef/CMPLRS.edl	\
 		${WRKSRC}/src/WOKBuilderDef/LDEXE.edl	\
 		${WRKSRC}/src/WOKBuilderDef/LDSHR.edl
-	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'	\
-		${WRKSRC}/${CONFIGURE_SCRIPT}		\
-		${WRKSRC}/src/WOKBuilderDef/CSF.edl
 
 pre-install:
 	${MKDIR} ${CASROOT}
diff --git a/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in b/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in
index 161e95122605..7673cf582d91 100644
--- a/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in
+++ b/cad/opencascade/files/patch-ros_adm_make_DRAWEXE_Makefile.in
@@ -5,7 +5,7 @@
  DRAWEXE$(EXEEXT): $(DRAWEXE_OBJECTS) $(DRAWEXE_DEPENDENCIES) 
  	@rm -f DRAWEXE$(EXEEXT)
 -	$(CXXLINK) $(DRAWEXE_LDFLAGS) $(DRAWEXE_OBJECTS) $(DRAWEXE_LDADD) $(LIBS)
-+	$(CXXLINK) $(DRAWEXE_LDFLAGS) $(DRAWEXE_OBJECTS) $(DRAWEXE_LDADD) $(LIBS) $(PTHREAD_LIBS)
++	$(CXXLINK) $(DRAWEXE_LDFLAGS) $(DRAWEXE_OBJECTS) $(DRAWEXE_LDADD) $(LIBS) -pthread
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
diff --git a/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in b/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in
index 7596d5ca61a2..3e9250052aad 100644
--- a/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in
+++ b/cad/opencascade/files/patch-ros_adm_make_WOKSH_Makefile.in
@@ -5,7 +5,7 @@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@
-+LIBS = @LIBS@ $(PTHREAD_LIBS)
++LIBS = @LIBS@ -pthread
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 96933b72a8c8..018ccbc832f2 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE=	yes
 USE_TK_RUN=	83
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV+=	INSTALL_DATA="/usr/bin/install ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-pthread -L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} --disable-nls
 PORTDOCS= pcb.html pcb.pdf refcard.pdf pad.png puller.png thermal.png	\
 	examples tutorial gcode.png gcode_control_img.png		\
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index dd4aad2f68f0..e9edf114c12c 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -55,7 +55,7 @@ PKGMESSAGE=	${WRKSRC}/LICENSE_en.txt
 LIB_DEPENDS+=	mpich.2:${PORTSDIR}/net/mpich2
 
 ALL_TARGET+=	ptscotch
-MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin PTHREAD_LIBS=${PTHREAD_LIBS}
+MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin
 
 INCS+=		ptscotch.h ptscotchf.h
 LIBS+=		libptesmumps.a libptscotch.a libptscotcherr.a libptscotcherrexit.a	\
@@ -83,7 +83,7 @@ pre-everything::
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e 's/-lthread/$(PTHREAD_LIBS)/;s/-lpthread/$(PTHREAD_LIBS)/'	\
+	${REINPLACE_CMD} -e 's/-lthread/-pthread/;s/-lpthread/-pthread/'	\
 		-e 's/CLIBFLAGS	=/CLIBFLAGS	= -fPIC/'	\
 		${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd
 	${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd	\
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index 8b0fe78dd7ae..2bf59c63a506 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -24,7 +24,7 @@ LICENSE=	GPLv2
 USE_XORG=	xmu xt
 USE_GL=		glut
 
-CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CFLAGS+=	-I${LOCALBASE}/include
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ALL_TARGET=	everything
 MAKE_JOBS_UNSAFE=	yes
@@ -40,7 +40,7 @@ PLIST_FILES=	${EXEC:T:S/^/bin\//}
 post-patch:
 	@(${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
 		${REINPLACE_CMD} -E -e "s|^CC = .*|CC = ${CC} ${CFLAGS}|g" \
-			-e "s|-lglut|-lglut ${PTHREAD_LIBS}|g" \
+			-e "s|-lglut|-lglut -pthread|g" \
 			-e "s|/usr/local|${LOCALBASE}|g" \
 			-e "s|/usr/X/|${LOCALBASE}/|g" \
 			-e "s|/usr/X11/|${LOCALBASE}/|g" \
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index 7929dd0be1d3..c7e0aff14963 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -63,7 +63,6 @@ GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 pre-build:
 	@${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g ; \
-	s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g ; s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g ; \
 	s,%%SUPERLU%%,${SUPERLU},g ; \
 	s,%%FORTRANLIBS%%,${FORTRANLIBS},g ; \
 	s,%%GCCLIBDIR%%,${GCCLIBDIR},g ; \
diff --git a/cad/tochnog/files/patch-makefile b/cad/tochnog/files/patch-makefile
index ae35e6b46f44..09657bba744c 100644
--- a/cad/tochnog/files/patch-makefile
+++ b/cad/tochnog/files/patch-makefile
@@ -82,9 +82,9 @@
 +	make tochnog \
 +	"SYS_FILE=sysposix" \
 +	"OBJ=o" \
-+	"COMPILER_FLAGS= -c ${CFLAGS} %%PTHREAD_CFLAGS%% -D_REENTRANT $(ALL_INCLUDE)" \
++	"COMPILER_FLAGS= -c ${CFLAGS} -D_REENTRANT $(ALL_INCLUDE)" \
 +	"LINK_FLAGS_BEFORE=" \
-+	"LINK_FLAGS_AFTER=  $(ALL_LIB) %%PTHREAD_LIBS%% -lm -o tochnog"
++	"LINK_FLAGS_AFTER=  $(ALL_LIB) -pthread -lm -o tochnog"
  
  # multi processor linux; gnu gcc compiler
  linux: