Update to 1.6. For all the juicy details, please see:

http://www.mozilla.org/releases/mozilla1.6/

17 files changed, 586 insertions, 144 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 5e7bd675b9a1..7862580a2c89 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.5
-PORTREVISION?=	1
+PORTVERSION=	1.6
+PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -25,7 +25,8 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		nspr4.1:${PORTSDIR}/devel/nspr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -41,7 +42,7 @@ USE_GNOME=	gtk12 orbit
 .if !defined(WITHOUT_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
-BROKEN=		Mozilla and Xft2 render the mozilla-fonts \
+BROKEN=		Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
 		illegibly. Please remove the mozilla-fonts package.
 .endif
 .endif
@@ -56,7 +57,6 @@ LIB_DEPENDS+=	ical.0:${PORTSDIR}/devel/libical
 .endif
 
 LATEST_LINK=	${MOZILLA}
-USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
 			--exclude */package/* \
@@ -109,8 +109,7 @@ CONFIGURE_ARGS+=	--disable-ldap --enable-mailnews
 CONFIGURE_ARGS+=	--enable-ldap --enable-mailnews
 .endif
 .endif
-
-MOZ_EXTENSIONS=		default
+MOZ_EXTENSIONS=	default
 .if !defined(WITHOUT_CHATZILLA)
 MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
 .endif
@@ -118,7 +117,7 @@ MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
 MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},xmlterm
 .endif
 CONFIGURE_ARGS+=	--enable-extensions=${MOZ_EXTENSIONS}
-CONFIGURE_ENV=		MOZ_INTERNAL_LIBART_LGPL=1
+CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
 
 .if defined(WITH_JAVASCRIPT_DEBUGGER)
 CONFIGURE_ARGS+=	--enable-jsd \
@@ -149,17 +148,15 @@ CONFIGURE_ARGS+=	--enable-xft
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
-PKGCONFIG_FILES=	mozilla-gtkmozembed mozilla-js mozilla-xpcom \
-			mozilla-nspr mozilla-nss mozilla-plugin
+PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+		mozilla-nspr mozilla-nss mozilla-plugin
 
 # JPI stuff.  List paths to Java Plug-ins here in the order to try.
 JPI_LIST=\
-	  ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
-	  ${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
-	  ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
-	  ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
-
-NOT_FOR_ARCHS=	amd64
+	${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
+	${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
+	${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
+	${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
 
 .include <bsd.port.pre.mk>
 
@@ -207,19 +204,20 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		-e 's|%%HEADERS_SUFX%%||g' \
+		-e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \
 			${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
+		${WRKSRC}/configure \
+		${WRKSRC}/nsprpub/configure
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/nsprpub/config/FreeBSD.mk \
+		${WRKSRC}/nsprpub/configure \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
 		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
 	@for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${PKGNAMESUFFIX}|g ; \
+		${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \
 			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
 			${WRKSRC}/build/unix/$${pcfile}.pc.in; \
 	done
@@ -258,7 +256,7 @@ pre-install:
 			${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
 	${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
 	for pcfile in ${PKGCONFIG_FILES}; do \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
+		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
 	done
 
 do-install:
@@ -276,15 +274,15 @@ do-install:
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
-				${LN} -sf $${jpi} \
-					${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
+		    		${LN} -sf $${jpi} \
+			    		${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
 				break; \
 			fi; \
 		done; \
 	fi
 	for pcfile in ${PKGCONFIG_FILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}${PKGNAMESUFFIX}.pc ; \
+			${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \
 	done
 
 post-install:
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 0aef408ae34f..f66b161dab43 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.5.tar.bz2) = 9d59651eac39a95da756d38fe5385896
+MD5 (mozilla-source-1.6.tar.bz2) = da612f8768320dbafd0bfb3c254c2788
 MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
diff --git a/www/mozilla/files/patch-build_unix_run-mozilla.sh b/www/mozilla/files/patch-build_unix_run-mozilla.sh
index 96084fd68646..58df9aaf922a 100644
--- a/www/mozilla/files/patch-build_unix_run-mozilla.sh
+++ b/www/mozilla/files/patch-build_unix_run-mozilla.sh
@@ -1,5 +1,5 @@
---- build/unix/run-mozilla.sh.orig	Wed Oct 23 00:08:03 2002
-+++ build/unix/run-mozilla.sh	Wed Oct 23 00:08:59 2002
+--- build/unix/run-mozilla.sh.orig	Mon Dec 15 12:27:28 2003
++++ build/unix/run-mozilla.sh	Fri Jan 16 22:19:01 2004
 @@ -355,7 +355,7 @@
  fi
  ##
@@ -9,16 +9,7 @@
  if [ -n "$LD_LIBRARYN32_PATH" ]
  then
  	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
-@@ -392,7 +392,7 @@
-         export XSUNTRANSPORT XSUNSMESIZE
- fi
- # Font path for Xft
--FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
-+FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
- export FONTCONFIG_PATH
- 
- if [ "$moz_debug" -eq 1 ]
-@@ -435,6 +435,9 @@
+@@ -442,6 +442,9 @@
  #
  export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
  export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
diff --git a/www/mozilla/files/patch-config-mkdepend-imakemdep.h b/www/mozilla/files/patch-config-mkdepend-imakemdep.h
new file mode 100644
index 000000000000..b688e664475d
--- /dev/null
+++ b/www/mozilla/files/patch-config-mkdepend-imakemdep.h
@@ -0,0 +1,10 @@
+--- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
++++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
+@@ -278,4 +278,7 @@
+ 	"-D__i386__",
+ # endif
++# if defined(__amd64__) || defined(__x86_64__)
++	"-D__amd64__ -D__x86_64__",
++# endif
+ # ifdef __GNUC__
+ 	"-traditional",
diff --git a/www/mozilla/files/patch-config::rules.mk b/www/mozilla/files/patch-config::rules.mk
index 4dda22752411..544be43149fa 100644
--- a/www/mozilla/files/patch-config::rules.mk
+++ b/www/mozilla/files/patch-config::rules.mk
@@ -4,7 +4,7 @@
  
  ifeq ($(OS_ARCH),FreeBSD)
  ifdef IS_COMPONENT
-+ifeq (,$(filter i386,$(OS_TEST)))
++ifneq (,$(filter alpha,$(OS_TEST)))
 +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
 +else
  EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
diff --git a/www/mozilla/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h b/www/mozilla/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h
new file mode 100644
index 000000000000..edc10f32f824
--- /dev/null
+++ b/www/mozilla/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h
@@ -0,0 +1,30 @@
+--- directory/c-sdk/ldap/libraries/liblber/lber-int.h	Tue Mar 26 13:53:23 2002
++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	Sat Dec 13 13:02:49 2003
+@@ -236,15 +236,15 @@
+ 	     (((_l)&0xff0000)>>8) + (((_l)&0xff000000)>>24))
+ #define LBER_NTOHL(_l) LBER_HTONL(_l)
+ 
+-#elif !defined(__alpha) || defined(VMS)
++#elif !defined(__amd64__) && (!defined(__alpha) || defined(VMS))
+ 
+ #define LBER_HTONL( l )	htonl( l )
+ #define LBER_NTOHL( l )	ntohl( l )
+ 
+ #else /* __alpha */
+ /*
+- * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the
+- * lower-order 32-bits of a (64-bit) long, so we define correct versions
++ * htonl and ntohl on the 64 bit UNIX platforms only swap the lower-order
++ * 32-bits of a (64-bit) long, so we define correct versions
+  * here.
+  */
+ #define LBER_HTONL( l )	(((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \
+@@ -252,7 +252,7 @@
+ 
+ #define LBER_NTOHL( l )	(((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \
+     			| ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
+-#endif /* __alpha */
++#endif /* __alpha || __amd64__ */
+ 
+ 
+ /* function prototypes */
diff --git a/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
index 0b0e08247101..b7f272ee767a 100644
--- a/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
@@ -1,6 +1,6 @@
---- gfx/src/gtk/nsFontMetricsXft.cpp.save	Thu Aug  7 12:14:49 2003
-+++ gfx/src/gtk/nsFontMetricsXft.cpp	Thu Aug  7 12:33:45 2003
-@@ -106,6 +106,7 @@
+--- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Tue Jan  6 19:20:28 2004
++++ gfx/src/gtk/nsFontMetricsXft.cpp	Fri Jan 16 22:36:20 2004
+@@ -105,6 +105,7 @@
      FcPattern *mPattern;
      FcPattern *mFontName;
      FcCharSet *mCharset;
@@ -8,25 +8,16 @@
  };
  
  class nsFontXftInfo;
-@@ -1051,7 +1052,7 @@
-     // font in our loaded list that supports the character
-     for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
-         nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
--        if (font->HasChar(PRUint32(aChar)))
-+        if (font->HasChar(PRUint32(aChar)) && font->GetXftFont())
-             return font;
+@@ -1066,7 +1067,7 @@
      }
  
-@@ -1492,7 +1493,7 @@
-         // this character.
-         for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
-             font = (nsFontXft *)mLoadedFonts.ElementAt(j);
--            if (font->HasChar(c)) {
-+            if (font->HasChar(c) && font->GetXftFont()) {
-                 currFont = font;
-                 goto FoundFont; // for speed -- avoid "if" statement
-             }
-@@ -1922,6 +1923,7 @@
+     nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(0);
+-    if (font->HasChar(aChar))
++    if (font->HasChar(aChar) && font->GetXftFont())
+         return font;
+ 
+     // We failed to find the character in the best-match font, so load
+@@ -1947,6 +1948,7 @@
      FcPatternReference(mFontName);
  
      mXftFont = nsnull;
@@ -34,7 +25,7 @@
  
      // set up our charset
      mCharset = nsnull;
-@@ -1948,7 +1950,7 @@
+@@ -1973,7 +1975,7 @@
  XftFont *
  nsFontXft::GetXftFont(void)
  {
@@ -43,7 +34,7 @@
          FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
          if (!pat)
              return nsnull;
-@@ -1967,8 +1969,10 @@
+@@ -1992,8 +1994,10 @@
              FcPatternDel(pat, FC_SPACING);
  
          mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
diff --git a/www/mozilla/files/patch-nsprpub-configure b/www/mozilla/files/patch-nsprpub-configure
deleted file mode 100644
index 27ae64ee0c97..000000000000
--- a/www/mozilla/files/patch-nsprpub-configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- nsprpub/configure.in.orig	Sun Jun  1 00:16:23 2003
-+++ nsprpub/configure.in	Sun Jun  1 00:13:09 2003
-@@ -920,6 +920,7 @@
-     AC_DEFINE(XP_UNIX)
-     AC_DEFINE(FREEBSD)
-     AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-     if test "$MOZ_OBJFORMAT" = "elf"; then
---- nsprpub/configure.orig	Sun Jun  1 00:11:33 2003
-+++ nsprpub/configure	Sun Jun  1 00:12:49 2003
-@@ -3300,6 +3300,10 @@
- #define HAVE_BSD_FLOCK 1
- EOF
- 
-+    cat >> confdefs.h <<\EOF
-+#define HAVE_SOCKLEN_T 1
-+EOF
-+
-     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-     if test "$MOZ_OBJFORMAT" = "elf"; then
diff --git a/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c b/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c
new file mode 100644
index 000000000000..8c48ad1e08fb
--- /dev/null
+++ b/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c
@@ -0,0 +1,12 @@
+--- nsprpub/pr/src/io/prprf.c	Wed Feb 26 15:53:42 2003
++++ nsprpub/pr/src/io/prprf.c	Thu Oct 16 22:50:40 2003
+@@ -52,5 +52,8 @@
+ ** and requires array notation.
+ */
+-#if (defined(LINUX) && defined(__powerpc__)) || \
++#if defined(__amd64__)
++#include <stdarg.h>
++#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
++#elif (defined(LINUX) && defined(__powerpc__)) || \
+     (defined(LINUX) && defined(__s390__)) || \
+     (defined(LINUX) && defined(__s390x__)) || \
diff --git a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg
index 733993f2fd0a..a2aa9f4b4432 100644
--- a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg
+++ b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg
@@ -1,16 +1,23 @@
---- nsprpub/pr/include/md/_freebsd.cfg.orig	Wed Jan  2 18:38:25 2002
-+++ nsprpub/pr/include/md/_freebsd.cfg	Tue Jun 24 23:11:54 2003
-@@ -138,6 +138,100 @@
+--- nsprpub/pr/include/md/_freebsd.cfg	Wed Jan  2 18:38:25 2002
++++ nsprpub/pr/include/md/_freebsd.cfg	Sat Dec 13 13:02:49 2003
+@@ -91,7 +91,7 @@
+ #define PR_ALIGN_OF_DOUBLE  4
+ #define PR_ALIGN_OF_POINTER 4
+ 
+-#elif defined(__alpha)
++#elif defined(__alpha__)
+ 
+ #define IS_LITTLE_ENDIAN 1
+ #undef  IS_BIG_ENDIAN
+@@ -138,6 +138,146 @@
  #define PR_ALIGN_OF_DOUBLE  8
  #define PR_ALIGN_OF_POINTER 8
  
-+#elif defined(__sparc__)
-+
-+#undef IS_LITTLE_ENDIAN
++#elif defined(__sparc64__)
++#undef  IS_LITTLE_ENDIAN
 +#define IS_BIG_ENDIAN 1
-+#define	HAVE_LONG_LONG
-+#define	HAVE_ALIGNED_DOUBLES
-+#define	HAVE_ALIGNED_LONGLONGS
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_DOUBLE  8
 +#define IS_64
 +
 +#define PR_BYTES_PER_BYTE   1
@@ -46,18 +53,61 @@
 +#define PR_ALIGN_OF_SHORT   2
 +#define PR_ALIGN_OF_INT     4
 +#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_POINTER 8
++
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
++
++#elif defined(__ia64__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
 +#define PR_ALIGN_OF_INT64   8
 +#define PR_ALIGN_OF_FLOAT   4
 +#define PR_ALIGN_OF_DOUBLE  8
 +#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
 +
-+#elif defined(__ia64__)
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
 +
++#elif defined(__amd64__)
 +#define IS_LITTLE_ENDIAN 1
 +#undef  IS_BIG_ENDIAN
-+#define	HAVE_LONG_LONG
-+#define	HAVE_ALIGNED_DOUBLES
-+#define	HAVE_ALIGNED_LONGLONGS
 +#define IS_64
 +
 +#define PR_BYTES_PER_BYTE   1
@@ -69,8 +119,6 @@
 +#define PR_BYTES_PER_DOUBLE 8
 +#define PR_BYTES_PER_WORD   8
 +#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
 +
 +#define PR_BITS_PER_BYTE    8
 +#define PR_BITS_PER_SHORT   16
@@ -97,7 +145,14 @@
 +#define PR_ALIGN_OF_FLOAT   4
 +#define PR_ALIGN_OF_DOUBLE  8
 +#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
 +
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
  #else
  
  #error "Unknown CPU architecture"
diff --git a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h
index fb5de98ab9ff..fca34102ffb0 100644
--- a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h
+++ b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h
@@ -1,13 +1,13 @@
---- nsprpub/pr/include/md/_freebsd.h.orig	Thu Jan 16 15:09:12 2003
-+++ nsprpub/pr/include/md/_freebsd.h	Tue Jun 24 23:12:04 2003
-@@ -48,6 +48,10 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha)
+--- nsprpub/pr/include/md/_freebsd.h.orig	Sat Nov 15 18:36:13 2003
++++ nsprpub/pr/include/md/_freebsd.h	Sun Dec 14 11:40:08 2003
+@@ -50,6 +50,10 @@
  #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__sparc__)
-+#define _PR_SI_ARCHITECTURE "sparc"
+ #elif defined(__sparc__)
+ #define _PR_SI_ARCHITECTURE "sparc"
 +#elif defined(__ia64__)
 +#define _PR_SI_ARCHITECTURE "ia64"
++#elif defined(__amd64__)
++#define _PR_SI_ARCHITECTURE "amd64"
  #else
  #error "Unknown CPU architecture"
  #endif
diff --git a/www/mozilla/files/patch-nsprpub_pr_src_misc_prtime.c b/www/mozilla/files/patch-nsprpub_pr_src_misc_prtime.c
deleted file mode 100644
index f13ae2faa20e..000000000000
--- a/www/mozilla/files/patch-nsprpub_pr_src_misc_prtime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/src/misc/prtime.c.orig	Wed Feb 26 19:01:02 2003
-+++ nsprpub/pr/src/misc/prtime.c	Mon Jun 30 23:18:29 2003
-@@ -1666,7 +1666,7 @@
-  */
- 
- #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
--        || defined(NETBSD)
-+        || defined(NETBSD) || defined(FREEBSD)
-     a.tm_zone = NULL;
-     a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
- #endif
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index 895814c6add7..f4b74769e8d4 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,14 +1,14 @@
---- configure.orig	Fri Aug 29 13:19:05 2003
-+++ configure	Sat Oct 18 15:43:27 2003
-@@ -11957,9 +11957,9 @@
+--- configure.orig	Thu Dec 11 18:32:02 2003
++++ configure	Fri Jan 16 22:46:30 2004
+@@ -11969,9 +11969,9 @@
  
  
  
 -MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck"
 +MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck"
  
--MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug"
-+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug"
+-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks"
++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks"
  
  # Check whether --enable-extensions or --disable-extensions was given.
  if test "${enable_extensions+set}" = set; then
diff --git a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk b/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
index 783d452b2896..9c79efbaf878 100644
--- a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
+++ b/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- security/coreconf/FreeBSD.mk.orig	Sat Mar  9 00:17:36 2002
-+++ security/coreconf/FreeBSD.mk	Tue Mar 12 17:19:15 2002
-@@ -35,9 +35,7 @@
+--- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
++++ security/coreconf/FreeBSD.mk	Sun Dec 14 11:38:37 2003
+@@ -35,16 +35,18 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
  
@@ -14,7 +11,18 @@ $FreeBSD$
  RANLIB			= ranlib
  
  ifeq ($(OS_TEST),alpha)
-@@ -70,7 +68,7 @@
+ CPU_ARCH		= alpha
+ else
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH		= amd64
++else
+ CPU_ARCH		= x86
+ endif
++endif
+ 
+ OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ 
+@@ -71,7 +73,7 @@
  DLL_SUFFIX		= so.1.0
  endif
  
diff --git a/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in b/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in
index 5b911d47b2f9..a609c0d5d5e0 100644
--- a/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in
+++ b/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in
@@ -1,21 +1,16 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Sun Jul 20 18:16:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Jul 20 11:58:05 2003
-@@ -59,13 +59,11 @@
- CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Aug 14 21:00:23 2003
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Dec 13 13:02:49 2003
+@@ -49,6 +49,9 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
  endif
++ifeq (amd64,$(OS_TEST))
++CPPSRCS		:= xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp
++endif
  endif
--# IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+# IA64 Linux & FreeBSD
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
- endif
--endif
- #
- # BeOS/Intel (uses the same unixish_x86 code)
  #
-@@ -106,9 +104,15 @@
+ # New code for Linux, et. al., with gcc
+@@ -106,9 +109,15 @@
  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
  endif
  #
@@ -32,7 +27,7 @@
  CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
  endif
  #
-@@ -292,6 +296,15 @@
+@@ -294,6 +303,15 @@
  ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
  CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
diff --git a/www/mozilla/files/patch-alpha b/www/mozilla/files/patch-xptcall-alpha
index 29631a98e61e..29631a98e61e 100644
--- a/www/mozilla/files/patch-alpha
+++ b/www/mozilla/files/patch-xptcall-alpha
diff --git a/www/mozilla/files/patch-xptcall-amd64 b/www/mozilla/files/patch-xptcall-amd64
new file mode 100644
index 000000000000..3227cad02182
--- /dev/null
+++ b/www/mozilla/files/patch-xptcall-amd64
@@ -0,0 +1,386 @@
+--- /dev/null	Wed Dec 31 16:00:00 1969
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
+@@ -0,0 +1,174 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++// Platform specific code to invoke XPCOM methods on native objects
++
++#include "xptcprivate.h"
++
++// 6 integral parameters are passed in registers
++const PRUint32 GPR_COUNT = 6;
++
++// 8 floating point parameters are passed in SSE registers
++const PRUint32 FPR_COUNT = 8;
++
++// Remember that these 'words' are 64-bit long
++static inline void
++invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
++                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
++{
++    nr_gpr = 1; // skip one GP register for 'that'
++    nr_fpr = 0;
++    nr_stack = 0;
++
++    /* Compute number of eightbytes of class MEMORY.  */
++    for (uint32 i = 0; i < paramCount; i++, s++) {
++        if (!s->IsPtrData()
++            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
++            if (nr_fpr < FPR_COUNT)
++                nr_fpr++;
++            else
++                nr_stack++;
++        }
++        else {
++            if (nr_gpr < GPR_COUNT)
++                nr_gpr++;
++            else
++                nr_stack++;
++        }
++    }
++}
++
++static void
++invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
++                     PRUint64 * gpregs, double * fpregs)
++{
++    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
++    PRUint32 nr_fpr = 0;
++    PRUint64 value;
++
++    for (uint32 i = 0; i < paramCount; i++, s++) {
++        if (s->IsPtrData())
++            value = (PRUint64) s->ptr;
++        else {
++            switch (s->type) {
++            case nsXPTType::T_FLOAT:                                break;
++            case nsXPTType::T_DOUBLE:                               break;
++            case nsXPTType::T_I8:     value = s->val.i8;            break;
++            case nsXPTType::T_I16:    value = s->val.i16;           break;
++            case nsXPTType::T_I32:    value = s->val.i32;           break;
++            case nsXPTType::T_I64:    value = s->val.i64;           break;
++            case nsXPTType::T_U8:     value = s->val.u8;            break;
++            case nsXPTType::T_U16:    value = s->val.u16;           break;
++            case nsXPTType::T_U32:    value = s->val.u32;           break;
++            case nsXPTType::T_U64:    value = s->val.u64;           break;
++            case nsXPTType::T_BOOL:   value = s->val.b;             break;
++            case nsXPTType::T_CHAR:   value = s->val.c;             break;
++            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
++            default:                  value = (PRUint64) s->val.p;  break;
++            }
++        }
++
++        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
++            if (nr_fpr < FPR_COUNT)
++                fpregs[nr_fpr++] = s->val.d;
++            else {
++                *((double *)d) = s->val.d;
++                d++;
++            }
++        }
++        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
++            if (nr_fpr < FPR_COUNT)
++                // The value in %xmm register is already prepared to
++                // be retrieved as a float. Therefore, we pass the
++                // value verbatim, as a double without conversion.
++                fpregs[nr_fpr++] = s->val.d;
++            else {
++                *((float *)d) = s->val.f;
++                d++;
++            }
++        }
++        else {
++            if (nr_gpr < GPR_COUNT)
++                gpregs[nr_gpr++] = value;
++            else
++                *d++ = value;
++        }
++    }
++}
++
++extern "C"
++XPTC_PUBLIC_API(nsresult)
++XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
++                   PRUint32 paramCount, nsXPTCVariant * params)
++{
++    PRUint32 nr_gpr, nr_fpr, nr_stack;
++    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
++    
++    // Stack, if used, must be 16-bytes aligned
++    if (nr_stack)
++        nr_stack = (nr_stack + 1) & ~1;
++
++    // Load parameters to stack, if necessary
++    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
++    PRUint64 gpregs[GPR_COUNT];
++    double fpregs[FPR_COUNT];
++    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
++
++    // Load FPR registers from fpregs[]
++    register double d0 asm("xmm0");
++    register double d1 asm("xmm1");
++    register double d2 asm("xmm2");
++    register double d3 asm("xmm3");
++    register double d4 asm("xmm4");
++    register double d5 asm("xmm5");
++    register double d6 asm("xmm6");
++    register double d7 asm("xmm7");
++
++    switch (nr_fpr) {
++#define ARG_FPR(N) \
++    case N+1: d##N = fpregs[N];
++        ARG_FPR(7);
++        ARG_FPR(6);
++        ARG_FPR(5);
++        ARG_FPR(4);
++        ARG_FPR(3);
++        ARG_FPR(2);
++        ARG_FPR(1);
++        ARG_FPR(0);
++    case 0:;
++#undef ARG_FPR
++    }
++    
++    // Load GPR registers from gpregs[]
++    register PRUint64 a0 asm("rdi");
++    register PRUint64 a1 asm("rsi");
++    register PRUint64 a2 asm("rdx");
++    register PRUint64 a3 asm("rcx");
++    register PRUint64 a4 asm("r8");
++    register PRUint64 a5 asm("r9");
++    
++    switch (nr_gpr) {
++#define ARG_GPR(N) \
++    case N+1: a##N = gpregs[N];
++        ARG_GPR(5);
++        ARG_GPR(4);
++        ARG_GPR(3);
++        ARG_GPR(2);
++        ARG_GPR(1);
++    case 1: a0 = (PRUint64) that;
++    case 0:;
++#undef ARG_GPR
++    }
++
++    // Ensure that assignments to SSE registers won't be optimized away
++    asm("" ::
++        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
++        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
++    
++    // Get pointer to method
++    PRUint64 methodAddress = *((PRUint64 *)that);
++    methodAddress += 8 * methodIndex;
++    methodAddress = *((PRUint64 *)methodAddress);
++    
++    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
++    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
++    return result;
++}
+--- /dev/null	Wed Dec 31 16:00:00 1969
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
+@@ -0,0 +1,206 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++
++// Implement shared vtbl methods.
++
++#include "xptcprivate.h"
++
++// The Linux/x86-64 ABI passes the first 6 integral parameters and the
++// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
++// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
++// caller.  The rest of the parameters are passed in the callers stack
++// area.
++
++const PRUint32 PARAM_BUFFER_COUNT   = 16;
++const PRUint32 GPR_COUNT            = 6;
++const PRUint32 FPR_COUNT            = 8;
++
++// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
++//
++// - 'args[]' contains the arguments passed on stack
++// - 'gpregs[]' contains the arguments passed in integer registers
++// - 'fpregs[]' contains the arguments passed in floating point registers
++// 
++// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
++// and then the method gets called.
++
++extern "C" nsresult
++PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
++                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
++{
++    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
++    nsXPTCMiniVariant* dispatchParams = NULL;
++    nsIInterfaceInfo* iface_info = NULL;
++    const nsXPTMethodInfo* info;
++    PRUint32 paramCount;
++    PRUint32 i;
++    nsresult result = NS_ERROR_FAILURE;
++
++    NS_ASSERTION(self,"no self");
++
++    self->GetInterfaceInfo(&iface_info);
++    NS_ASSERTION(iface_info,"no interface info");
++    if (! iface_info)
++        return NS_ERROR_UNEXPECTED;
++
++    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
++    NS_ASSERTION(info,"no method info");
++    if (! info)
++        return NS_ERROR_UNEXPECTED;
++
++    paramCount = info->GetParamCount();
++
++    // setup variant array pointer
++    if(paramCount > PARAM_BUFFER_COUNT)
++        dispatchParams = new nsXPTCMiniVariant[paramCount];
++    else
++        dispatchParams = paramBuffer;
++
++    NS_ASSERTION(dispatchParams,"no place for params");
++    if (! dispatchParams)
++        return NS_ERROR_OUT_OF_MEMORY;
++
++    PRUint64* ap = args;
++    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
++    PRUint32 nr_fpr = 0;
++    PRUint64 value;
++
++    for(i = 0; i < paramCount; i++) {
++        const nsXPTParamInfo& param = info->GetParam(i);
++        const nsXPTType& type = param.GetType();
++        nsXPTCMiniVariant* dp = &dispatchParams[i];
++	
++        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
++            if (nr_fpr < FPR_COUNT)
++                dp->val.d = fpregs[nr_fpr++];
++            else
++                dp->val.d = *(double*) ap++;
++            continue;
++        }
++        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
++            if (nr_fpr < FPR_COUNT)
++                // The value in %xmm register is already prepared to
++                // be retrieved as a float. Therefore, we pass the
++                // value verbatim, as a double without conversion.
++                dp->val.d = *(double*) ap++;
++            else
++                dp->val.f = *(float*) ap++;
++            continue;
++        }
++        else {
++            if (nr_gpr < GPR_COUNT)
++                value = gpregs[nr_gpr++];
++            else
++                value = *ap++;
++        }
++
++        if (param.IsOut() || !type.IsArithmetic()) {
++            dp->val.p = (void*) value;
++            continue;
++        }
++
++        switch (type) {
++        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
++        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
++        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
++        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
++        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
++        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
++        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
++        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
++        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
++        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
++        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
++
++        default:
++            NS_ASSERTION(0, "bad type");
++            break;
++        }
++    }
++
++    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
++
++    NS_RELEASE(iface_info);
++
++    if (dispatchParams != paramBuffer)
++        delete [] dispatchParams;
++
++    return result;
++}
++
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++// Linux/x86-64 uses gcc >= 3.1
++#define STUB_ENTRY(n) \
++asm(".section	\".text\"\n\t" \
++    ".align	2\n\t" \
++    ".if	" #n " < 10\n\t" \
++    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
++    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
++    ".elseif	" #n " < 100\n\t" \
++    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
++    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
++    ".elseif    " #n " < 1000\n\t" \
++    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
++    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
++    ".else\n\t" \
++    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
++    ".endif\n\t" \
++    "movl	$" #n ", %eax\n\t" \
++    "jmp	SharedStub\n\t" \
++    ".if	" #n " < 10\n\t" \
++    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++    ".elseif	" #n " < 100\n\t" \
++    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++    ".else\n\t" \
++    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++    ".endif");
++
++// static nsresult SharedStub(PRUint32 methodIndex)
++asm(".section   \".text\"\n\t"
++    ".align     2\n\t"
++    ".type      SharedStub,@function\n\t"
++    "SharedStub:\n\t"
++    // make room for gpregs (48), fpregs (64)
++    "pushq      %rbp\n\t"
++    "movq       %rsp,%rbp\n\t"
++    "subq       $112,%rsp\n\t"
++    // save GP registers
++    "movq       %rdi,-112(%rbp)\n\t"
++    "movq       %rsi,-104(%rbp)\n\t"
++    "movq       %rdx, -96(%rbp)\n\t"
++    "movq       %rcx, -88(%rbp)\n\t"
++    "movq       %r8 , -80(%rbp)\n\t"
++    "movq       %r9 , -72(%rbp)\n\t"
++    "leaq       -112(%rbp),%rcx\n\t"
++    // save FP registers
++    "movsd      %xmm0,-64(%rbp)\n\t"
++    "movsd      %xmm1,-56(%rbp)\n\t"
++    "movsd      %xmm2,-48(%rbp)\n\t"
++    "movsd      %xmm3,-40(%rbp)\n\t"
++    "movsd      %xmm4,-32(%rbp)\n\t"
++    "movsd      %xmm5,-24(%rbp)\n\t"
++    "movsd      %xmm6,-16(%rbp)\n\t"
++    "movsd      %xmm7, -8(%rbp)\n\t"
++    "leaq       -64(%rbp),%r8\n\t"
++    // rdi has the 'self' pointer already
++    "movl       %eax,%esi\n\t"
++    "leaq       16(%rbp),%rdx\n\t"
++    "call       PrepareAndDispatch\n\t"
++    "leave\n\t"
++    "ret\n\t"
++    ".size      SharedStub,.-SharedStub");
++
++#define SENTINEL_ENTRY(n) \
++nsresult nsXPTCStubBase::Sentinel##n() \
++{ \
++    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
++    return NS_ERROR_NOT_IMPLEMENTED; \
++}
++
++#include "xptcstubsdef.inc"
++
++#else
++#error "can't find a compiler to use"
++#endif /* __GNUC__ */