Pullup ticket #4168 - requested by martin

www/firefox: build fix

Revisions pulled up:
- www/firefox/distinfo                                          1.106
- www/firefox/patches/patch-mb                                  1.5
- www/firefox/patches/patch-xa                                  deleted

---
   Module Name:	pkgsrc
   Committed By:	martin
   Date:		Tue Jul  2 07:18:18 UTC 2013

   Modified Files:
   	pkgsrc/www/firefox: distinfo
   	pkgsrc/www/firefox/patches: patch-mb
   Removed Files:
   	pkgsrc/www/firefox/patches: patch-xa

   Log Message:
   Another minor mishap from the sparc64 patches (now the package actually
   builds on sparc64)

3 files changed, 10 insertions, 130 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index aa71b48e1ca..141b1bb3a1c 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.105 2013/07/01 13:53:27 martin Exp $
+$NetBSD: distinfo,v 1.105.2.1 2013/07/03 08:45:27 tron Exp $
 
 SHA1 (firefox-22.0.source.tar.bz2) = db2d5b028b6ea95b5f006b46e153f50f7a52bf80
 RMD160 (firefox-22.0.source.tar.bz2) = 9f206a786fcc366cb0ea03c4a5140809d1402272
@@ -53,7 +53,7 @@ SHA1 (patch-js_src_jscompartment.h) = 33708bc67f1c05f776dbb9c048ddf91f0eea25ca
 SHA1 (patch-js_src_jstypedarray.cpp) = 520d085871dfd640bbd693f59424612d3f0f539e
 SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = 77685fc735bde4e592a3ddc29fa05b13a694fa8a
 SHA1 (patch-js_src_vm_ObjectImpl-inl.h) = e6dda53d189c1e2e24735ea17d6b779d933342d7
-SHA1 (patch-mb) = 4e268868b6a526a0911d677875bda7ef975afc1c
+SHA1 (patch-mb) = 43500266e3a918ee311396c20e7edf1e2efafd94
 SHA1 (patch-md) = 7fd607a3edd2ea5f7a5671fc6d06fba69c46c36f
 SHA1 (patch-me) = 2ff755782bd35caded8934000d039976dad44103
 SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = 061b46d1ee33c055a5b39e6b20f47b80bcde0c86
@@ -116,7 +116,6 @@ SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 15e9466d60e60f93a27fe23aadfea6e1d59ad0bc
 SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
 SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e
-SHA1 (patch-xa) = 9182485283599a96663358bdc680c5cdb1d94a78
 SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
 SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
 SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
diff --git a/www/firefox/patches/patch-mb b/www/firefox/patches/patch-mb
index 03f87470f4c..a896b033d9e 100644
--- a/www/firefox/patches/patch-mb
+++ b/www/firefox/patches/patch-mb
@@ -1,8 +1,8 @@
-$NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
+$NetBSD: patch-mb,v 1.4.2.1 2013/07/03 08:45:27 tron Exp $
 
 --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2013-02-15 21:15:14.000000000 +0000
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -50,7 +50,7 @@ endif
+@@ -49,7 +49,7 @@ endif
  endif
  endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
  endif
-@@ -59,7 +59,7 @@ endif
+@@ -58,7 +58,7 @@ endif
  # New code for Linux, et. al., with gcc
  # Migrate other platforms here after testing
  #
@@ -20,7 +20,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
  # Linux/x86-64
  ifeq (x86_64,$(OS_TEST))
  CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -158,7 +158,7 @@ endif
+@@ -157,7 +157,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -29,7 +29,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -215,7 +215,7 @@ endif
+@@ -214,7 +214,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -38,7 +38,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -287,7 +287,7 @@ endif
+@@ -286,7 +286,7 @@ endif
  #
  # NetBSD/PPC
  #
@@ -47,7 +47,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
  CPPSRCS		:= xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
  endif
-@@ -346,6 +346,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
+@@ -345,6 +345,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
  ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  endif
  #
@@ -55,7 +55,7 @@ $NetBSD: patch-mb,v 1.4 2013/06/21 23:11:42 ryoon Exp $
 +#
 +ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
 +CPPSRCS                := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_openbsd.cpp
-+ASFILES                := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
++ASFILES                := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_netbsd.s
 +endif
 +#
  # Solaris/SPARC
diff --git a/www/firefox/patches/patch-xa b/www/firefox/patches/patch-xa
deleted file mode 100644
index 3b4141a0504..00000000000
--- a/www/firefox/patches/patch-xa
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-xa,v 1.3 2013/05/23 13:12:13 ryoon Exp $
-
-NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig	2013-01-09 15:25:54.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s
-@@ -0,0 +1,112 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ *
-+ * The contents of this file are subject to the Netscape Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation.  Portions created by Netscape are
-+ * Copyright (C) 1998 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s): 
-+ */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+        .global NS_InvokeByIndex_P
-+        .type   NS_InvokeByIndex_P, #function
-+/*
-+    NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+/*
-+ * Note:  To simplify stack handling we allocate an extra stack
-+ *	frame here.  In principle invoke_copy_to_stack() could
-+ *	save the parameters our caller's frame and we could
-+ *	reclaim the stackframe and do a tail call to the
-+ *	function.  However, this gets complicated....
-+ *
-+ * The vtable consist of be:
-+ *
-+ *  struct { 
-+ *    short __delta;
-+ *    short __index;
-+ *    union {
-+ *      P __pfn;
-+ *      short __delta2; 
-+ *    } __pfn_or_delta2;
-+ *  };
-+ *
-+ * See gcc/cp/cp-tree.h
-+ */
-+	
-+NS_InvokeByIndex_P:
-+	save	%sp,-(128 + 64),%sp ! room for the register window and
-+				    ! struct pointer, rounded up to 0 % 64
-+	sll	%i2,4,%l0	    ! assume the worst case
-+				    ! paramCount * 2 * 8 bytes
-+	cmp	%l0, 0		    ! are there any args? If not,
-+	be	.invoke 	    ! no need to copy args to stack
-+	 nop
-+
-+	sub	%sp,%l0,%sp	    ! create the additional stack space
-+	add	%sp,0x7ff+136,%o0   ! step past the register window, the
-+				    ! struct result pointer and the 'this' slot
-+	mov	%i2,%o1 	    ! paramCount
-+	call	invoke_copy_to_stack
-+	 mov	%i3,%o2 	    ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+	ldx	[%sp + 0x7ff + 136],%o1    ! %i1
-+	ldx	[%sp + 0x7ff + 144],%o2    ! %i2
-+	ldx	[%sp + 0x7ff + 152],%o3    ! %i3
-+	ldx	[%sp + 0x7ff + 160],%o4    ! %i4
-+	ldx	[%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %f2
-+	ldd	[%sp + 0x7ff + 136],%f2
-+	ldd	[%sp + 0x7ff + 144],%f4
-+	ldd	[%sp + 0x7ff + 152],%f6
-+	ldd	[%sp + 0x7ff + 160],%f8
-+	ldd	[%sp + 0x7ff + 168],%f10
-+	ldd	[%sp + 0x7ff + 176],%f12
-+	ldd	[%sp + 0x7ff + 184],%f14
-+	ldd	[%sp + 0x7ff + 192],%f16
-+	ldd	[%sp + 0x7ff + 200],%f18
-+	ldd	[%sp + 0x7ff + 208],%f20
-+	ldd	[%sp + 0x7ff + 216],%f22
-+	ldd	[%sp + 0x7ff + 224],%f24
-+	ldd	[%sp + 0x7ff + 232],%f26
-+	ldd	[%sp + 0x7ff + 240],%f28
-+	ldd	[%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+	sll	%i1,3,%l0	    ! index *= 8
-+	ldx	[%i0],%l1	    ! *this --> address of vtable
-+	ldx	[%l0 + %l1],%l0     ! this->vtable[index] --> address
-+
-+	jmpl	%l0,%o7 	    ! call the routine
-+	 mov	%i0,%o0 	    ! move 'this' pointer to out register
-+
-+	mov	%o0,%i0 	    ! propagate return value
-+	ret
-+	 restore
-+
-+        .size    NS_InvokeByIndex_P, .-NS_InvokeByIndex_P