-pthread --> ${PTHREAD_LIBS}

-D_THREAD_SAFE --> ${PTHREAD_CFLAGS}

Note: my first intention was to test this out on bento/beta, but per ade's
requiest I opted to do it quickly.

26 files changed, 26 insertions, 26 deletions

diff --git a/net/dnrd/Makefile b/net/dnrd/Makefile
index 3938364c8d36..701e0b57f7ba 100644
--- a/net/dnrd/Makefile
+++ b/net/dnrd/Makefile
@@ -23,6 +23,6 @@ post-patch:
 	@(cd ${WRKSRC} && ${SED} -e 's,%%PREFIX%%,${PREFIX},g' $F > foo && \
 		${MV} foo $F)
 .endfor
-	${PERL} -pi -e "s@cc@${CC}@g; s@-lc_r@-pthread@g" ${WRKSRC}/Makefile
+	${PERL} -pi -e "s@cc@${CC}@g; s@-lc_r@${PTHREAD_LIBS}@g" ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/net/fidelio/Makefile b/net/fidelio/Makefile
index 7576270d914c..ca327d415e56 100644
--- a/net/fidelio/Makefile
+++ b/net/fidelio/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libxml2 \
 		XML_CONFIG="${XML_CONFIG}"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 028007b8043f..5bd0cc242746 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ENV+=	GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 2d384d0a4db9..388a200f577d 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--disable-esd
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 2d384d0a4db9..388a200f577d 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--disable-esd
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index c51c4e9ec43d..916dc6132b4c 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--without-gnome
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile
index 7281d7295e1b..08133843db90 100644
--- a/net/gnomba/Makefile
+++ b/net/gnomba/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index d077ff574219..f29558638ad6 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS}"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index d077ff574219..f29558638ad6 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS}"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index d077ff574219..f29558638ad6 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS}"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index e2c4d1313f09..be244d8e6c6c 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 77dba4dc9b97..04ee0ab8718c 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" \
 USE_GMAKE=	yes
 
 pre-configure:
-	${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
+	${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in
 	${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
 
 .include <bsd.port.mk>
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 77dba4dc9b97..04ee0ab8718c 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" \
 USE_GMAKE=	yes
 
 pre-configure:
-	${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
+	${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in
 	${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
 
 .include <bsd.port.mk>
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 77dba4dc9b97..04ee0ab8718c 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" \
 USE_GMAKE=	yes
 
 pre-configure:
-	${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
+	${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in
 	${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
 
 .include <bsd.port.mk>
diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index 29219ba63c22..97ee82b14672 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .if defined(WITH_DB2)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 -D_THREAD_SAFE" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--enable-ldbm \
 			--with-ldbm-api=db2
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
index 29219ba63c22..97ee82b14672 100644
--- a/net/openldap12/Makefile
+++ b/net/openldap12/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .if defined(WITH_DB2)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 -D_THREAD_SAFE" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--enable-ldbm \
 			--with-ldbm-api=db2
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index dd23b9feb994..795d65429e76 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/spat/Makefile b/net/spat/Makefile
index ff3fcc233c4b..ea8d98c3c082 100644
--- a/net/spat/Makefile
+++ b/net/spat/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-lcompat -L${LOCALBASE}/lib"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \