Use ${PTHREAD_LIBS} instead of hardcoded -pthread and -lc_r in a few places.

This should help the KSE and libthr people use these applications (plus it
lets them build on -CURRENT).

14 files changed, 98 insertions, 0 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/flock/Makefile b/www/flock/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index e36098a15b47..379ce2130ce1 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -202,6 +202,13 @@ post-patch:
 			${WRKSRC}/config/autoconf.mk.in
 	@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
 		${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 .if defined(WITH_GTK2)
 	@for pcfile in ${PKGCONFIG_FILES}; do \
 	    ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index cc6b355f762d..0eea15c6840b 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -111,6 +111,13 @@ post-extract::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 8c76783a4632..be20bbbe9414 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -196,6 +196,13 @@ post-patch:
 			${WRKSRC}/config/autoconf.mk.in
 	@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
 		${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 
 post-build:
 	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index e36098a15b47..379ce2130ce1 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -202,6 +202,13 @@ post-patch:
 			${WRKSRC}/config/autoconf.mk.in
 	@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
 		${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 .if defined(WITH_GTK2)
 	@for pcfile in ${PKGCONFIG_FILES}; do \
 	    ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index e36098a15b47..379ce2130ce1 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -202,6 +202,13 @@ post-patch:
 			${WRKSRC}/config/autoconf.mk.in
 	@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
 		${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/security/coreconf/FreeBSD.mk \
+		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
+		${WRKSRC}/js/src/Makefile.in
 .if defined(WITH_GTK2)
 	@for pcfile in ${PKGCONFIG_FILES}; do \
 	    ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \