* Add ${LOCALBASE} to the list of include and lib search paths so we can

  properly detect libiconv support [1]
* Take care of a few more pthread substitutions
* Bump PORTREVISION

Reported by:	Andrew Muhametshin <andrew@trifon.ru>

9 files changed, 63 insertions, 45 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
diff --git a/www/flock/Makefile b/www/flock/Makefile
index c62839d5aa0c..2f66b52b1798 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -75,9 +75,9 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS+=			${PTHREAD_LIBS}
 
 EXTRA_SCRIPTS=		${PORTNAME}.rb
@@ -107,8 +107,10 @@ post-extract::
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \