mozilla-firefox-1.0; based on work by wilfried/robert/naddy

www/mozilla-firefox/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.11 2004/10/31 07:23:13 brad Exp $
+# $OpenBSD: Makefile,v 1.12 2004/11/26 18:29:14 pvalchev Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 sparc sparc64 amd64 powerpc
 
 COMMENT=	"redesign of Mozilla's browser component"
 
-VER=		0.8
+VER=		1.0
 DISTNAME=	mozilla
-PKGNAME=	mozilla-firefox-${VER}p1
+PKGNAME=	mozilla-firefox-${VER}
 
 CATEGORIES=	www
 
@@ -18,9 +18,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/ \
-		http://ftp.mozilla.org/pub/firefox/releases/${VER}/
-DISTFILES=	firefox-source-${VER}.tar.bz2
+MASTER_SITES=	http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/ \
+		http://ftp.mozilla.org/pub/firefox/releases/${VER}/source/
+DISTFILES=	firefox-${VER}-source.tar.bz2
 
 MODULES=	gcc3
 MODGCC3_ARCHES=	alpha
@@ -39,6 +39,7 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS=	Yes
+SUBST_VARS=	LOCALBASE PORTSDIR
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf \
 				${WRKSRC}/nsprpub/build/autoconf \
@@ -60,9 +61,12 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 # from browser/config/mozconfig
 CONFIGURE_ARGS+=--disable-ldap			\
 		--disable-mailnews		\
-		--enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices \
+		--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth \
 		--enable-crypto			\
-		--disable-composer
+		--disable-composer		\
+		--enable-single-profile		\
+		--disable-profilesharing
+
 
 # There is no problem with the propolice-enabled gcc3 on amd64 and sparc64,
 # but it is reported to still be broken on others.
@@ -83,21 +87,25 @@ post-extract:
 
 pre-configure:
 	@cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
+	@cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
 	@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
 		${WRKSRC}/browser/app/mozilla.in
 
 do-install:
-	${INSTALL_DATA_DIR} ${MOZ}
-.for dir in chrome components defaults res searchplugins
+.for dir in chrome components defaults greprefs res searchplugins
+	${INSTALL_DATA_DIR} ${MOZ}/${dir}
 	@cd ${MOB} && ${TAR} -chf - ${dir} | \
 		${TAR} -xf - -C ${MOZ}
 .endfor
 	@cd ${MOB} && ${TAR} -chf - *.so.1.0 | \
 		${TAR} -xf - -C ${MOZ}
-	@chmod 444 ${MOZ}/*.so.1.0 ${MOZ}/components/*.so.1.0
+	@chmod 444 ${MOZ}/*.so.1.0 ${MOZ}/components/*.so.1.0 ${MOZ}/components/*.js
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ}
+	${INSTALL_DATA} ${WRKSRC}/browser/app/mozicon16.xpm ${WRKSRC}/browser/app/mozicon50.xpm ${MOZ}
 	${INSTALL_SCRIPT} ${MOB}/firefox ${PREFIX}/bin/
-	ln ${PREFIX}/bin/firefox ${PREFIX}/bin/mozilla-firefox
-	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOB}/mozilla-config ${MOZ}
+	ln -f ${PREFIX}/bin/firefox ${PREFIX}/bin/mozilla-firefox
+	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOB}/firefox-config ${MOZ}
 	${INSTALL_PROGRAM} ${MOB}/regchrome ${MOB}/regxpcom ${MOB}/firefox-bin ${MOZ}
+	ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin
 
 .include <bsd.port.mk>

www/mozilla-firefox/distinfo

@@ -1,3 +1,3 @@
-MD5 (firefox-source-0.8.tar.bz2) = cdc85152f4219bf3e3f1a8dc46e04654
-RMD160 (firefox-source-0.8.tar.bz2) = cf55c137d310dbbae7db3c6a032e835e0bd481cb
-SHA1 (firefox-source-0.8.tar.bz2) = 8282f17a8f51265a86923c03362bba629162bf05
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+RMD160 (firefox-1.0-source.tar.bz2) = 64a87c3e4f2bc2c07cd7e2c83d235a4beda03c8f
+SHA1 (firefox-1.0-source.tar.bz2) = a115c28f53d093da7832f6b80c982acb5b469f83

www/mozilla-firefox/patches/patch-browser_app_mozilla_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-browser_app_mozilla_in,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- browser/app/mozilla.in.orig	2003-07-26 09:51:05.000000000 +0200
-+++ browser/app/mozilla.in	2004-01-19 15:19:46.000000000 +0100
-@@ -33,6 +33,7 @@
+$OpenBSD: patch-browser_app_mozilla_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- browser/app/mozilla.in.orig	Tue Oct 26 11:26:11 2004
++++ browser/app/mozilla.in	Thu Oct 28 17:20:22 2004
+@@ -73,6 +73,7 @@ moz_pis_startstop_scripts()
  #set -x
  
  moz_libdir=%MOZAPPDIR%
@@ -9,7 +9,7 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.1.1.1 2004/02/15 19:37:25 wilfried Ex
  MRE_HOME=%MREDIR%
  
  # Use run-mozilla.sh in the current dir if it exists
-@@ -106,7 +107,11 @@ do
+@@ -214,7 +215,11 @@ do
    esac
  done
  
@@ -20,5 +20,5 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.1.1.1 2004/02/15 19:37:25 wilfried Ex
 +
 +export MOZ_PLUGIN_PATH MRE_HOME
  eval "set -- $moreargs"
- if [ $debugging = 1 ]
- then
+ 
+ ## Start addon scripts

www/mozilla-firefox/patches/patch-browser_app_nsBrowserApp_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-browser_app_nsBrowserApp_cpp,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- browser/app/nsBrowserApp.cpp.orig	2003-10-01 03:17:56.000000000 +0200
-+++ browser/app/nsBrowserApp.cpp	2004-02-13 15:07:27.000000000 +0100
-@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
- {
-   nsXREAppData appData;
-   appData.SetSplashEnabled(PR_FALSE);
--  appData.SetProductName(NS_LITERAL_CSTRING("Phoenix"));
-+  appData.SetProductName(NS_LITERAL_CSTRING("Firefox"));
-   appData.SetUseStartupPrefs(PR_FALSE);
- 
-   return xre_main(argc, argv, appData);

www/mozilla-firefox/patches/patch-config_autoconf_mk_in

@@ -1,23 +1,23 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- config/autoconf.mk.in.orig	2003-10-30 22:11:05.000000000 +0100
-+++ config/autoconf.mk.in	2004-02-13 13:44:07.000000000 +0100
-@@ -29,13 +29,13 @@ MOZILLA_VERSION = @MOZILLA_VERSION@
+$OpenBSD: patch-config_autoconf_mk_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- config/autoconf.mk.in.orig	Sun Oct 31 05:29:54 2004
++++ config/autoconf.mk.in	Tue Nov  9 15:14:16 2004
+@@ -32,13 +32,13 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNA
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
--includedir	= @includedir@/mozilla-$(MOZILLA_VERSION)
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +includedir	= $(prefix)/mozilla-firefox/include
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
- idldir		= @datadir@/idl/mozilla-$(MOZILLA_VERSION)
+ idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
--mozappdir	= $(libdir)/mozilla-$(MOZILLA_VERSION)
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +mozappdir	= $(prefix)/mozilla-firefox
- mredir		= $(libdir)/mre/mre-$(MOZILLA_VERSION)
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
-@@ -172,7 +172,7 @@ OS_LDFLAGS	= @LDFLAGS@
+@@ -195,7 +195,7 @@ OS_LDFLAGS	= @LDFLAGS@
  OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
  OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
  

www/mozilla-firefox/patches/patch-config_rules_mk

@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- config/rules.mk.orig	2004-02-15 14:41:57.000000000 +0100
-+++ config/rules.mk	2004-02-15 15:22:16.000000000 +0100
-@@ -664,7 +664,7 @@ ifdef SHARED_LIBRARY
+$OpenBSD: patch-config_rules_mk,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- config/rules.mk.orig	2004-06-10 07:50:09.000000000 +0200
++++ config/rules.mk	2004-06-16 13:05:25.000000000 +0200
+@@ -667,7 +667,7 @@ ifdef SHARED_LIBRARY
  ifdef IS_COMPONENT
  ifdef GRE_MODULE
  ifndef DISABLE_DIST_GRE
@@ -10,7 +10,7 @@ $OpenBSD: patch-config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
  	$(ELF_DYNSTR_GC) $(GRE_DIST)/components/$(SHARED_LIBRARY)
  ifdef BEOS_ADDON_WORKAROUND
  	( cd $(GRE_DIST)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
-@@ -674,11 +674,11 @@ endif # GRE_MODULE
+@@ -677,11 +677,11 @@ endif # GRE_MODULE
  ifeq ($(OS_ARCH),OS2)
  	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/components
  else
@@ -24,7 +24,7 @@ $OpenBSD: patch-config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
  	$(ELF_DYNSTR_GC) $(DIST)/bin/components/$(SHARED_LIBRARY)
  ifdef BEOS_ADDON_WORKAROUND
  	( cd $(DIST)/bin/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
-@@ -687,7 +687,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL
+@@ -690,7 +690,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL
  else # ! IS_COMPONENT
  ifdef GRE_MODULE
  ifndef DISABLE_DIST_GRE
@@ -33,7 +33,7 @@ $OpenBSD: patch-config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
  ifdef BEOS_ADDON_WORKAROUND
  	( cd $(GRE_DIST) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
  endif
-@@ -696,10 +696,10 @@ endif # GRE_MODULE
+@@ -699,10 +699,10 @@ endif # GRE_MODULE
  ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
  	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
  else
@@ -46,7 +46,7 @@ $OpenBSD: patch-config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
  ifdef BEOS_ADDON_WORKAROUND
  	( cd $(DIST)/bin && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
  endif
-@@ -763,15 +763,15 @@ ifndef NO_INSTALL
+@@ -766,15 +766,15 @@ ifndef NO_INSTALL
  ifdef SHARED_LIBRARY
  ifdef IS_COMPONENT
  ifdef MRE_DIST
@@ -66,10 +66,10 @@ $OpenBSD: patch-config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
  endif
  endif
  endif # SHARED_LIBRARY
-@@ -1030,7 +1030,6 @@ ifdef RESFILE
- 	$(RC) $(RCFLAGS) $(RESFILE) $@
- endif
- endif # OS2
+@@ -1023,7 +1023,6 @@ endif # NO_LD_ARCHIVE_FLAGS
+ else # os2 vacpp
+ 	$(MKSHLIB) /O:$@ /DLL /INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
+ endif # !os2 vacpp
 -	chmod +x $@
  ifndef NO_COMPONENT_LINK_MAP
  ifndef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS

www/mozilla-firefox/patches/patch-configure_in

@@ -1,33 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- configure.in.orig	2003-12-11 17:30:36.000000000 -0600
-+++ configure.in	2004-02-11 22:49:28.000000000 -0600
-@@ -1286,12 +1286,11 @@ case "$target" in
-     DLL_SUFFIX=".so.1.0"
-     DSO_CFLAGS=''
-     DSO_PIC_CFLAGS='-fPIC'
--    DSO_LDOPTS='-shared -h $@'
--    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
--    MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
--    if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
--	DSO_LDOPTS="-Bshareable /usr/lib/c++rt0.o"
--    fi
-+    DSO_LDOPTS='-shared -fPIC'
-+    MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
-+    MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-+    MKSHLIB_FORCE_ALL=''
-+    MKSHLIB_UNFORCE_ALL=''
-     if test "$LIBRUNPATH"; then
- 	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
-     fi
-@@ -2159,9 +2158,8 @@ then
- 			AC_DEFINE(_THREAD_SAFE)
- 			dnl -pthread links in -lc_r, so don't specify it explicitly.
- 			if test "$ac_cv_have_dash_pthread" = "yes"; then
--				_PTHREAD_LDFLAGS=""
--			else
--				_PTHREAD_LDFLAGS="-lc_r"
-+				_PTHREAD_LDFLAGS="-pthread"
-+                LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
- 			fi
- 			;;
- 

www/mozilla-firefox/patches/patch-directory_c-sdk_ldap_libraries_liblber_lber-int_h

@@ -1,31 +0,0 @@
-$OpenBSD: patch-directory_c-sdk_ldap_libraries_liblber_lber-int_h,v 1.1 2004/03/01 07:14:48 pvalchev Exp $
---- directory/c-sdk/ldap/libraries/liblber/lber-int.h.orig	2002-03-26 22:53:23.000000000 +0100
-+++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	2004-02-28 00:48:47.000000000 +0100
-@@ -236,15 +236,15 @@ void ber_err_print( char *data );
- 	     (((_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 @@ void ber_err_print( char *data );
- 
- #define LBER_NTOHL( l )	(((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \
-     			| ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
--#endif /* __alpha */
-+#endif /* __alpha || __amd64__ */
- 
- 
- /* function prototypes */

www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-extensions_transformiix_source_base_Double_cpp,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- extensions/transformiix/source/base/Double.cpp.orig	2004-01-14 01:22:02.000000000 +0100
-+++ extensions/transformiix/source/base/Double.cpp	2004-02-13 13:44:07.000000000 +0100
-@@ -108,17 +108,19 @@ typedef union {
+$OpenBSD: patch-extensions_transformiix_source_base_Double_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- extensions/transformiix/source/base/Double.cpp.orig	2004-01-15 22:23:18.000000000 +0100
++++ extensions/transformiix/source/base/Double.cpp	2004-06-16 09:50:16.000000000 +0200
+@@ -114,17 +114,19 @@ typedef union txdpun {
  #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
  #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
  

www/mozilla-firefox/patches/patch-gfx_idl_nsIFreeType2_idl

@@ -1,7 +1,7 @@
-$OpenBSD: patch-gfx_idl_nsIFreeType2_idl,v 1.1 2004/11/05 07:37:56 jolan Exp $
---- gfx/idl/nsIFreeType2.idl.orig	Sat Feb 22 18:06:55 2003
-+++ gfx/idl/nsIFreeType2.idl	Fri Nov  5 00:20:37 2004
-@@ -72,10 +72,11 @@ native FT_Pointer(FT_Pointer);
+$OpenBSD: patch-gfx_idl_nsIFreeType2_idl,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- gfx/idl/nsIFreeType2.idl.orig	Fri Apr 16 03:09:33 2004
++++ gfx/idl/nsIFreeType2.idl	Sat Nov  6 03:43:33 2004
+@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
  native FT_Sfnt_Tag(FT_Sfnt_Tag);
  native FT_Size(FT_Size);
  
@@ -14,8 +14,8 @@ $OpenBSD: patch-gfx_idl_nsIFreeType2_idl,v 1.1 2004/11/05 07:37:56 jolan Exp $
 +native FTC_ImageCache(FTC_ImageCache);
  native FTC_Manager(FTC_Manager);
  
- /*
-@@ -87,7 +88,7 @@ interface nsIFreeType2 : nsISupports
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
  
      readonly attribute FT_Library library;
      readonly attribute FTC_Manager FTCacheManager;
@@ -24,16 +24,15 @@ $OpenBSD: patch-gfx_idl_nsIFreeType2_idl,v 1.1 2004/11/05 07:37:56 jolan Exp $
  
      void    doneFace(in FT_Face face);
      void    doneFreeType(in FT_Library lib);
-@@ -103,16 +104,16 @@ interface nsIFreeType2 : nsISupports
+@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
      void    outlineDecompose(in FT_Outline_p outline,
                               in const_FT_Outline_Funcs_p funcs, in voidPtr p);
      void    setCharmap(in FT_Face face, in FT_CharMap charmap);
 -    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
--                             in FT_UInt gindex, out FT_Glyph glyph);
++    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
+                              in FT_UInt gindex, out FT_Glyph glyph);
 -    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
 -                              out FT_Face face, out FT_Size size);
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-+			     in FT_UInt gindex, out FT_Glyph glyph);
 +    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
 +                              out FT_Face face);
      void    managerDone(in FTC_Manager manager);
@@ -43,6 +42,6 @@ $OpenBSD: patch-gfx_idl_nsIFreeType2_idl,v 1.1 2004/11/05 07:37:56 jolan Exp $
                         out FTC_Manager manager);
 -    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
 +    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- 
-     FT_ULong getFirstChar(in FT_Face face, out FT_UInt gindex);
-     FT_ULong getNextChar(in FT_Face face, in FT_ULong charcode, out FT_UInt gindex);
+ /* #ifdef MOZ_SVG */
+     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+                         in FT_Vector_p delta);

www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan Exp $
---- gfx/src/freetype/nsFreeType.cpp.orig	Sun Sep  7 17:20:37 2003
-+++ gfx/src/freetype/nsFreeType.cpp	Fri Nov  5 00:23:55 2004
+$OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- gfx/src/freetype/nsFreeType.cpp.orig	Sat Feb  7 16:22:30 2004
++++ gfx/src/freetype/nsFreeType.cpp	Sat Nov  6 02:13:33 2004
 @@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
    {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
    {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
@@ -13,10 +13,10 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan
    {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
 -  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
 +  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-   {"FT_Get_First_Char",       NS_FT2_OFFSET(nsFT_Get_First_Char),       PR_FALSE},
-   {"FT_Get_Next_Char",        NS_FT2_OFFSET(nsFT_Get_Next_Char),        PR_FALSE},
-   {nsnull,                    0, 0},
-@@ -276,7 +276,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
+ // #ifdef MOZ_SVG
+   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
+   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
+@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
  } 
   
  NS_IMETHODIMP
@@ -25,7 +25,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan
                                FT_UInt glyphID, FT_Glyph *glyph)
  { 
    // call the FreeType2 function via the function pointer
-@@ -285,11 +285,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
+@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
  } 
   
  NS_IMETHODIMP
@@ -40,7 +40,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan
    return error ? NS_ERROR_FAILURE : NS_OK;
  } 
   
-@@ -314,7 +314,7 @@ nsFreeType2::ManagerNew(FT_Library libra
+@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
  } 
   
  NS_IMETHODIMP
@@ -49,7 +49,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan
  { 
    // call the FreeType2 function via the function pointer
    FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -345,7 +345,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
+@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
  } 
   
  NS_IMETHODIMP

www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-gfx_src_freetype_nsFreeType_h,v 1.1 2004/11/05 07:37:56 jolan Exp $
---- gfx/src/freetype/nsFreeType.h.orig	Wed Jun 11 13:15:22 2003
-+++ gfx/src/freetype/nsFreeType.h	Fri Nov  5 00:25:48 2004
+$OpenBSD: patch-gfx_src_freetype_nsFreeType_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- gfx/src/freetype/nsFreeType.h.orig	Fri Apr 16 23:31:42 2004
++++ gfx/src/freetype/nsFreeType.h	Sat Nov  6 02:11:14 2004
 @@ -104,13 +104,15 @@ typedef FT_Error (*FT_Outline_Decompose_
  typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
  typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
@@ -16,10 +16,10 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeType_h,v 1.1 2004/11/05 07:37:56 jolan Ex
                         FTC_Face_Requester, FT_Pointer, FTC_Manager*);
 -typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
 +typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- 
- typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*);
- typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*);
-@@ -157,7 +159,7 @@ protected:
+ // #ifdef MOZ_SVG
+ typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
+ typedef FT_Error (*FT_Get_Kerning_t)
+@@ -165,7 +167,7 @@ protected:
    FT_Outline_Decompose_t    nsFT_Outline_Decompose;
    FT_Set_Charmap_t          nsFT_Set_Charmap;
    FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
@@ -28,7 +28,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeType_h,v 1.1 2004/11/05 07:37:56 jolan Ex
    FTC_Manager_Done_t        nsFTC_Manager_Done;
    FTC_Manager_New_t         nsFTC_Manager_New;
    FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -195,7 +197,7 @@ protected:
+@@ -213,7 +215,7 @@ protected:
    PRLibrary      *mSharedLib;
    FT_Library      mFreeTypeLibrary;
    FTC_Manager     mFTCacheManager;

www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1 2004/11/05 07:37:56 jolan Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Thu Oct 23 17:43:04 2003
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Nov  5 00:12:17 2004
-@@ -1126,10 +1126,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Thu Feb  5 02:57:05 2004
++++ gfx/src/ps/nsFontMetricsPS.cpp	Sat Nov  6 02:00:00 2004
+@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
    
    mPixelSize = NSToIntRound(app2dev * mFont->size);
  
@@ -16,7 +16,7 @@ $OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1 2004/11/05 07:37:56 jolan E
  
    nsresult rv;
    mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1175,7 +1175,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1190,7 +1190,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
    if (!face)
      return 0;
  
@@ -25,7 +25,7 @@ $OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1 2004/11/05 07:37:56 jolan E
    nsresult rv = mFt2->GetImageCache(&iCache);
    if (NS_FAILED(rv)) {
      NS_ERROR("Failed to get Image Cache");
-@@ -1213,8 +1213,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1228,8 +1228,8 @@ nsFontPSFreeType::getFTFace()
    
    FTC_Manager cManager;
    mFt2->GetFTCacheManager(&cManager);
@@ -36,7 +36,7 @@ $OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1 2004/11/05 07:37:56 jolan E
    NS_ASSERTION(rv==0, "failed to get face/size");
    if (rv)
      return nsnull;
-@@ -1609,16 +1609,16 @@ void nsFT2Type8Generator::GeneratePSFont
+@@ -1622,16 +1622,16 @@ void nsFT2Type8Generator::GeneratePSFont
    mEntry->GetFamilyName(fontName);
    mEntry->GetStyleName(styleName);
    

www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_h,v 1.1 2004/11/05 07:37:56 jolan Exp $
---- gfx/src/ps/nsFontMetricsPS.h.orig	Tue Apr 22 11:25:09 2003
-+++ gfx/src/ps/nsFontMetricsPS.h	Fri Nov  5 00:12:17 2004
+$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- gfx/src/ps/nsFontMetricsPS.h.orig	Tue Apr 22 18:25:09 2003
++++ gfx/src/ps/nsFontMetricsPS.h	Sat Nov  6 02:00:00 2004
 @@ -320,7 +320,7 @@ protected:
    nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
    nsCOMPtr<nsIFreeType2> mFt2;

www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_cpp,v 1.1 2004/11/05 07:37:56 jolan Exp $
---- gfx/src/x11shared/nsFontFreeType.cpp.orig	Fri May 23 17:18:07 2003
-+++ gfx/src/x11shared/nsFontFreeType.cpp	Fri Nov  5 00:12:17 2004
+$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- gfx/src/x11shared/nsFontFreeType.cpp.orig	Thu Dec 25 09:24:52 2003
++++ gfx/src/x11shared/nsFontFreeType.cpp	Sat Nov  6 02:00:00 2004
 @@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
    FTC_Manager mgr;
    nsresult rv;
@@ -63,7 +63,7 @@ $OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_cpp,v 1.1 2004/11/05 07:37:56 j
    mFt2->GetImageCache(&icache);
    if (!icache)
      return 0;
-@@ -725,7 +717,7 @@ nsFreeTypeXImage::DrawString(nsRendering
+@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
      if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
  #endif
  

www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_h,v 1.1 2004/11/05 07:37:56 jolan Exp $
---- gfx/src/x11shared/nsFontFreeType.h.orig	Tue Apr 22 11:25:13 2003
-+++ gfx/src/x11shared/nsFontFreeType.h	Fri Nov  5 00:12:17 2004
+$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- gfx/src/x11shared/nsFontFreeType.h.orig	Tue Apr 22 18:25:13 2003
++++ gfx/src/x11shared/nsFontFreeType.h	Sat Nov  6 02:00:00 2004
 @@ -110,7 +110,7 @@ protected:
    XImage *GetXImage(PRUint32 width, PRUint32 height);
    nsITrueTypeFontCatalogEntry *mFaceID;

www/mozilla-firefox/patches/patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp

@@ -1,66 +0,0 @@
-$OpenBSD: patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp,v 1.2 2004/11/05 07:37:56 jolan Exp $
---- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig	Wed Sep 10 21:59:31 2003
-+++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp	Thu Nov  4 22:55:31 2004
-@@ -74,6 +74,24 @@ nsPNGDecoder::~nsPNGDecoder()
- /* void init (in imgILoad aLoad); */
- NS_IMETHODIMP nsPNGDecoder::Init(imgILoad *aLoad)
- {
-+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-+  static png_byte unused_chunks[]=
-+       { 98,  75,  71,  68, '\0',   /* bKGD */
-+         99,  72,  82,  77, '\0',   /* cHRM */
-+        104,  73,  83,  84, '\0',   /* hIST */
-+        105,  67,  67,  80, '\0',   /* iCCP */
-+        105,  84,  88, 116, '\0',   /* iTXt */
-+        111,  70,  70, 115, '\0',   /* oFFs */
-+        112,  67,  65,  76, '\0',   /* pCAL */
-+        115,  67,  65,  76, '\0',   /* sCAL */
-+        112,  72,  89, 115, '\0',   /* pHYs */
-+        115,  66,  73,  84, '\0',   /* sBIT */
-+        115,  80,  76,  84, '\0',   /* sPLT */
-+        116,  69,  88, 116, '\0',   /* tEXt */
-+        116,  73,  77,  69, '\0',   /* tIME */
-+        122,  84,  88, 116, '\0'};  /* zTXt */
-+#endif
-+
-   mImageLoad = aLoad;
-   mObserver = do_QueryInterface(aLoad);  // we're holding 2 strong refs to the request.
- 
-@@ -94,6 +112,12 @@ NS_IMETHODIMP nsPNGDecoder::Init(imgILoa
-     return NS_ERROR_OUT_OF_MEMORY;
-   }
- 
-+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-+  /* Ignore unused chunks */
-+  png_set_keep_unknown_chunks(mPNG, 0, unused_chunks,
-+     (int)sizeof(unused_chunks)/5);   
-+#endif
-+
-   /* use this as libpng "progressive pointer" (retrieve in callbacks) */
-   png_set_progressive_read_fn(mPNG, NS_STATIC_CAST(png_voidp, this),
-                               info_callback, row_callback, end_callback);
-@@ -183,6 +207,15 @@ info_callback(png_structp png_ptr, png_i
-   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
-                &interlace_type, &compression_type, &filter_type);
- 
-+  /* limit image dimensions (bug #251381) */
-+#define MOZ_PNG_MAX_DIMENSION 1000000L
-+  if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) {
-+    nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*,
-+                                           png_get_progressive_ptr(png_ptr));
-+    longjmp(decoder->mPNG->jmpbuf, 1);
-+  }
-+#undef MOZ_PNG_MAX_DIMENSION
-+
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-     png_set_expand(png_ptr);
- 
-@@ -518,5 +551,8 @@ error_callback(png_structp png_ptr, png_
- void
- warning_callback(png_structp png_ptr, png_const_charp warning_msg)
- {
-+  /* convert tRNS warning to error (bug #251381) */
-+  if (strncmp(warning_msg, "Missing PLTE before tRNS", 24) == 0)
-+    png_error(png_ptr, warning_msg);
-   PR_LOG(gPNGLog, PR_LOG_WARNING, ("libpng warning: %s\n", warning_msg));
- }

www/mozilla-firefox/patches/patch-modules_plugin_base_public_nptypes_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.1 2004/11/26 18:29:15 pvalchev Exp $
+--- modules/plugin/base/public/nptypes.h.orig	Wed Sep  1 18:59:55 2004
++++ modules/plugin/base/public/nptypes.h	Fri Sep 17 18:43:21 2004
+@@ -78,7 +78,9 @@
+     typedef int bool;
+   #endif
+   #else /* OPENBSD is defined, so use its bool */
++  #if !defined(__cplusplus)
+     #include <stdbool.h>
++  #endif
+   #endif
+   #else
+   /*

www/mozilla-firefox/patches/patch-nsprpub_configure_in

@@ -1,36 +1,12 @@
-$OpenBSD: patch-nsprpub_configure_in,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- nsprpub/configure.in.orig	2003-12-15 20:58:56.000000000 +0100
-+++ nsprpub/configure.in	2004-02-13 13:44:08.000000000 +0100
-@@ -1482,6 +1482,7 @@ mips-sony-newsos*)
-     AC_DEFINE(XP_UNIX)
+$OpenBSD: patch-nsprpub_configure_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- nsprpub/configure.in.orig	Fri Oct 22 16:48:52 2004
++++ nsprpub/configure.in	Fri Oct 22 16:47:30 2004
+@@ -1493,6 +1493,8 @@ mips-sony-newsos*)
      AC_DEFINE(OPENBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
+     AC_DEFINE(HAVE_SOCKLEN_T)
++    AC_DEFINE(_PR_HAVE_GETPROTO_R)
++    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
      CFLAGS="$CFLAGS -ansi -Wall"
      CXXFLAGS="$CXXFLAGS -ansi -Wall"
      DLL_SUFFIX=so.1.0
-@@ -1489,12 +1490,8 @@ mips-sony-newsos*)
-     MDCPUCFG_H=_openbsd.cfg
-     PR_MD_CSRCS=openbsd.c
-     USE_NSPR_THREADS=1
--    case "$OS_TEST" in
--    alpha|mips|pmax)
--        DSO_LDOPTS=-shared ;;
--    *)
--        DSO_LDOPTS=-Bshareable ;;
--    esac
-+    DSO_LDOPTS='-shared -fPIC'
-+    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     ;;
- 
- *-openvms*)
-@@ -2186,7 +2183,8 @@ if test -n "$USE_PTHREADS"; then
- 	    AC_DEFINE(_THREAD_SAFE)
- 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
- 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
--	        _PTHREAD_LDFLAGS=
-+	        _PTHREAD_LDFLAGS=-pthread
-+	        LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
- 	    fi
- 	    ;;
-     *-linux*)

www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_cfg

@@ -1,60 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_include_md__openbsd_cfg,v 1.1 2004/03/01 07:14:48 pvalchev Exp $
---- nsprpub/pr/include/md/_openbsd.cfg.orig	2003-09-16 02:11:44.000000000 +0200
-+++ nsprpub/pr/include/md/_openbsd.cfg	2004-02-28 01:01:59.000000000 +0100
-@@ -91,6 +91,56 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
-+#elif defined(__amd64__)
-+
-+#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
-+
-+#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
-+
- #elif defined(__sparc_v9__)
- 
- #undef  IS_LITTLE_ENDIAN

www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h

@@ -1,28 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.5 2004/11/05 07:37:56 jolan Exp $
---- nsprpub/pr/include/md/_openbsd.h.orig	Tue Jun 20 16:23:18 2000
-+++ nsprpub/pr/include/md/_openbsd.h	Thu Nov  4 22:55:31 2004
-@@ -43,6 +43,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha__)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #elif defined(__m68k__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__powerpc__)
-@@ -80,10 +82,14 @@
- 
- #define CONTEXT(_th) ((_th)->md.context)
- 
--#if defined(__i386__) || defined(__sparc__) || defined(__m68k__) || defined(__powerpc__)
-+#if defined(__i386__) || defined(__sparc__) || defined(__m68k__)
- #define JB_SP_INDEX 2
-+#elif defined(__powerpc__)
-+#define JB_SP_INDEX 1
- #elif defined(__alpha__)
- #define JB_SP_INDEX 34
-+#elif defined(__amd64__)
-+#define JB_SP_INDEX 6
- #elif defined(__arm32__)
- /*
-  * On the arm32, the jmpbuf regs underwent a name change after OpenBSD 1.3.

www/mozilla-firefox/patches/patch-nsprpub_pr_include_private_primpl_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- nsprpub/pr/include/private/primpl.h.orig	2004-01-20 23:31:30.000000000 +0100
-+++ nsprpub/pr/include/private/primpl.h	2004-01-23 13:59:28.000000000 +0100
-@@ -1857,6 +1857,7 @@ extern void _PR_DestroyZones(void);
+$OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- nsprpub/pr/include/private/primpl.h.orig	2004-04-14 22:36:59.000000000 +0200
++++ nsprpub/pr/include/private/primpl.h	2004-06-16 09:50:16.000000000 +0200
+@@ -1861,6 +1861,7 @@ extern void _PR_DestroyZones(void);
          && !defined(DARWIN) \
          && !defined(NEXTSTEP) \
          && !defined(QNX) \

www/mozilla-firefox/patches/patch-nsprpub_pr_src_io_prprf_c

@@ -1,14 +1,14 @@
-$OpenBSD: patch-nsprpub_pr_src_io_prprf_c,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- nsprpub/pr/src/io/prprf.c.orig	2003-02-27 00:53:42.000000000 +0100
-+++ nsprpub/pr/src/io/prprf.c	2003-12-12 12:41:30.000000000 +0100
+$OpenBSD: patch-nsprpub_pr_src_io_prprf_c,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- nsprpub/pr/src/io/prprf.c.orig	2004-03-09 04:18:19.000000000 +0100
++++ nsprpub/pr/src/io/prprf.c	2004-06-16 13:12:05.000000000 +0200
 @@ -51,7 +51,9 @@
  ** Note: on some platforms va_list is defined as an array,
  ** and requires array notation.
  */
--#if (defined(LINUX) && defined(__powerpc__)) || \
+-#if (defined(LINUX) && defined(__x86_64__))
 +#if defined(va_copy)
 +#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
-+#elif (defined(LINUX) && defined(__powerpc__)) || \
++#elif (defined(LINUX) && defined(__x86_64__))
+ #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
+ #elif (defined(LINUX) && defined(__powerpc__)) || \
      (defined(LINUX) && defined(__s390__)) || \
-     (defined(LINUX) && defined(__s390x__)) || \
-     defined(WIN16) || defined(QNX) || \

www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prnetdb_c

@@ -1,15 +1,7 @@
-$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.2 2004/11/01 10:25:12 sturm Exp $
---- nsprpub/pr/src/misc/prnetdb.c.orig	Fri Oct 31 06:09:29 2003
-+++ nsprpub/pr/src/misc/prnetdb.c	Mon Nov  1 07:33:55 2004
-@@ -98,6 +98,7 @@ PRLock *_pr_dnsLock = NULL;
- #endif
- 
- #if defined(OSF1) \
-+	|| defined(OPENBSD) \
-         || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
- 	|| (defined(HPUX10_10) && defined(_REENTRANT)) \
-         || (defined(HPUX10_20) && defined(_REENTRANT))
-@@ -2094,7 +2095,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.3 2004/11/26 18:29:15 pvalchev Exp $
+--- nsprpub/pr/src/misc/prnetdb.c.orig	Thu Sep  2 01:07:28 2004
++++ nsprpub/pr/src/misc/prnetdb.c	Fri Sep 17 18:36:11 2004
+@@ -2098,7 +2098,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  

www/mozilla-firefox/patches/patch-xpcom_io_nsNativeCharsetUtils_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpcom_io_nsNativeCharsetUtils_cpp,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- xpcom/io/nsNativeCharsetUtils.cpp.orig	2003-07-30 07:58:28.000000000 +0200
-+++ xpcom/io/nsNativeCharsetUtils.cpp	2003-12-12 12:41:30.000000000 +0100
-@@ -294,7 +294,11 @@ nsNativeCharsetConverter::LazyInit()
+$OpenBSD: patch-xpcom_io_nsNativeCharsetUtils_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- xpcom/io/nsNativeCharsetUtils.cpp.orig	2004-05-27 20:55:10.000000000 +0200
++++ xpcom/io/nsNativeCharsetUtils.cpp	2004-06-16 09:50:16.000000000 +0200
+@@ -295,7 +295,11 @@ nsNativeCharsetConverter::LazyInit()
  {
      const char  *blank_list[] = { "", NULL };
      const char **native_charset_list = blank_list;

www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2004/11/05 07:37:56 jolan Exp $
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 23:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Nov  4 22:55:52 2004
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2004/11/26 18:29:15 pvalchev Exp $
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Apr 22 22:50:05 2004
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Fri Sep 17 18:36:23 2004
 @@ -51,6 +51,12 @@ CPPSRCS		:= xptcinvoke_unixish_x86.cpp x
  endif
  endif
@@ -14,7 +14,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2004/11/05 0
  # New code for Linux, et. al., with gcc
  # Migrate other platforms here after testing
  #
-@@ -106,6 +112,12 @@ CPPSRCS		:= xptcinvoke_osf1_alpha.cpp xp
+@@ -111,6 +117,12 @@ CPPSRCS		:= xptcinvoke_osf1_alpha.cpp xp
  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
  endif
  #
@@ -27,7 +27,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2004/11/05 0
  # Linux/Alpha
  #
  ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-@@ -250,6 +262,14 @@ ASFILES		:= xptcinvoke_asm_ppc_netbsd.s 
+@@ -260,6 +272,14 @@ ASFILES		:= xptcinvoke_asm_ppc_netbsd.s 
  endif
  
  #
@@ -42,7 +42,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2004/11/05 0
  # Darwin/PPC
  #
  ifeq ($(OS_ARCH),Darwin)
-@@ -321,6 +341,20 @@ endif
+@@ -331,6 +351,20 @@ endif
  endif
  
  endif

www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h,v 1.1 2004/11/13 14:25:51 kettenis Exp $
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Thu Jan  8 19:17:07 2004
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Nov 12 21:09:52 2004
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Mon Nov 22 00:44:00 2004
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Mon Nov 22 00:44:50 2004
 @@ -107,12 +107,16 @@
  #define THUNK_BASED_THIS_ADJUST
  

www/mozilla-firefox/patches/patch-xpcom_sample_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpcom_sample_Makefile_in,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $
---- xpcom/sample/Makefile.in.orig	2003-07-14 00:28:50.000000000 +0200
-+++ xpcom/sample/Makefile.in	2003-12-12 12:41:30.000000000 +0100
-@@ -53,7 +53,7 @@ XPIDLSRCS	= nsISample.idl
+$OpenBSD: patch-xpcom_sample_Makefile_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
+--- xpcom/sample/Makefile.in.orig	2004-02-19 03:43:46.000000000 +0100
++++ xpcom/sample/Makefile.in	2004-06-16 09:50:16.000000000 +0200
+@@ -52,7 +52,7 @@ XPIDLSRCS	= nsISample.idl
  
  TESTCPPSRCS	= nsTestSample.cpp
  

www/mozilla-firefox/pkg/DEINSTALL

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2004/02/15 19:37:14 wilfried Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
 #
 # De-installation setup of mozilla
 
@@ -21,7 +21,14 @@ fi
 #
 case $2 in
     DEINSTALL)
-	cd ${MOZ} && rm -rf components/compreg.dat components/xpti.dat chrome/chrome.rdf chrome/overlayinfo
+	cd ${MOZ}/components
+	rm -f compreg.dat xpti.dat
+	cd ${MOZ}/chrome
+	rm -rf chrome.rdf overlayinfo
+	cd ${MOZ}
+	rm -f .autoreg components.ini install.log registry
+	rm -f extensions/Extensions.rdf
+	rmdir extensions
 	;;
     *)
 	echo "usage: $0 distname DEINSTALL" >&2

www/mozilla-firefox/pkg/INSTALL

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2004/02/15 19:37:14 wilfried Exp $
+# $OpenBSD: INSTALL,v 1.2 2004/11/26 18:29:15 pvalchev Exp $
 #
 # Pre/post-installation setup of mozilla
 
@@ -29,6 +29,13 @@ case $2 in
 	env HOME=/tmp LD_LIBRARY_PATH=${MOZ} ./regxpcom
 	env HOME=/tmp LD_LIBRARY_PATH=${MOZ} ./regchrome
 	rm -rf /tmp/.mozilla
+
+	mkdir -m 777 -p extensions
+	touch .autoreg components.ini install.log registry
+	chmod 666 .autoreg components.ini install.log registry
+
+	cd ${MOZ}/chrome
+	chmod 666 installed-chrome.txt 
 	;;
     *)
 	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2

www/mozilla-firefox/pkg/PFRAG.shared

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/08 17:19:37 robert Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/11/26 18:29:15 pvalchev Exp $
 @lib mozilla-firefox/components/libaccessibility.so.1.0
 @lib mozilla-firefox/components/libappcomps.so.1.0
 @lib mozilla-firefox/components/libautoconfig.so.1.0
@@ -19,28 +19,23 @@
 @lib mozilla-firefox/components/libhtmlpars.so.1.0
 @lib mozilla-firefox/components/libi18n.so.1.0
 @lib mozilla-firefox/components/libimglib2.so.1.0
-@lib mozilla-firefox/components/libipcdc.so.1.0
+@lib mozilla-firefox/components/libinspector.so.1.0
 @lib mozilla-firefox/components/libjar50.so.1.0
 @lib mozilla-firefox/components/libjsd.so.1.0
-@lib mozilla-firefox/components/libjsdom.so.1.0
 @lib mozilla-firefox/components/libmork.so.1.0
 @lib mozilla-firefox/components/libmozfind.so.1.0
 @lib mozilla-firefox/components/libnecko.so.1.0
 @lib mozilla-firefox/components/libnecko2.so.1.0
 @lib mozilla-firefox/components/libnsappshell.so.1.0
-@lib mozilla-firefox/components/libnsprefm.so.1.0
 @lib mozilla-firefox/components/liboji.so.1.0
-@lib mozilla-firefox/components/libp3p.so.1.0
 @lib mozilla-firefox/components/libpipboot.so.1.0
 @lib mozilla-firefox/components/libpipnss.so.1.0
 @lib mozilla-firefox/components/libpippki.so.1.0
 @lib mozilla-firefox/components/libpref.so.1.0
-@lib mozilla-firefox/components/libprofile.so.1.0
 @lib mozilla-firefox/components/librdf.so.1.0
 @lib mozilla-firefox/components/libtoolkitcomps.so.1.0
 @lib mozilla-firefox/components/libtransformiix.so.1.0
 @lib mozilla-firefox/components/libtxmgr.so.1.0
-@lib mozilla-firefox/components/libtypeaheadfind.so.1.0
 @lib mozilla-firefox/components/libuconv.so.1.0
 @lib mozilla-firefox/components/libucvmath.so.1.0
 @lib mozilla-firefox/components/libuniversalchardet.so.1.0

www/mozilla-firefox/pkg/PLIST

@@ -1,24 +1,20 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/18 13:15:27 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/11/26 18:29:15 pvalchev Exp $
 @conflict mozilla-firebird-*
+%%SHARED%%
 bin/firefox
 bin/mozilla-firefox
 mozilla-firefox/
+mozilla-firefox/LICENSE
 mozilla-firefox/chrome/
-mozilla-firefox/chrome/US/
-mozilla-firefox/chrome/US.jar
-mozilla-firefox/chrome/US/locale/
-mozilla-firefox/chrome/US/locale/US/
-mozilla-firefox/chrome/US/locale/US/browser-region/
-mozilla-firefox/chrome/US/locale/US/communicator-region/
-mozilla-firefox/chrome/US/locale/US/global-region/
-mozilla-firefox/chrome/US/locale/US/navigator-region/
 mozilla-firefox/chrome/browser/
 mozilla-firefox/chrome/browser.jar
 mozilla-firefox/chrome/browser/content/
 mozilla-firefox/chrome/browser/content/browser/
+mozilla-firefox/chrome/browser/content/browser-region/
 mozilla-firefox/chrome/browser/content/browser/bookmarks/
 mozilla-firefox/chrome/browser/content/browser/cookieviewer/
 mozilla-firefox/chrome/browser/content/browser/history/
+mozilla-firefox/chrome/browser/content/browser/migration/
 mozilla-firefox/chrome/browser/content/browser/pref/
 mozilla-firefox/chrome/chromelist.txt
 mozilla-firefox/chrome/classic/
@@ -29,71 +25,35 @@ mozilla-firefox/chrome/classic/skin/classic/browser/
 mozilla-firefox/chrome/classic/skin/classic/browser/bookmarks/
 mozilla-firefox/chrome/classic/skin/classic/browser/pref/
 mozilla-firefox/chrome/classic/skin/classic/communicator/
-mozilla-firefox/chrome/classic/skin/classic/communicator/alerts/
-mozilla-firefox/chrome/classic/skin/classic/communicator/bookmarks/
-mozilla-firefox/chrome/classic/skin/classic/communicator/brand/
 mozilla-firefox/chrome/classic/skin/classic/communicator/cookie/
-mozilla-firefox/chrome/classic/skin/classic/communicator/directory/
-mozilla-firefox/chrome/classic/skin/classic/communicator/icons/
-mozilla-firefox/chrome/classic/skin/classic/communicator/profile/
-mozilla-firefox/chrome/classic/skin/classic/communicator/related/
-mozilla-firefox/chrome/classic/skin/classic/communicator/search/
-mozilla-firefox/chrome/classic/skin/classic/communicator/sidebar/
-mozilla-firefox/chrome/classic/skin/classic/communicator/taskbar/
-mozilla-firefox/chrome/classic/skin/classic/communicator/xpinstall/
-mozilla-firefox/chrome/classic/skin/classic/editor/
-mozilla-firefox/chrome/classic/skin/classic/editor/icons/
 mozilla-firefox/chrome/classic/skin/classic/global/
+mozilla-firefox/chrome/classic/skin/classic/global/alerts/
 mozilla-firefox/chrome/classic/skin/classic/global/arrow/
 mozilla-firefox/chrome/classic/skin/classic/global/checkbox/
 mozilla-firefox/chrome/classic/skin/classic/global/console/
-mozilla-firefox/chrome/classic/skin/classic/global/filepicker/
 mozilla-firefox/chrome/classic/skin/classic/global/icons/
 mozilla-firefox/chrome/classic/skin/classic/global/menu/
-mozilla-firefox/chrome/classic/skin/classic/global/progressmeter/
 mozilla-firefox/chrome/classic/skin/classic/global/radio/
 mozilla-firefox/chrome/classic/skin/classic/global/scrollbar/
-mozilla-firefox/chrome/classic/skin/classic/global/splitter/
+mozilla-firefox/chrome/classic/skin/classic/global/throbber/
 mozilla-firefox/chrome/classic/skin/classic/global/toolbar/
 mozilla-firefox/chrome/classic/skin/classic/global/tree/
-mozilla-firefox/chrome/classic/skin/classic/messenger/
-mozilla-firefox/chrome/classic/skin/classic/messenger/addressbook/
-mozilla-firefox/chrome/classic/skin/classic/messenger/addressbook/icons/
-mozilla-firefox/chrome/classic/skin/classic/messenger/icons/
-mozilla-firefox/chrome/classic/skin/classic/messenger/messengercompose/
-mozilla-firefox/chrome/classic/skin/classic/messenger/smime/
-mozilla-firefox/chrome/classic/skin/classic/messenger/smime/icons/
 mozilla-firefox/chrome/classic/skin/classic/mozapps/
 mozilla-firefox/chrome/classic/skin/classic/mozapps/downloads/
+mozilla-firefox/chrome/classic/skin/classic/mozapps/extensions/
+mozilla-firefox/chrome/classic/skin/classic/mozapps/plugins/
 mozilla-firefox/chrome/classic/skin/classic/mozapps/pref/
+mozilla-firefox/chrome/classic/skin/classic/mozapps/profile/
+mozilla-firefox/chrome/classic/skin/classic/mozapps/shared/
+mozilla-firefox/chrome/classic/skin/classic/mozapps/update/
 mozilla-firefox/chrome/classic/skin/classic/mozapps/xpinstall/
-mozilla-firefox/chrome/classic/skin/classic/navigator/
-mozilla-firefox/chrome/classic/skin/classic/navigator/btn1/
-mozilla-firefox/chrome/classic/skin/classic/navigator/icons/
 mozilla-firefox/chrome/comm/
 mozilla-firefox/chrome/comm.jar
 mozilla-firefox/chrome/comm/content/
 mozilla-firefox/chrome/comm/content/autoconfig/
 mozilla-firefox/chrome/comm/content/communicator/
-mozilla-firefox/chrome/comm/content/communicator-platform/
-mozilla-firefox/chrome/comm/content/communicator-region/
-mozilla-firefox/chrome/comm/content/communicator/alerts/
-mozilla-firefox/chrome/comm/content/communicator/directory/
-mozilla-firefox/chrome/comm/content/communicator/history/
-mozilla-firefox/chrome/comm/content/communicator/p3p/
-mozilla-firefox/chrome/comm/content/communicator/pref/
-mozilla-firefox/chrome/comm/content/communicator/profile/
-mozilla-firefox/chrome/comm/content/communicator/related/
-mozilla-firefox/chrome/comm/content/communicator/search/
-mozilla-firefox/chrome/comm/content/communicator/sidebar/
-mozilla-firefox/chrome/comm/content/communicator/xml/
-mozilla-firefox/chrome/comm/content/communicator/xpinstall/
 mozilla-firefox/chrome/comm/content/cookie/
-mozilla-firefox/chrome/comm/content/navigator/
-mozilla-firefox/chrome/comm/content/navigator-platform/
-mozilla-firefox/chrome/comm/content/navigator-region/
 mozilla-firefox/chrome/comm/content/necko/
-mozilla-firefox/chrome/comm/content/p3p/
 mozilla-firefox/chrome/comm/content/xbl-marquee/
 mozilla-firefox/chrome/embed-sample/
 mozilla-firefox/chrome/embed-sample.jar
@@ -108,63 +68,97 @@ mozilla-firefox/chrome/embed-sample/skin/classic/embed/
 mozilla-firefox/chrome/en-US/
 mozilla-firefox/chrome/en-US.jar
 mozilla-firefox/chrome/en-US/locale/
-mozilla-firefox/chrome/en-US/locale/en-US/
-mozilla-firefox/chrome/en-US/locale/en-US/autoconfig/
-mozilla-firefox/chrome/en-US/locale/en-US/browser/
-mozilla-firefox/chrome/en-US/locale/en-US/browser/bookmarks/
-mozilla-firefox/chrome/en-US/locale/en-US/browser/cookieviewer/
-mozilla-firefox/chrome/en-US/locale/en-US/browser/history/
-mozilla-firefox/chrome/en-US/locale/en-US/browser/pref/
-mozilla-firefox/chrome/en-US/locale/en-US/browser/sidebar/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/directory/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/dom/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/history/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/layout/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/pref/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/profile/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/search/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/security/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/sidebar/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/webservices/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/xml/
-mozilla-firefox/chrome/en-US/locale/en-US/communicator/xpinstall/
-mozilla-firefox/chrome/en-US/locale/en-US/cookie/
-mozilla-firefox/chrome/en-US/locale/en-US/global/
-mozilla-firefox/chrome/en-US/locale/en-US/global/history/
-mozilla-firefox/chrome/en-US/locale/en-US/mozapps/
-mozilla-firefox/chrome/en-US/locale/en-US/mozapps/downloads/
-mozilla-firefox/chrome/en-US/locale/en-US/mozapps/xpinstall/
-mozilla-firefox/chrome/en-US/locale/en-US/navigator/
-mozilla-firefox/chrome/en-US/locale/en-US/necko/
-mozilla-firefox/chrome/en-US/locale/en-US/p3p/
-mozilla-firefox/chrome/en-US/locale/en-US/passwordmgr/
-mozilla-firefox/chrome/en-US/locale/en-US/pipnss/
-mozilla-firefox/chrome/en-US/locale/en-US/pippki/
-mozilla-firefox/chrome/en-mac/
-mozilla-firefox/chrome/en-mac.jar
-mozilla-firefox/chrome/en-mac/locale/
-mozilla-firefox/chrome/en-mac/locale/en-US/
-mozilla-firefox/chrome/en-mac/locale/en-US/communicator-platform/
-mozilla-firefox/chrome/en-mac/locale/en-US/communicator-platform/pref/
-mozilla-firefox/chrome/en-mac/locale/en-US/global-platform/
-mozilla-firefox/chrome/en-mac/locale/en-US/navigator-platform/
-mozilla-firefox/chrome/en-unix/
-mozilla-firefox/chrome/en-unix.jar
-mozilla-firefox/chrome/en-unix/locale/
-mozilla-firefox/chrome/en-unix/locale/en-US/
-mozilla-firefox/chrome/en-unix/locale/en-US/communicator-platform/
-mozilla-firefox/chrome/en-unix/locale/en-US/communicator-platform/pref/
-mozilla-firefox/chrome/en-unix/locale/en-US/global-platform/
-mozilla-firefox/chrome/en-unix/locale/en-US/navigator-platform/
-mozilla-firefox/chrome/en-win/
-mozilla-firefox/chrome/en-win.jar
-mozilla-firefox/chrome/en-win/locale/
-mozilla-firefox/chrome/en-win/locale/en-US/
-mozilla-firefox/chrome/en-win/locale/en-US/communicator-platform/
-mozilla-firefox/chrome/en-win/locale/en-US/communicator-platform/pref/
-mozilla-firefox/chrome/en-win/locale/en-US/global-platform/
-mozilla-firefox/chrome/en-win/locale/en-US/navigator-platform/
+mozilla-firefox/chrome/en-US/locale/browser/
+mozilla-firefox/chrome/en-US/locale/browser-region/
+mozilla-firefox/chrome/en-US/locale/browser/bookmarks/
+mozilla-firefox/chrome/en-US/locale/browser/cookieviewer/
+mozilla-firefox/chrome/en-US/locale/browser/history/
+mozilla-firefox/chrome/en-US/locale/browser/migration/
+mozilla-firefox/chrome/en-US/locale/browser/pref/
+mozilla-firefox/chrome/en-US/locale/browser/sidebar/
+mozilla-firefox/chrome/en-US/locale/cookie/
+mozilla-firefox/chrome/en-US/locale/global/
+mozilla-firefox/chrome/en-US/locale/global-platform/
+mozilla-firefox/chrome/en-US/locale/global-platform/mac/
+mozilla-firefox/chrome/en-US/locale/global-platform/unix/
+mozilla-firefox/chrome/en-US/locale/global-platform/win/
+mozilla-firefox/chrome/en-US/locale/global-region/
+mozilla-firefox/chrome/en-US/locale/global/dom/
+mozilla-firefox/chrome/en-US/locale/global/history/
+mozilla-firefox/chrome/en-US/locale/global/layout/
+mozilla-firefox/chrome/en-US/locale/global/security/
+mozilla-firefox/chrome/en-US/locale/global/webservices/
+mozilla-firefox/chrome/en-US/locale/global/xml/
+mozilla-firefox/chrome/en-US/locale/global/xpinstall/
+mozilla-firefox/chrome/en-US/locale/mozapps/
+mozilla-firefox/chrome/en-US/locale/mozapps/downloads/
+mozilla-firefox/chrome/en-US/locale/mozapps/extensions/
+mozilla-firefox/chrome/en-US/locale/mozapps/plugins/
+mozilla-firefox/chrome/en-US/locale/mozapps/profile/
+mozilla-firefox/chrome/en-US/locale/mozapps/update/
+mozilla-firefox/chrome/en-US/locale/mozapps/xpinstall/
+mozilla-firefox/chrome/en-US/locale/necko/
+mozilla-firefox/chrome/en-US/locale/passwordmgr/
+mozilla-firefox/chrome/en-US/locale/pipnss/
+mozilla-firefox/chrome/en-US/locale/pippki/
+mozilla-firefox/chrome/help/
+mozilla-firefox/chrome/help.jar
+mozilla-firefox/chrome/help/content/
+mozilla-firefox/chrome/help/content/help/
+mozilla-firefox/chrome/help/locale/
+mozilla-firefox/chrome/help/locale/en-US/
+mozilla-firefox/chrome/help/locale/en-US/help/
+mozilla-firefox/chrome/help/skin/
+mozilla-firefox/chrome/help/skin/classic/
+mozilla-firefox/chrome/help/skin/classic/help/
+mozilla-firefox/chrome/inspector/
+mozilla-firefox/chrome/inspector.jar
+mozilla-firefox/chrome/inspector/content/
+mozilla-firefox/chrome/inspector/content/inspector/
+mozilla-firefox/chrome/inspector/content/inspector/extensions/
+mozilla-firefox/chrome/inspector/content/inspector/jsutil/
+mozilla-firefox/chrome/inspector/content/inspector/jsutil/events/
+mozilla-firefox/chrome/inspector/content/inspector/jsutil/rdf/
+mozilla-firefox/chrome/inspector/content/inspector/jsutil/system/
+mozilla-firefox/chrome/inspector/content/inspector/jsutil/xpcom/
+mozilla-firefox/chrome/inspector/content/inspector/jsutil/xul/
+mozilla-firefox/chrome/inspector/content/inspector/prefs/
+mozilla-firefox/chrome/inspector/content/inspector/search/
+mozilla-firefox/chrome/inspector/content/inspector/search/modules/
+mozilla-firefox/chrome/inspector/content/inspector/search/modules/findFiles/
+mozilla-firefox/chrome/inspector/content/inspector/search/modules/junkImgs/
+mozilla-firefox/chrome/inspector/content/inspector/tests/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/boxModel/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/computedStyle/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/dom/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/domNode/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/jsObject/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/styleRules/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/stylesheets/
+mozilla-firefox/chrome/inspector/content/inspector/viewers/xblBindings/
+mozilla-firefox/chrome/inspector/locale/
+mozilla-firefox/chrome/inspector/locale/en-US/
+mozilla-firefox/chrome/inspector/locale/en-US/inspector/
+mozilla-firefox/chrome/inspector/locale/en-US/inspector/search/
+mozilla-firefox/chrome/inspector/locale/en-US/inspector/viewers/
+mozilla-firefox/chrome/inspector/skin/
+mozilla-firefox/chrome/inspector/skin/classic/
+mozilla-firefox/chrome/inspector/skin/classic/inspector/
+mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/
+mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/boxModel/
+mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/dom/
+mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/domNode/
+mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/styleRules/
+mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/xblBindings/
+mozilla-firefox/chrome/inspector/skin/modern/
+mozilla-firefox/chrome/inspector/skin/modern/inspector/
+mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/
+mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/boxModel/
+mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/dom/
+mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/domNode/
+mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/styleRules/
+mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/xblBindings/
 mozilla-firefox/chrome/installed-chrome.txt
 mozilla-firefox/chrome/modern/
 mozilla-firefox/chrome/modern.jar
@@ -187,8 +181,14 @@ mozilla-firefox/chrome/toolkit/content/global/
 mozilla-firefox/chrome/toolkit/content/global-platform/
 mozilla-firefox/chrome/toolkit/content/global-region/
 mozilla-firefox/chrome/toolkit/content/global/bindings/
+mozilla-firefox/chrome/toolkit/content/global/xml/
 mozilla-firefox/chrome/toolkit/content/mozapps/
 mozilla-firefox/chrome/toolkit/content/mozapps/downloads/
+mozilla-firefox/chrome/toolkit/content/mozapps/extensions/
+mozilla-firefox/chrome/toolkit/content/mozapps/plugins/
+mozilla-firefox/chrome/toolkit/content/mozapps/profile/
+mozilla-firefox/chrome/toolkit/content/mozapps/shared/
+mozilla-firefox/chrome/toolkit/content/mozapps/update/
 mozilla-firefox/chrome/toolkit/content/mozapps/xpinstall/
 mozilla-firefox/chrome/toolkit/content/passwordmgr/
 mozilla-firefox/components/
@@ -199,7 +199,6 @@ mozilla-firefox/components/autoconfig.xpt
 mozilla-firefox/components/bookmarks.xpt
 mozilla-firefox/components/caps.xpt
 mozilla-firefox/components/chardet.xpt
-mozilla-firefox/components/chrome.xpt
 mozilla-firefox/components/commandhandler.xpt
 mozilla-firefox/components/composer.xpt
 mozilla-firefox/components/content_base.xpt
@@ -216,6 +215,7 @@ mozilla-firefox/components/dom_core.xpt
 mozilla-firefox/components/dom_css.xpt
 mozilla-firefox/components/dom_events.xpt
 mozilla-firefox/components/dom_html.xpt
+mozilla-firefox/components/dom_loadsave.xpt
 mozilla-firefox/components/dom_range.xpt
 mozilla-firefox/components/dom_stylesheets.xpt
 mozilla-firefox/components/dom_traversal.xpt
@@ -226,7 +226,9 @@ mozilla-firefox/components/dom_xul.xpt
 mozilla-firefox/components/downloads.xpt
 mozilla-firefox/components/editor.xpt
 mozilla-firefox/components/embed_base.xpt
+mozilla-firefox/components/extensions.xpt
 mozilla-firefox/components/exthandler.xpt
+mozilla-firefox/components/fastfind.xpt
 mozilla-firefox/components/filepicker.xpt
 mozilla-firefox/components/find.xpt
 mozilla-firefox/components/gfx.xpt
@@ -234,8 +236,9 @@ mozilla-firefox/components/helperAppDlg.xpt
 mozilla-firefox/components/history.xpt
 mozilla-firefox/components/htmlparser.xpt
 mozilla-firefox/components/imglib2.xpt
+mozilla-firefox/components/inspector-cmdline.js
+mozilla-firefox/components/inspector.xpt
 mozilla-firefox/components/intl.xpt
-mozilla-firefox/components/ipcd.xpt
 mozilla-firefox/components/jar.xpt
 mozilla-firefox/components/jsconsole-clhandler.js
 mozilla-firefox/components/jsconsole.xpt
@@ -246,6 +249,7 @@ mozilla-firefox/components/layout_xul.xpt
 mozilla-firefox/components/layout_xul_tree.xpt
 mozilla-firefox/components/locale.xpt
 mozilla-firefox/components/lwbrk.xpt
+mozilla-firefox/components/migration.xpt
 mozilla-firefox/components/mimetype.xpt
 mozilla-firefox/components/mozbrwsr.xpt
 mozilla-firefox/components/mozfind.xpt
@@ -265,6 +269,7 @@ mozilla-firefox/components/necko_strconv.xpt
 mozilla-firefox/components/necko_viewsource.xpt
 mozilla-firefox/components/nsCloseAllWindows.js
 mozilla-firefox/components/nsDictionary.js
+mozilla-firefox/components/nsExtensionManager.js
 mozilla-firefox/components/nsFilePicker.js
 mozilla-firefox/components/nsHelperAppDlg.js
 mozilla-firefox/components/nsInterfaceInfoToIDL.js
@@ -272,11 +277,11 @@ mozilla-firefox/components/nsKillAll.js
 mozilla-firefox/components/nsProgressDialog.js
 mozilla-firefox/components/nsProxyAutoConfig.js
 mozilla-firefox/components/nsResetPref.js
+mozilla-firefox/components/nsSetDefaultBrowser.js
 mozilla-firefox/components/nsSidebar.js
-mozilla-firefox/components/nsUpdateNotifier.js
+mozilla-firefox/components/nsUpdateService.js
 mozilla-firefox/components/nsXmlRpcClient.js
 mozilla-firefox/components/oji.xpt
-mozilla-firefox/components/p3p.xpt
 mozilla-firefox/components/passwordmgr.xpt
 mozilla-firefox/components/pipboot.xpt
 mozilla-firefox/components/pipnss.xpt
@@ -284,25 +289,22 @@ mozilla-firefox/components/pippki.xpt
 mozilla-firefox/components/plugin.xpt
 mozilla-firefox/components/pref.xpt
 mozilla-firefox/components/prefetch.xpt
-mozilla-firefox/components/prefmigr.xpt
 mozilla-firefox/components/profile.xpt
-mozilla-firefox/components/profilesharingsetup.xpt
 mozilla-firefox/components/progressDlg.xpt
 mozilla-firefox/components/proxyObjInst.xpt
 mozilla-firefox/components/rdf.xpt
-mozilla-firefox/components/related.xpt
 mozilla-firefox/components/satchel.xpt
 mozilla-firefox/components/search.xpt
+mozilla-firefox/components/shellservice.xpt
 mozilla-firefox/components/shistory.xpt
 mozilla-firefox/components/sidebar.xpt
+mozilla-firefox/components/toolkitprofile.xpt
 mozilla-firefox/components/txmgr.xpt
 mozilla-firefox/components/txtsvc.xpt
-mozilla-firefox/components/typeaheadfind.xpt
-mozilla-firefox/components/ucnative.xpt
 mozilla-firefox/components/uconv.xpt
 mozilla-firefox/components/unicharutil.xpt
+mozilla-firefox/components/update.xpt
 mozilla-firefox/components/uriloader.xpt
-mozilla-firefox/components/util.xpt
 mozilla-firefox/components/webBrowser_core.xpt
 mozilla-firefox/components/webbrowserpersist.xpt
 mozilla-firefox/components/webshell_idls.xpt
@@ -329,33 +331,32 @@ mozilla-firefox/defaults/autoconfig/
 mozilla-firefox/defaults/autoconfig/platform.js
 mozilla-firefox/defaults/autoconfig/prefcalls.js
 mozilla-firefox/defaults/pref/
-mozilla-firefox/defaults/pref/all.js
-mozilla-firefox/defaults/pref/editor.js
-mozilla-firefox/defaults/pref/mailnews.js
-mozilla-firefox/defaults/pref/non-shared.txt
-mozilla-firefox/defaults/pref/security-prefs.js
-mozilla-firefox/defaults/pref/unix.js
-mozilla-firefox/defaults/pref/xpinstall.js
+mozilla-firefox/defaults/pref/firefox-l10n.js
+mozilla-firefox/defaults/pref/firefox.js
+mozilla-firefox/defaults/pref/inspector.js
 mozilla-firefox/defaults/profile/
-mozilla-firefox/defaults/profile/US/
-mozilla-firefox/defaults/profile/US/bookmarks.html
-mozilla-firefox/defaults/profile/US/chrome/
-mozilla-firefox/defaults/profile/US/chrome/userChrome-example.css
-mozilla-firefox/defaults/profile/US/chrome/userContent-example.css
-mozilla-firefox/defaults/profile/US/localstore.rdf
-mozilla-firefox/defaults/profile/US/mimeTypes.rdf
-mozilla-firefox/defaults/profile/US/panels.rdf
-mozilla-firefox/defaults/profile/US/search.rdf
 mozilla-firefox/defaults/profile/bookmarks.html
 mozilla-firefox/defaults/profile/chrome/
 mozilla-firefox/defaults/profile/chrome/userChrome-example.css
 mozilla-firefox/defaults/profile/chrome/userContent-example.css
+mozilla-firefox/defaults/profile/extensions/
+mozilla-firefox/defaults/profile/extensions/Extensions.rdf
+mozilla-firefox/defaults/profile/extensions/installed-extensions.txt
+mozilla-firefox/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
+mozilla-firefox/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 mozilla-firefox/defaults/profile/localstore.rdf
 mozilla-firefox/defaults/profile/mimeTypes.rdf
-mozilla-firefox/defaults/profile/panels.rdf
+mozilla-firefox/defaults/profile/prefs.js
 mozilla-firefox/defaults/profile/search.rdf
 mozilla-firefox/firefox-bin
-mozilla-firefox/mozilla-config
+mozilla-firefox/firefox-config
+mozilla-firefox/greprefs/
+mozilla-firefox/greprefs/all.js
+mozilla-firefox/greprefs/security-prefs.js
+mozilla-firefox/greprefs/xpinstall.js
+mozilla-firefox/mozicon16.xpm
+mozilla-firefox/mozicon50.xpm
+mozilla-firefox/mozilla-firefox-bin
 mozilla-firefox/regchrome
 mozilla-firefox/regxpcom
 mozilla-firefox/res/
@@ -365,7 +366,6 @@ mozilla-firefox/res/arrowd.gif
 mozilla-firefox/res/bloatcycle.html
 mozilla-firefox/res/broken-image.gif
 mozilla-firefox/res/builtin/
-mozilla-firefox/res/builtin/htmlBindings.xml
 mozilla-firefox/res/builtin/platformHTMLBindings.xml
 mozilla-firefox/res/charsetData.properties
 mozilla-firefox/res/charsetalias.properties
@@ -405,6 +405,9 @@ mozilla-firefox/res/html/gopher-sound.gif
 mozilla-firefox/res/html/gopher-telnet.gif
 mozilla-firefox/res/html/gopher-text.gif
 mozilla-firefox/res/html/gopher-unknown.gif
+mozilla-firefox/res/inspector/
+mozilla-firefox/res/inspector/search-registry.rdf
+mozilla-firefox/res/inspector/viewer-registry.rdf
 mozilla-firefox/res/langGroups.properties
 mozilla-firefox/res/language.properties
 mozilla-firefox/res/loading-image.gif
@@ -426,31 +429,18 @@ mozilla-firefox/res/samples/bform.css
 mozilla-firefox/res/samples/bg.jpg
 mozilla-firefox/res/samples/cform.css
 mozilla-firefox/res/samples/checkboxTest.xul
-mozilla-firefox/res/samples/colorpicker.xul
 mozilla-firefox/res/samples/demoform.css
-mozilla-firefox/res/samples/dexopenchrome.xul
-mozilla-firefox/res/samples/dexparamdialog.html
-mozilla-firefox/res/samples/dexparamdialog.xul
 mozilla-firefox/res/samples/find.html
 mozilla-firefox/res/samples/gear1.gif
-mozilla-firefox/res/samples/hidetoolicon.css
-mozilla-firefox/res/samples/hidetoolicon.xul
 mozilla-firefox/res/samples/image_props.html
 mozilla-firefox/res/samples/mozform.css
 mozilla-firefox/res/samples/printsetup.html
 mozilla-firefox/res/samples/raptor.jpg
 mozilla-firefox/res/samples/rock_gra.gif
-mozilla-firefox/res/samples/sampleimages/
-mozilla-firefox/res/samples/sampleimages/bongo.gif
-mozilla-firefox/res/samples/sampleimages/down.gif
-mozilla-firefox/res/samples/sampleimages/left.gif
-mozilla-firefox/res/samples/sampleimages/right.gif
-mozilla-firefox/res/samples/sampleimages/up.gif
 mozilla-firefox/res/samples/scrollbarTest1.xul
 mozilla-firefox/res/samples/scrollbarTest2.xul
 mozilla-firefox/res/samples/sliderTest1.xul
 mozilla-firefox/res/samples/soundtest.html
-mozilla-firefox/res/samples/tab.xul
 mozilla-firefox/res/samples/test.wav
 mozilla-firefox/res/samples/test0.html
 mozilla-firefox/res/samples/test1.html
@@ -485,8 +475,6 @@ mozilla-firefox/res/samples/test_weight.html
 mozilla-firefox/res/samples/toolbarTest1.xul
 mozilla-firefox/res/samples/treeTest1.css
 mozilla-firefox/res/samples/treeTest1.xul
-mozilla-firefox/res/samples/widgets.xul
-mozilla-firefox/res/samples/xpmenu.xul
 mozilla-firefox/res/samples/xulTest.css
 mozilla-firefox/res/table-add-column-after-active.gif
 mozilla-firefox/res/table-add-column-after-hover.gif
@@ -544,120 +532,15 @@ mozilla-firefox/res/viewer.properties
 mozilla-firefox/res/viewsource.css
 mozilla-firefox/run-mozilla.sh
 mozilla-firefox/searchplugins/
+mozilla-firefox/searchplugins/amazondotcom.png
+mozilla-firefox/searchplugins/amazondotcom.src
+mozilla-firefox/searchplugins/creativecommons.png
+mozilla-firefox/searchplugins/creativecommons.src
+mozilla-firefox/searchplugins/dictionary.png
+mozilla-firefox/searchplugins/dictionary.src
+mozilla-firefox/searchplugins/eBay.gif
+mozilla-firefox/searchplugins/eBay.src
 mozilla-firefox/searchplugins/google.gif
 mozilla-firefox/searchplugins/google.src
-@exec mkdir -p %D/mozilla-firefox/chrome/toolkit/content/passwordmgr
-@exec mkdir -p %D/mozilla-firefox/chrome/toolkit/content/mozapps/xpinstall
-@exec mkdir -p %D/mozilla-firefox/chrome/toolkit/content/mozapps/downloads
-@exec mkdir -p %D/mozilla-firefox/chrome/toolkit/content/global/bindings
-@exec mkdir -p %D/mozilla-firefox/chrome/toolkit/content/global-region
-@exec mkdir -p %D/mozilla-firefox/chrome/toolkit/content/global-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/pippki/content/pippki
-@exec mkdir -p %D/mozilla-firefox/chrome/pipnss/content/pipnss
-@exec mkdir -p %D/mozilla-firefox/chrome/modern/skin/modern/communicator/cookie
-@exec mkdir -p %D/mozilla-firefox/chrome/en-win/locale/en-US/navigator-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/en-win/locale/en-US/global-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/en-win/locale/en-US/communicator-platform/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/en-unix/locale/en-US/navigator-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/en-unix/locale/en-US/global-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/en-unix/locale/en-US/communicator-platform/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/en-mac/locale/en-US/navigator-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/en-mac/locale/en-US/global-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/en-mac/locale/en-US/communicator-platform/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/pippki
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/pipnss
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/passwordmgr
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/p3p
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/necko
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/navigator
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/mozapps/xpinstall
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/mozapps/downloads
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/global/history
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/cookie
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/xpinstall
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/xml
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/webservices
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/sidebar
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/security
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/search
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/profile
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/layout
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/history
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/dom
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/communicator/directory
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/browser/sidebar
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/browser/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/browser/history
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/browser/cookieviewer
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/browser/bookmarks
-@exec mkdir -p %D/mozilla-firefox/chrome/en-US/locale/en-US/autoconfig
-@exec mkdir -p %D/mozilla-firefox/chrome/embed-sample/skin/classic/embed
-@exec mkdir -p %D/mozilla-firefox/chrome/embed-sample/locale/en-US/embed
-@exec mkdir -p %D/mozilla-firefox/chrome/embed-sample/content/embed
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/xbl-marquee
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/p3p
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/necko
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/navigator-region
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/navigator-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/navigator
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/cookie
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/xpinstall
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/xml
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/sidebar
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/search
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/related
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/profile
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/p3p
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/history
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/directory
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator/alerts
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator-region
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/communicator-platform
-@exec mkdir -p %D/mozilla-firefox/chrome/comm/content/autoconfig
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/navigator/icons
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/navigator/btn1
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/mozapps/xpinstall
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/mozapps/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/mozapps/downloads
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/messenger/smime/icons
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/messenger/messengercompose
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/messenger/icons
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/messenger/addressbook/icons
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/tree
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/toolbar
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/splitter
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/scrollbar
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/radio
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/progressmeter
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/menu
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/icons
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/filepicker
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/console
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/checkbox
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/global/arrow
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/editor/icons
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/xpinstall
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/taskbar
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/sidebar
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/search
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/related
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/profile
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/icons
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/directory
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/cookie
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/brand
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/bookmarks
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/communicator/alerts
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/browser/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/classic/skin/classic/browser/bookmarks
-@exec mkdir -p %D/mozilla-firefox/chrome/browser/content/browser/pref
-@exec mkdir -p %D/mozilla-firefox/chrome/browser/content/browser/history
-@exec mkdir -p %D/mozilla-firefox/chrome/browser/content/browser/cookieviewer
-@exec mkdir -p %D/mozilla-firefox/chrome/browser/content/browser/bookmarks
-@exec mkdir -p %D/mozilla-firefox/chrome/US/locale/US/navigator-region
-@exec mkdir -p %D/mozilla-firefox/chrome/US/locale/US/global-region
-@exec mkdir -p %D/mozilla-firefox/chrome/US/locale/US/communicator-region
-@exec mkdir -p %D/mozilla-firefox/chrome/US/locale/US/browser-region
-%%SHARED%%
+mozilla-firefox/searchplugins/yahoo.gif
+mozilla-firefox/searchplugins/yahoo.src