Index: devel/librcc/Makefile
===================================================================
--- devel/librcc/Makefile	(revision 308671)
+++ devel/librcc/Makefile	(working copy)
@@ -34,7 +34,7 @@
 LIBS=		-L${LOCALBASE}/lib
 
 CONFIGURE_ENV=	LIBS="${LIBS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="-pthread"
 
 OPTIONS=	BDB "Translation database support" off \
 		TRANSLATE "Online translation support" off \
Index: devel/clint/Makefile
===================================================================
--- devel/clint/Makefile	(revision 308671)
+++ devel/clint/Makefile	(working copy)
@@ -25,7 +25,6 @@
 INFO=		clint
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-pedantic||g ; \
 		 s|-ldl||g'
Index: devel/gnome-vfs-monikers/Makefile
===================================================================
--- devel/gnome-vfs-monikers/Makefile	(revision 308671)
+++ devel/gnome-vfs-monikers/Makefile	(working copy)
@@ -18,6 +18,6 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 .include <bsd.port.mk>
Index: devel/libsigcx/Makefile
===================================================================
--- devel/libsigcx/Makefile	(revision 308671)
+++ devel/libsigcx/Makefile	(working copy)
@@ -22,8 +22,7 @@
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	ac_cv_path_DOXYGEN=""
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-pthread
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
Index: devel/guichan/Makefile
===================================================================
--- devel/guichan/Makefile	(revision 308671)
+++ devel/guichan/Makefile	(working copy)
@@ -21,7 +21,7 @@
 USE_GNOME=	gnomehack
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 OPTIONS=	SDL	"Enable SDL support" On \
 		ALLEGRO	"Enable Allegro support" Off \
Index: devel/qmake/Makefile
===================================================================
--- devel/qmake/Makefile	(revision 308671)
+++ devel/qmake/Makefile	(working copy)
@@ -47,8 +47,6 @@
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|' \
 		-e 's|release|release thread|' \
-		-e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
-		-e 's|-pthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
 
Index: devel/p5-IO-AIO/Makefile
===================================================================
--- devel/p5-IO-AIO/Makefile	(revision 308671)
+++ devel/p5-IO-AIO/Makefile	(working copy)
@@ -24,7 +24,4 @@
 
 MAN3=		IO::AIO.3
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthreads*|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
Index: devel/boost-libs/Makefile
===================================================================
--- devel/boost-libs/Makefile	(revision 308671)
+++ devel/boost-libs/Makefile	(working copy)
@@ -23,9 +23,11 @@
 		serialization signals system thread unit_test_framework\
 		wave wserialization
 
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/boost-all/common.mk"
 .include "${PORTSDIR}/devel/boost-all/compiled.mk"
+USE_GCC=	4.8
 
 .if defined(WITH_ICU)
 LIB_DEPENDS+=	icuuc:${PORTSDIR}/devel/icu
@@ -95,7 +97,6 @@
 
 	@${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		-e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \
 		-e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
Index: devel/boost-libs/files/patch-tools_build_v2_tools_gcc.jam
===================================================================
--- devel/boost-libs/files/patch-tools_build_v2_tools_gcc.jam	(revision 308671)
+++ devel/boost-libs/files/patch-tools_build_v2_tools_gcc.jam	(working copy)
@@ -36,12 +36,3 @@
  toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
  
  toolset.flags gcc.compile OPTIONS <inlining>off  : -fno-inline ;
-@@ -1049,7 +1049,7 @@
-             }        
-             case *bsd :
-             {
--                option = -pthread ;
-+                option = %%PTHREAD_LIBS%% %%PTHREAD_CFLAGS%% ;
-                 # There is no -lrt on BSD.
-             }
-             case sgi :
Index: devel/boost-libs/files/patch-tools_build_v2_tools_python.jam
===================================================================
--- devel/boost-libs/files/patch-tools_build_v2_tools_python.jam	(revision 308671)
+++ devel/boost-libs/files/patch-tools_build_v2_tools_python.jam	(working copy)
@@ -1,11 +0,0 @@
---- tools/build/v2/tools/python.jam.orig	Thu Oct 16 12:42:03 2008
-+++ tools/build/v2/tools/python.jam	Tue Nov 11 23:50:21 2008
-@@ -650,7 +650,7 @@
-         case windows : return ;
- 
-         case hpux : return  <library>rt ;
--        case *bsd : return  <library>pthread <toolset>gcc:<library>util ;
-+        case *bsd : return  <library>%%PTHREAD_LIBS%% <toolset>gcc:<library>util ;
- 
-         case aix : return  <library>pthread <library>dl ;
- 
Index: devel/php5-ice/Makefile
===================================================================
--- devel/php5-ice/Makefile	(revision 308671)
+++ devel/php5-ice/Makefile	(working copy)
@@ -29,7 +29,7 @@
 LIB_VRS=	${PORTVERSION:S|.||g:C|2$||}
 PHP_MODNAME?=	IcePHP
 
-CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS}
+CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT
 .if defined(DEBUG)
 CFLAGS+=	-g
 .else
@@ -50,7 +50,6 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/php/config/Make.rules.php
 	${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
Index: devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD
===================================================================
--- devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD	(revision 308671)
+++ devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD	(working copy)
@@ -19,12 +19,12 @@
  mklib			= ar cr $(1) $(2)
  
 -BASELIBS		= -lIceUtil -lc_r
-+BASELIBS		= -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv
++BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
  LIBS			= -lIce $(BASELIBS)
  
 -ICEUTIL_OS_LIBS		= 
 -ICE_OS_LIBS		= 
-+ICEUTIL_OS_LIBS		= %%PTHREAD_LIBS%% 
++ICEUTIL_OS_LIBS		= -pthread
 +ICE_OS_LIBS		=
  
  PLATFORM_HAS_READLINE	= yes
Index: devel/present/Makefile
===================================================================
--- devel/present/Makefile	(revision 308671)
+++ devel/present/Makefile	(working copy)
@@ -21,7 +21,7 @@
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 USE_GNOME=	gnomehack intlhack ltverhack
 
 .include <bsd.port.mk>
Index: devel/libbonobo/Makefile
===================================================================
--- devel/libbonobo/Makefile	(revision 308671)
+++ devel/libbonobo/Makefile	(working copy)
@@ -32,7 +32,7 @@
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
 
 MAN1=		bonobo-activation-server.1
Index: devel/qmake4/Makefile
===================================================================
--- devel/qmake4/Makefile	(revision 308671)
+++ devel/qmake4/Makefile	(working copy)
@@ -46,8 +46,6 @@
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|' \
 		-e 's|release|release thread|' \
-		-e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
-		-e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|uic|uic-qt4|' \
 		-e 's|moc|moc-qt4|' \
 		${WRKSRC}/../mkspecs/freebsd-*/qmake.conf
Index: devel/git/Makefile
===================================================================
--- devel/git/Makefile	(revision 308671)
+++ devel/git/Makefile	(working copy)
@@ -200,7 +200,7 @@
 USE_RC_SUBR=	git_daemon
 WANT_PERL=	yes
 
-CONFIGURE_ARGS=	--enable-pthreads=${PTHREAD_LIBS}
+CONFIGURE_ARGS=	--enable-pthreads=-pthread
 
 OPTIONS_DEFINE=	GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
 		ETCSHELLS NLS
Index: devel/libdap/Makefile
===================================================================
--- devel/libdap/Makefile	(revision 308671)
+++ devel/libdap/Makefile	(working copy)
@@ -14,11 +14,10 @@
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		xml2:${PORTSDIR}/textproc/libxml2
 
-CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-zlib=/usr
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
Index: devel/ptypes/Makefile
===================================================================
--- devel/ptypes/Makefile	(revision 308702)
+++ devel/ptypes/Makefile	(working copy)
@@ -31,14 +31,13 @@
 .endif
 
 .if defined(WITH_DEBUG)
-DEBUG_FLAGS=	"-DDEBUG -g"
+DEBUG_FLAGS=	-DDEBUG -g
 .endif
 .if defined(WITH_OPTIMIZED)
-PTHREAD_CFLAGS+=-O2
+PTYPES_CFLAGS+=-O2
 .endif
 
-MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-		DEBUG_FLAGS=${DEBUG_FLAGS} PTYPES_CFLAGS="${PTYPES_CFLAGS}"
+MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}" PTYPES_CFLAGS="${PTYPES_CFLAGS}"
 
 do-install:
 	${MKDIR} ${PREFIX}/include/ptypes
Index: devel/ptypes/files/patch-src-Makefile.FreeBSD
===================================================================
--- devel/ptypes/files/patch-src-Makefile.FreeBSD	(revision 308702)
+++ devel/ptypes/files/patch-src-Makefile.FreeBSD	(working copy)
@@ -1,5 +1,5 @@
---- src/Makefile.FreeBSD.orig	2007-06-27 17:05:49.000000000 +0400
-+++ src/Makefile.FreeBSD	2007-12-14 18:43:29.000000000 +0300
+--- src/Makefile.FreeBSD.orig	2012-12-11 17:58:18.000000000 +0100
++++ src/Makefile.FreeBSD	2012-12-11 17:59:25.000000000 +0100
 @@ -12,20 +12,20 @@
  # Makefile for FreeBSD, called from ../Makefile
  #
@@ -9,13 +9,12 @@
  
  OS_CXXOPTS_ST = -Wall
 -OS_CXXOPTS = $(OS_CXXOPTS_ST) -pthread -fPIC
-+OS_CXXOPTS = $(OS_CXXOPTS_ST) $(PTHREAD_CFLAGS) -fPIC
++OS_CXXOPTS = $(OS_CXXOPTS_ST) -fPIC
  
 -# OS_LDLIBS = -lc_r
-+OS_LDLIBS = $(PTHREAD_LIBS)
++OS_LDLIBS = -pthread
  
--LIBTOOL = $(CXX) -shared -pthread
-+LIBTOOL = $(CXX) -shared $(PTHREAD_LIBS)
+ LIBTOOL = $(CXX) -shared -pthread
  SOSTRIP = strip
  
  SOEXT = so
Index: devel/ptypes/files/patch-wshare-Makefile.FreeBSD
===================================================================
--- devel/ptypes/files/patch-wshare-Makefile.FreeBSD	(revision 308702)
+++ devel/ptypes/files/patch-wshare-Makefile.FreeBSD	(working copy)
@@ -1,6 +1,6 @@
---- wshare/Makefile.FreeBSD.orig	2007-06-27 17:05:51.000000000 +0400
-+++ wshare/Makefile.FreeBSD	2007-12-14 18:39:17.000000000 +0300
-@@ -12,9 +12,9 @@
+--- wshare/Makefile.FreeBSD.orig	2012-12-11 18:00:13.000000000 +0100
++++ wshare/Makefile.FreeBSD	2012-12-11 18:00:32.000000000 +0100
+@@ -12,10 +12,10 @@
  # Makefile for FreeBSD, called from ../Makefile
  #
  
@@ -8,7 +8,9 @@
 +#CXX = g++
  
 -OS_CXXOPTS = -Wall -pthread
-+OS_CXXOPTS = -Wall $(PTHREAD_LIBS)
- # OS_LDLIBS = -lc_r
+-# OS_LDLIBS = -lc_r
++OS_CXXOPTS = -Wall
++OS_LDLIBS = -pthread
  
  include Makefile.common
+ 
Index: devel/kdevelop/Makefile
===================================================================
--- devel/kdevelop/Makefile	(revision 308671)
+++ devel/kdevelop/Makefile	(working copy)
@@ -82,8 +82,7 @@
 
 post-configure:
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' < ${FILESDIR}/kdevelop \
+		s|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/kdevelop \
 		> ${WRKDIR}/kdevelop
 	${REINPLACE_CMD} -e 's|<gdbpath>.*</gdbpath>|<gdbpath></gdbpath>|g' \
 		-e 's|<dbgshell>.*</dbgshell>|<dbgshell></dbgshell>|g' \
Index: devel/kdevelop/files/kdevelop
===================================================================
--- devel/kdevelop/files/kdevelop	(revision 308671)
+++ devel/kdevelop/files/kdevelop	(working copy)
@@ -2,6 +2,6 @@
 
 export PATH=%%LOCALBASE%%/gnu-autotools/bin:${PATH}
 export ACLOCAL_FLAGS="-I %%LOCALBASE%%/share/aclocal ${ACLOCAL_FLAGS}"
-export PTHREAD_LIBS=%%PTHREAD_LIBS%%
+export PTHREAD_LIBS="-pthread"
 
 exec "%%PREFIX%%/bin/kdevelop-bin" "$@"
Index: devel/ode/Makefile
===================================================================
--- devel/ode/Makefile	(revision 308671)
+++ devel/ode/Makefile	(working copy)
@@ -65,7 +65,7 @@
 		-e 's|^\( *CPPFLAGS=\)|#\1|' -e 's|^\( *CXXFLAGS=\)|#\1|' \
 		-e 's|CPPFLAGS+=" |CPPFLAGS="$$CPPFLAGS |' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|__isnanf||g; s|__isnan||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+	@${REINPLACE_CMD} -e 's|__isnanf||g; s|__isnan||g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^traplib_PROGRAMS / d' ${WRKSRC}/ode/src/Makefile.in
 	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
Index: devel/dbus/Makefile
===================================================================
--- devel/dbus/Makefile	(revision 308671)
+++ devel/dbus/Makefile	(working copy)
@@ -28,9 +28,8 @@
 		--with-session-socket-dir=/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs
-CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 USE_RC_SUBR=	dbus
 USE_GNOME_SUBR=	yes
Index: devel/allegro/Makefile
===================================================================
--- devel/allegro/Makefile	(revision 308671)
+++ devel/allegro/Makefile	(working copy)
@@ -93,8 +93,8 @@
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-pthreads
-CPPFLAGS+=	${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD
-LDFLAGS+=	${PTHREAD_LIBS}
+CPPFLAGS+=	-DHAVE_LIBPTHREAD
+LDFLAGS+=	-pthread
 .else
 CONFIGURE_ARGS+=--disable-pthreads
 .endif
Index: devel/gaul/Makefile
===================================================================
--- devel/gaul/Makefile	(revision 308671)
+++ devel/gaul/Makefile	(working copy)
@@ -24,11 +24,8 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lcurses
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
Index: devel/bennugd-core/Makefile
===================================================================
--- devel/bennugd-core/Makefile	(revision 308671)
+++ devel/bennugd-core/Makefile	(working copy)
@@ -34,7 +34,7 @@
 	@${CHMOD} a+x ${WRKSRC}/configure ${WRKSRC}/install-sh
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; s|-lpthread|${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/configure
 
 post-install:
Index: devel/libzrtp/Makefile
===================================================================
--- devel/libzrtp/Makefile	(revision 308671)
+++ devel/libzrtp/Makefile	(working copy)
@@ -51,7 +51,6 @@
 	@cd ${PATCH_WRKSRC}/src && \
 		${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<malloc.h>|<stdlib.h>|g" "{}" \; && \
 			${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<stdint.h>|<inttypes.h>|g" "{}" \;
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 test:
 	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/projects/gnu && make check
Index: devel/libccid/Makefile
===================================================================
--- devel/libccid/Makefile	(revision 308671)
+++ devel/libccid/Makefile	(working copy)
@@ -24,8 +24,8 @@
 		--enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial
 CONFIGURE_ENV=	LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
 		LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-pthread
 
 PLIST_SUB=	VER=${PORTVERSION}
 
Index: devel/nspr/Makefile
===================================================================
--- devel/nspr/Makefile	(revision 308671)
+++ devel/nspr/Makefile	(working copy)
@@ -23,7 +23,6 @@
 CONFIGURE_SCRIPT=../configure
 CONFIGURE_ARGS=	--srcdir=${WRKSRC:H} \
 		--with-pthreads
-CONFIGURE_ENV=	BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
 MAKE_ENV=	DIST=${WRKSRC}/dist
 
@@ -40,7 +39,7 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
 	${MKDIR} ${PREFIX}/include/nspr
@@ -64,7 +63,7 @@
 .endfor
 
 prtests:
-	${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests
+	${GMAKE} -C ${WRKSRC}/pr/tests
 	${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
 	cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
 
Index: devel/nspr/files/patch-..::configure
===================================================================
--- devel/nspr/files/patch-..::configure	(revision 308671)
+++ devel/nspr/files/patch-..::configure	(working copy)
@@ -9,16 +9,3 @@
      else
          DLL_SUFFIX=so.1.0
      fi
-@@ -6271,11 +6271,6 @@
- #define _THREAD_SAFE 1
- EOF
- 
--	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
--	        _PTHREAD_LDFLAGS="-pthread"
--	    else
--	        _PTHREAD_LDFLAGS="-lc_r"
--	    fi
- 	    ;;
-     *-netbsd*)
- 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-
Index: devel/nspr/files/patch-.._pr_tests_Makefile
===================================================================
--- devel/nspr/files/patch-.._pr_tests_Makefile	(revision 308671)
+++ devel/nspr/files/patch-.._pr_tests_Makefile	(working copy)
@@ -1,11 +0,0 @@
---- ../../nsprpub/pr/tests/Makefile.in.orig	Mon Apr 26 00:01:02 2004
-+++ ../../nsprpub/pr/tests/Makefile.in	Tue Nov 28 11:08:14 2006
-@@ -418,7 +418,7 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- ifeq ($(USE_PTHREADS),1)
--LDOPTS += -pthread
-+LDOPTS += ${PTHREAD_LIBS}
- endif
- LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR)
- endif
Index: devel/sdl12/Makefile
===================================================================
--- devel/sdl12/Makefile	(revision 308671)
+++ devel/sdl12/Makefile	(working copy)
@@ -25,11 +25,9 @@
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
-		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
-		ac_cv_header_libusbhid_h=no
+CONFIGURE_ENV=	ac_cv_header_libusbhid_h=no
 
-CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=--disable-alsa --disable-alsatest
Index: devel/sdl12/files/patch-configure
===================================================================
--- devel/sdl12/files/patch-configure	(revision 308671)
+++ devel/sdl12/files/patch-configure	(working copy)
@@ -1,13 +0,0 @@
---- configure.orig	2010-01-02 16:59:06.000000000 +0100
-+++ configure	2010-01-02 17:00:02.000000000 +0100
-@@ -27369,8 +27369,8 @@
- #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-             ;;
-         *-*-freebsd*|*-*-dragonfly*)
--            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
--            pthread_lib="-pthread"
-+            pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
-+            pthread_lib="${PTHREAD_LIBS}"
-             ;;
-         *-*-netbsd*)
-             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
Index: devel/libisofs/Makefile
===================================================================
--- devel/libisofs/Makefile	(revision 308671)
+++ devel/libisofs/Makefile	(working copy)
@@ -17,7 +17,4 @@
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
Index: devel/cppcheck/Makefile
===================================================================
--- devel/cppcheck/Makefile	(revision 308671)
+++ devel/cppcheck/Makefile	(working copy)
@@ -21,7 +21,7 @@
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=	HAVE_RULES=yes TINYXML=-ltinyxml
 
Index: devel/dbus-glib/Makefile
===================================================================
--- devel/dbus-glib/Makefile	(revision 308671)
+++ devel/dbus-glib/Makefile	(working copy)
@@ -25,7 +25,7 @@
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 PLIST_SUB=	VERSION="1.0"
 
Index: devel/gnome-vfs1/Makefile
===================================================================
--- devel/gnome-vfs1/Makefile	(revision 308751)
+++ devel/gnome-vfs1/Makefile	(working copy)
@@ -24,9 +24,8 @@
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 LATEST_LINK=	gnome-vfs1
 
Index: devel/gamin/Makefile
===================================================================
--- devel/gamin/Makefile	(revision 308671)
+++ devel/gamin/Makefile	(working copy)
@@ -22,8 +22,8 @@
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--without-python
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS+=	-DHAVE_LINUX -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
+CPPFLAGS+=	-DHAVE_LINUX -I${LOCALBASE}/include
 
 CONFLICTS=	fam-[0-9]*
 
Index: devel/glib12/Makefile
===================================================================
--- devel/glib12/Makefile	(revision 308671)
+++ devel/glib12/Makefile	(working copy)
@@ -20,17 +20,10 @@
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 MAN1=		glib-config.1
 INFO=		glib
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|-lc_r|${PTHREAD_LIBS}|g'
-
 post-install:
 	${LN} -sf ${PREFIX}/bin/glib-config ${PREFIX}/bin/glib12-config
 .for lib in glib gmodule gthread
Index: devel/glib12/files/patch-ae
===================================================================
--- devel/glib12/files/patch-ae	(revision 308671)
+++ devel/glib12/files/patch-ae	(working copy)
@@ -1,5 +1,5 @@
---- configure.orig	Tue May 11 04:55:02 1999
-+++ configure	Mon May 17 22:30:32 1999
+--- configure.orig	2001-03-15 16:44:01.000000000 +0100
++++ configure	2012-12-12 11:10:38.000000000 +0100
 @@ -587,10 +587,10 @@
  
  
@@ -15,7 +15,7 @@
  
  
  
-@@ -3472,7 +3472,7 @@
+@@ -3496,7 +3496,7 @@
  
  
  # Check for some functions
@@ -23,8 +23,8 @@
 +for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:3479: checking for $ac_func" >&5
-@@ -4365,6 +4365,12 @@
+ echo "configure:3503: checking for $ac_func" >&5
+@@ -4390,6 +4390,12 @@
  	  linux*)
  	    G_MODULE_LDFLAGS='-rdynamic'
  	    ;;
@@ -37,7 +37,7 @@
  	esac
  	LIBS_orig="$LIBS"
  	LDFLAGS_orig="$LDFLAGS"
-@@ -5057,11 +5063,17 @@
+@@ -5177,11 +5183,8 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -47,20 +47,11 @@
 -		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
 -		# -mthreads flag.
 +	*-*-freebsd*)
-+		if test x"$G_THREAD_LIBS" = x"-lc_r"; then
-+			G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+			G_THREAD_LIBS="${PTHREAD_LIBS}"
-+			case $host in
-+			*-*-freebsd4*) ;;
-+			default) have_poll=no ;;
-+			esac
-+		else
-+			G_THREAD_CFLAGS="${PTHREAD_CFLAGS} -DLINUXTHREADS"
-+		fi
++		G_THREAD_LIBS="-pthread"
  		;;
      esac
  
-@@ -5349,9 +5358,6 @@
+@@ -5469,9 +5472,6 @@
  
  
  
@@ -70,7 +61,7 @@
          case "$mutex_has_default" in
          "yes")
                  echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
-@@ -5448,6 +5454,63 @@
+@@ -5568,6 +5568,63 @@
  
  
  
Index: devel/glib20/Makefile
===================================================================
--- devel/glib20/Makefile	(revision 308754)
+++ devel/glib20/Makefile	(working copy)
@@ -47,8 +47,6 @@
 		--disable-dtrace \
 		--with-pcre=system \
 		--disable-fam
-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
Index: devel/glib20/files/patch-ae
===================================================================
--- devel/glib20/files/patch-ae	(revision 308754)
+++ devel/glib20/files/patch-ae	(working copy)
@@ -1,6 +1,6 @@
---- configure.orig	2010-09-09 12:18:43.000000000 +0200
-+++ configure	2010-09-09 12:20:56.000000000 +0200
-@@ -575,6 +575,9 @@
+--- configure.orig	2011-06-06 01:24:53.000000000 +0200
++++ configure	2012-12-12 11:23:28.000000000 +0100
+@@ -583,6 +583,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
@@ -10,7 +10,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -5187,7 +5190,7 @@
+@@ -5194,7 +5197,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,7 +19,7 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -22212,7 +22215,7 @@
+@@ -23077,7 +23080,7 @@
  fi
  done
  
@@ -28,16 +28,7 @@
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -24815,6 +24818,8 @@
-          ;;
-     esac
-   fi
-+  G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+  G_THREAD_LIBS="${PTHREAD_LIBS}"
- 
-   if test x"$G_THREAD_CFLAGS" = x; then
- 
-@@ -27415,7 +27420,7 @@
+@@ -28271,7 +28274,7 @@
  fi
  
  
Index: devel/stfl/Makefile
===================================================================
--- devel/stfl/Makefile	(revision 308671)
+++ devel/stfl/Makefile	(working copy)
@@ -32,7 +32,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\.a|.so|g;/ranlib/d;\
-	s|ar qc|$${CC} $${CFLAGS} ${PTHREAD_LIBS} $${LDLIBS} -shared -fPIC -o|;\
+	s|ar qc|$${CC} $${CFLAGS} -pthread $${LDLIBS} -shared -fPIC -o|;\
 	s|sed -r|sed -E|;s|-Os||;/gcc/d;/-MM/s|-I.|$${CFLAGS}|'\
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|alloca.h|stdlib.h|' ${WRKSRC}/widgets/*.c
Index: devel/libburn/Makefile
===================================================================
--- devel/libburn/Makefile	(revision 308671)
+++ devel/libburn/Makefile	(working copy)
@@ -17,7 +17,4 @@
 
 MAN1=		cdrskin.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
Index: devel/log4cplus/Makefile
===================================================================
--- devel/log4cplus/Makefile	(revision 308770)
+++ devel/log4cplus/Makefile	(working copy)
@@ -14,20 +14,17 @@
 MAINTAINER=	reed@reedmedia.net
 COMMENT=	A logging library for C++
 
+USE_GCC=	any
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+=	${PTHREAD_LIBS}
-CFLAGS+=	${PTHREAD_CFLAGS}
+CONFIGURE_ARGS+=--enable-threads=yes
 MAKE_JOBS_UNSAFE=	yes
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/include/log4cplus
 .if !defined(NOPORTDOCS)
Index: devel/ifd-test/Makefile
===================================================================
--- devel/ifd-test/Makefile	(revision 308671)
+++ devel/ifd-test/Makefile	(working copy)
@@ -20,8 +20,7 @@
 
 NOMAN=
 PLIST_FILES=	sbin/ifdtest
-CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV=	LIBS="-L${PREFIX}/lib -lpcsclite ${PTHREAD_LIBS}"
+MAKE_ENV=	LIBS="-L${PREFIX}/lib -lpcsclite -pthread"
 
 post-patch:
 	${REINPLACE_CMD} -e "s,LPSTR,LPTSTR,g; s,LPCSTR,LPCTSTR,g; \
Index: devel/ice/Makefile
===================================================================
--- devel/ice/Makefile	(revision 308671)
+++ devel/ice/Makefile	(working copy)
@@ -32,7 +32,7 @@
 BUILD_WRKSRC=		${WRKSRC}/cpp
 INSTALL_WRKSRC=		${WRKSRC}/cpp
 
-CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
 .if !${PORT_OPTIONS:MDEBUG}
 CFLAGS+=		-DNDEBUG
 .endif
@@ -62,8 +62,7 @@
 .endif
 
 post-patch:
-	@${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
-		s|%%PREFIX%%|${PREFIX}|g; \
+	@${SED} 's|%%PREFIX%%|${PREFIX}|g; \
 		s|%%DATADIR%%|${DATADIR}|g; \
 		s|%%DOCSDIR%%|${DOCSDIR}|g; \
 		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
Index: devel/ice/files/Make.rules.FreeBSD
===================================================================
--- devel/ice/files/Make.rules.FreeBSD	(revision 308671)
+++ devel/ice/files/Make.rules.FreeBSD	(working copy)
@@ -1,9 +1,9 @@
 mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
 
-BASELIBS		= -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv
+BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
 LIBS			= -lIce $(BASELIBS) 
 
-ICEUTIL_OS_LIBS         = %%PTHREAD_LIBS%%
+ICEUTIL_OS_LIBS         = -pthread
 
 PLATFORM_HAS_READLINE   := yes
 
Index: devel/icu/Makefile
===================================================================
--- devel/icu/Makefile	(revision 308671)
+++ devel/icu/Makefile	(working copy)
@@ -76,9 +76,6 @@
 post-patch:
 	@${REINPLACE_CMD} -e '/CXXFLAGS=/s/-ansi//' \
 		${WRKSRC}/configure
-.if defined(WITHOUT_THREADS)
-	@${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=${PTHREAD_CFLAGS},g' ${WRKSRC}/config/mh-bsd-gcc
-.endif
 	@${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,g' ${WRKSRC}/Makefile.in
 
 iotest cintltst intltest:
Index: devel/librelp/Makefile
===================================================================
--- devel/librelp/Makefile	(revision 308671)
+++ devel/librelp/Makefile	(working copy)
@@ -23,7 +23,5 @@
 post-patch:
 	@${REINPLACE_CMD} -e '/CFLAGS/s| -g||g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^PTHREADS/s|= .*|= ${PTHREAD_LIBS}|g' \
-		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>