- update to 6.0

- misc cleanups [1] [2]

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

6 files changed, 99 insertions, 55 deletions

diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 756e4831e4d0..5965cbda25e9 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	5.0
+DISTVERSION=	6.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.8.8:${PORTSDIR}/devel/nspr \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4:${PORTSDIR}/devel/libevent
@@ -39,7 +39,6 @@ HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
-MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
 
 FIREFOX_ICON=		${MOZILLA}.png
@@ -53,15 +52,12 @@ MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--with-system-libevent=${LOCALBASE}
 
 OPTIONS=	DBUS "Enable D-BUS support" on \
-		PGO "Enable Profile-Guided Optimization" off \
-		SMB "Enable smb:// URI support using gnomevfs" off
+		PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>
 
 WRKSRC:=	${WRKDIR}/mozilla-release
 
-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
@@ -104,7 +100,7 @@ pre-extract:
 	@sleep 10
 .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
@@ -113,7 +109,7 @@ post-patch:
 	@${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'
-	${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}/toolkit/library/Makefile.in \
 		${WRKSRC}/db/sqlite3/src/Makefile.in
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 7354f655ff75..5d9937368802 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-5.0.source.tar.bz2) = 6bf97d80c8296f6ac576a07a87460e68066066de8bf23afe5f271cb7e1eedf44
-SIZE (firefox-5.0.source.tar.bz2) = 68782151
+SHA256 (firefox-6.0.source.tar.bz2) = cc3fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973
+SIZE (firefox-6.0.source.tar.bz2) = 67919174
diff --git a/www/firefox-esr/files/patch-js-src-Makefile.in b/www/firefox-esr/files/patch-js-src-Makefile.in
index 1657c655d8c9..2aa090fc3b57 100644
--- a/www/firefox-esr/files/patch-js-src-Makefile.in
+++ b/www/firefox-esr/files/patch-js-src-Makefile.in
@@ -1,6 +1,25 @@
---- js/src/Makefile.in.orig	2011-03-17 18:51:39.000000000 +0100
-+++ js/src/Makefile.in	2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,9 @@
+ else
+ #CPPSRCS		+= only_on_x86.cpp
+ endif
++ifeq (amd64, $(TARGET_CPU))
++#CPPSRCS                += only_on_x86_64.cpp
++endif
+ endif
+ ifeq (arm, $(TARGET_CPU))
+ #CPPSRCS		+= only_on_arm.cpp
+@@ -739,7 +742,7 @@
  # to reliably get limit macros defined, we'd always have to define the
  # one below before including any header, but that's obscure and
  # fragile, so we do it here.
@@ -9,13 +28,14 @@
  
  INCLUDES	+= -I$(srcdir)
  
-@@ -666,7 +666,8 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS	+= -pthread
-+DEFINES		+= -DFREEBSD
-+EXTRA_LIBS	+= -pthread -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
+
+-@@ -793,7 +796,8 @@
++@@ -793,7 +796,7 @@
+  endif # WINNT
+  
+  ifeq ($(OS_ARCH),FreeBSD)
+ -EXTRA_LIBS += -pthread
+-+DEFINES           += -DFREEBSD
+ +EXTRA_LIBS       += -pthread -lc
+  endif
+  ifeq ($(OS_ARCH),IRIX)
diff --git a/www/firefox-esr/files/patch-js-src-configure.in b/www/firefox-esr/files/patch-js-src-configure.in
index e8c09d3f82ff..459ad5b98b81 100644
--- a/www/firefox-esr/files/patch-js-src-configure.in
+++ b/www/firefox-esr/files/patch-js-src-configure.in
@@ -1,32 +1,72 @@
---- js/src/configure.in.orig	2010-11-04 21:05:48.000000000 +0100
-+++ js/src/configure.in	2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
 -x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
      ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
      ;;
 -sparc*-*)
--    ENABLE_TRACEJIT=1
++arm*-*)
+     ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
 -    AC_DEFINE(JS_CPU_SPARC)
--    ;;
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
  esac
- 
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
-     ;;
diff --git a/www/firefox-esr/files/patch-js-src-jsnativestack.cpp b/www/firefox-esr/files/patch-js-src-jsnativestack.cpp
deleted file mode 100644
index 2a461af616a4..000000000000
--- a/www/firefox-esr/files/patch-js-src-jsnativestack.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- js/src/jsnativestack.cpp~
-+++ js/src/jsnativestack.cpp
-@@ -50,7 +50,8 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
-+#  include <cstddef>
- #  include <pthread_np.h>
- # endif
- 
diff --git a/www/firefox-esr/files/patch-layout_generic_Makefile.in b/www/firefox-esr/files/patch-layout_generic_Makefile.in
index a8ca386d2911..ad2bc6b2ae3d 100644
--- a/www/firefox-esr/files/patch-layout_generic_Makefile.in
+++ b/www/firefox-esr/files/patch-layout_generic_Makefile.in
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig	2011-04-26 23:21:46.000000000 +0200
-+++ layout/generic/Makefile.in	2011-04-26 23:44:09.096445086 +0200
-@@ -147,9 +147,10 @@
+--- layout/generic/Makefile.in.orig	2011-07-06 05:09:28.000000000 +0200
++++ layout/generic/Makefile.in	2011-07-06 21:49:25.105659269 +0200
+@@ -159,9 +159,10 @@
  		-I$(srcdir)/../../content/html/content/src \
  		-I$(srcdir)/../../dom/base \
- 		-I$(srcdir)/../../modules/plugin/base/src \
+ 		-I$(srcdir)/../../dom/plugins/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)