- update to 3.6.20

- misc cleanups [1]

Security:	http://www.vuxml.org/freebsd/834591a9-c82f-11e0-897d-6c626dd55a41.html
PR:		ports/159710 [1]
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru> [1]

www/firefox36/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6.18
+DISTVERSION=	3.6.20
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -38,9 +38,7 @@ EXTRA_CFLAGS=	-O2
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS_INSTALL=	firefox-3.5.*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -75,8 +73,6 @@ CFLAGS+=	-mminimal-toc
 
 WRKSRC:=	${WRKSRC}-1.9.2
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -91,13 +87,13 @@ LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		notify.1:${PORTSDIR}/devel/libnotify
 .endif
 
-post-extract::
+post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${WRKSRC}/storage/build/Makefile.in \
 		${WRKSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

www/firefox36/distinfo

@@ -1,2 +1,2 @@
-SHA256 (firefox-3.6.18.source.tar.bz2) = 6780185e0ea8e112e337c36bb7b3900ec7b72dd4445e0bd2983b748b84049e04
-SIZE (firefox-3.6.18.source.tar.bz2) = 51553263
+SHA256 (firefox-3.6.20.source.tar.bz2) = 0e8e3110c8cd1f4ad913c3c7424952b1aeebf6b375e8f6b5ccfe3e0b6d8abb18
+SIZE (firefox-3.6.20.source.tar.bz2) = 51564376