From 9944b0d1c522da35eee713802a52e83f6a7281b5 Mon Sep 17 00:00:00 2001
From: martynas <martynas@openbsd.org>
Date: Thu, 20 Nov 2008 23:41:32 +0000
Subject: [PATCH] it is the right time to update to mozilla-firefox-3.0.4,
 which has been tested good enough, and i've fixed all the issues i'm aware
 of.  furthermore 2.0 branch has basically reached eol, since there will be
 only one minor update (2.0.0.19) discussed with kurt@, naddy@ and porters
 pkgname change handling help naddy@ ok naddy@

---
 www/mozilla-firefox/Makefile                  |  94 +++----
 www/mozilla-firefox/distinfo                  |  10 +-
 www/mozilla-firefox/files/README.OpenBSD      |  19 +-
 www/mozilla-firefox/files/mozilla-firefox.1   | 115 +++++++++
 ...accessible_src_atk_nsAppRootAccessible_cpp |  12 +
 .../patches/patch-browser_app_application_ini |  11 +
 .../patches/patch-browser_app_mozilla_in      |  22 +-
 .../patch-browser_app_profile_firefox_js      |  25 ++
 .../patches/patch-browser_base_jar_mn         |  13 +
 .../patch-browser_components_nsBrowserGlue_js |  37 +++
 .../patches/patch-config_autoconf_mk_in       |  20 +-
 .../patches/patch-config_rules_mk             |  16 ++
 .../patches/patch-configure_in                |  38 +--
 .../patch-content_xslt_public_txDouble_h      |  12 +
 .../patch-content_xslt_src_base_txDouble_cpp  |  25 ++
 ...ent_xul_templates_src_nsTemplateMatchSet_h |  15 --
 ...ns_spellcheck_hunspell_src_mozHunspell_cpp |  28 +++
 ...ensions_spellcheck_myspell_src_Makefile_in |  10 -
 ...ions_spellcheck_myspell_src_mozMySpell_cpp |  29 ---
 ...nsions_transformiix_source_base_Double_cpp |  29 ---
 .../patches/patch-gfx_src_gtk_Makefile_in     |  14 --
 .../patch-gfx_src_ps_nsFontMetricsPS_cpp      |  12 -
 .../patch-gfx_src_psshared_nsCUPSShim_cpp     |   2 +-
 .../patches/patch-gfx_src_thebes_Makefile_in  |  14 ++
 .../patches/patch-js_Makefile_in              |  11 -
 .../patches/patch-js_src_build_mk             |  10 +
 .../patches/patch-js_src_jsnum_h              |  16 +-
 ...-js_src_liveconnect_nsISecureLiveconnect_h |  21 --
 .../patch-js_src_xpconnect_shell_Makefile_in  |  12 +-
 ...ibpr0n_decoders_icon_gtk_nsIconChannel_cpp |  30 +++
 .../patch-modules_libpref_src_init_all_js     |  61 -----
 .../patch-netwerk_cookie_src_Makefile_in      |   9 +
 ..._branding_firefox_pref_firefox-branding_js |  17 ++
 .../patch-security_coreconf_OpenBSD_mk        |   8 +-
 ...patch-security_manager_ssl_src_Makefile_in |   8 +-
 ...ecurity_manager_ssl_src_nsNSSComponent_cpp |  48 ++--
 ...lassifier_src_nsUrlClassifierDBService_cpp |  45 ++++
 ...tch-toolkit_xre_nsNativeAppSupportUnix_cpp |  17 ++
 .../patch-toolkit_xre_nsXREDirProvider_cpp    |  16 ++
 .../patch-widget_src_gtk2_nsBidiKeyboard_cpp  |  12 +
 ...patch-widget_src_gtk2_nsIdleServiceGTK_cpp |  12 +
 ...tch-widget_src_gtk2_nsScreenManagerGtk_cpp |  12 +
 .../patches/patch-widget_src_gtk2_nsSound_cpp |  10 +-
 .../patches/patch-xpcom_base_nsStackWalk_cpp  |  12 +
 ...com_components_nsNativeComponentLoader_cpp |  12 -
 ...om_reflect_xptcall_src_md_unix_Makefile_in |  20 ++
 ...l_src_md_unix_xptcinvoke_asm_ppc_openbsd_s | 227 +++++++++++++++++
 ...ll_src_md_unix_xptcstubs_asm_ppc_openbsd_s | 170 +++++++++++++
 .../patch-xpfe_bootstrap_mozilla_man_in       |  75 ------
 www/mozilla-firefox/pkg/DESCR                 |   2 +-
 www/mozilla-firefox/pkg/PLIST                 | 233 ++++++------------
 51 files changed, 1154 insertions(+), 594 deletions(-)
 create mode 100644 www/mozilla-firefox/files/mozilla-firefox.1
 create mode 100644 www/mozilla-firefox/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-browser_app_application_ini
 create mode 100644 www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
 create mode 100644 www/mozilla-firefox/patches/patch-browser_base_jar_mn
 create mode 100644 www/mozilla-firefox/patches/patch-browser_components_nsBrowserGlue_js
 create mode 100644 www/mozilla-firefox/patches/patch-config_rules_mk
 create mode 100644 www/mozilla-firefox/patches/patch-content_xslt_public_txDouble_h
 create mode 100644 www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp
 delete mode 100644 www/mozilla-firefox/patches/patch-content_xul_templates_src_nsTemplateMatchSet_h
 create mode 100644 www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp
 delete mode 100644 www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_Makefile_in
 delete mode 100644 www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_mozMySpell_cpp
 delete mode 100644 www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp
 delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_gtk_Makefile_in
 delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-gfx_src_thebes_Makefile_in
 delete mode 100644 www/mozilla-firefox/patches/patch-js_Makefile_in
 create mode 100644 www/mozilla-firefox/patches/patch-js_src_build_mk
 delete mode 100644 www/mozilla-firefox/patches/patch-js_src_liveconnect_nsISecureLiveconnect_h
 create mode 100644 www/mozilla-firefox/patches/patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp
 delete mode 100644 www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js
 create mode 100644 www/mozilla-firefox/patches/patch-netwerk_cookie_src_Makefile_in
 create mode 100644 www/mozilla-firefox/patches/patch-other-licenses_branding_firefox_pref_firefox-branding_js
 create mode 100644 www/mozilla-firefox/patches/patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-toolkit_xre_nsNativeAppSupportUnix_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-widget_src_gtk2_nsBidiKeyboard_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-widget_src_gtk2_nsIdleServiceGTK_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-widget_src_gtk2_nsScreenManagerGtk_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-xpcom_base_nsStackWalk_cpp
 delete mode 100644 www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp
 create mode 100644 www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
 create mode 100644 www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s
 create mode 100644 www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s
 delete mode 100644 www/mozilla-firefox/patches/patch-xpfe_bootstrap_mozilla_man_in

diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index c1480d5c4f9..cb700e195ce 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,26 +1,27 @@
-# $OpenBSD: Makefile,v 1.104 2008/11/13 16:57:14 martynas Exp $
+# $OpenBSD: Makefile,v 1.105 2008/11/20 23:41:32 martynas Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
 
 COMMENT=	redesign of Mozilla's browser component
 
-VER=		2.0.0.18
+VER=		3.0.4
 DISTNAME=	mozilla
 PKGNAME=	mozilla-firefox-${VER}
-SO_VERSION=	19.0
+SO_VERSION=	20.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 .for _lib in accessibility appcomps auth autoconfig browsercomps \
-	browserdirprovider caps chrome commandlines composer cookie docshell \
-	editor embedcomponents fileview gfx_gtk gfxps gfxpsshar gkgfx \
-	gklayout gkplugin gtkembedmoz gtkxtbin htmlpars i18n imglib2 jar50 \
-	jsd jsj mork mozfind mozjs myspell necko necko2 nsappshell nullplugin \
-	oji permissions pipboot pipnss pippki pref rdf remoteservice \
-	searchservice spellchecker storagecomps system-pref toolkitcomps \
-	transformiix txmgr uconv ucvmath universalchardet unixprintplugin \
-	webbrwsr websrvcs widget_gtk2 xmlextras xpcom xpcom_compat \
-	xpcom_compat_c xpcom_core xpconnect xpinstall xpistub
+	browserdirprovider caps chardet chrome commandlines composer \
+	cookie docshell embedcomponents fileview gkgfxthebes gklayout \
+	gkplugin htmlpars i18n imgicon imglib2 intlapp jar50 jsd \
+	mozfind necko nsappshell oji permissions pipboot pipnss \
+	pippki places pref rdf remoteservice satchel spellchecker \
+	storagecomps system-pref tkautocomplete toolkitcomps txmgr \
+	uconv ucvmath universalchardet unixproxy webbrwsr widget_gtk2 \
+	windowds xmlextras xpconnect xpinstall zipwriter gfxpsshar \
+	gkgfx gtkxtbin jsj mozjs mozlcms thebes xpcom xpcom_core \
+	xul nullplugin unixprintplugin
 SHARED_LIBS+=	${_lib}	${SO_VERSION}
 .endfor
 
@@ -40,20 +41,20 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/
 DISTFILES=	firefox-${VER}-source.tar.bz2
 
-MODULES=	devel/gettext
+MODULES=	devel/gettext lang/python
 RUN_DEPENDS=	:esound-*:audio/esound \
 		:desktop-file-utils-*:devel/desktop-file-utils
 BUILD_DEPENDS=	:libIDL-*:devel/libIDL \
 		:zip->=2.3:archivers/zip
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
-		nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr \
-		nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss
-WANTLIB=	X11 Xau Xcomposite Xdamage Xcursor Xdmcp Xext Xfixes \
-		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
-		fontconfig freetype glib-2.0 glitz gmodule-2.0 \
-		gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-		pixman-1 png pthread stdc++ z \
-		Xft Xinerama Xt gthread-2.0 jpeg pangox-1.0
+		nspr4.>=20,plc4.>=20,plds4.>=20:nspr->=4.7:devel/nspr \
+		nss3.>=22,smime3.>=22,softokn3.>=22,ssl3.>=22:nss->=3.12:security/nss \
+		sqlite3.>=10.0:sqlite3->=3.5:databases/sqlite3
+WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi \
+		Xinerama Xrandr Xrender Xt atk-1.0 c cairo expat fontconfig \
+		freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
+		jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
+		pthread stdc++ z
 
 VMEM_WARNING=	Yes
 
@@ -67,26 +68,32 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf
 AUTOCONF_VERSION= 2.13
 CONFIGURE_STYLE= autoconf no-autoheader
 CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
-		--with-system-png=${LOCALBASE}	\
 		--with-system-zlib=/usr/lib	\
 		--with-system-nspr		\
 		--with-system-nss		\
 		--with-pthreads			\
 		--enable-xft			\
 		--disable-optimize		\
-		--enable-default-toolkit=gtk2	\
+		--enable-default-toolkit=cairo-gtk2 \
 		--disable-debug			\
 		--disable-tests			\
+		--disable-freetypetest		\
+		--disable-mochitest		\
+		--disable-libIDLtest		\
+		--disable-glibtest		\
 		--disable-pedantic		\
 		--disable-installer		\
 		--disable-updater		\
 		--disable-gnomeui		\
 		--disable-gnomevfs		\
+		--disable-dbus			\
 		--enable-xinerama		\
 		--enable-svg			\
 		--enable-svg-renderer=cairo	\
 		--enable-system-cairo		\
+		--enable-system-sqlite		\
 		--enable-canvas			\
+		--disable-libxul		\
 		--enable-official-branding
 
 # from browser/config/mozconfig
@@ -102,25 +109,24 @@ MAKE_ENV=	MOZ_CO_PROJECT=browser \
 		MOZILLA_OFFICIAL=1 \
 		SO_VERSION="${SO_VERSION}"
 CONFIGURE_ENV=	${MAKE_ENV} \
-		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \
 		MOZ_ENABLE_COREXFONTS=1 \
+		PYTHON="${MODPY_BIN}" \
 		topsrcdir=${WRKSRC}
 
+MODPY_RUNDEP=	No
+
 MOB=		${WRKSRC}/dist/bin
 MOZ=		${PREFIX}/mozilla-firefox
 
 DATADIRS=	chrome components defaults dictionaries extensions \
-		greprefs icons init.d plugins res searchplugins
+		greprefs icons modules plugins res searchplugins
 
 pre-configure:
-	@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
+	perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
 		${WRKSRC}/browser/app/mozilla.in \
-		${WRKSRC}/js/src/xpconnect/shell/Makefile.in
-	@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
-		${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
-
-post-build:
-	@cd ${WRKSRC}/xpfe/bootstrap && ${MAKE_PROGRAM} firefox.1
+		${WRKSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp \
+		${WRKSRC}/js/src/xpconnect/shell/Makefile.in \
+		${WRKSRC}/toolkit/xre/nsXREDirProvider.cpp
 
 do-install:
 	cd ${MOB} && \
@@ -128,23 +134,23 @@ do-install:
 			-exec ${INSTALL_DATA_DIR} ${MOZ}/{} \; && \
 		find ${DATADIRS} ! -type d \
 			-exec ${INSTALL_DATA} -m 644 {} ${MOZ}/{} \;
-	${INSTALL_DATA} ${MOB}/*.so.${SO_VERSION} ${MOZ}
-	chown -R ${SHAREOWN}:${SHAREGRP} ${MOZ}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE \
-		${FILESDIR}/browserconfig.properties ${MOZ}
+	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD \
+		${FILESDIR}/browserconfig.properties ${MOB}/*.so.${SO_VERSION} \
+		${MOB}/LICENSE ${MOB}/application.ini ${MOB}/blocklist.xml \
+		${MOB}/platform.ini ${MOZ}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${FILESDIR}/firefox.desktop ${PREFIX}/share/applications
+	${INSTALL_MAN} ${FILESDIR}/mozilla-firefox.1 ${PREFIX}/man/man1
+	perl -pi -e 's,!!PREFIX!!,${TRUEPREFIX},g; \
+		s,!!LOCALBASE!!,${LOCALBASE},g; s,!!VERSION!!,${VER},g' \
+		${MOZ}/README.OpenBSD ${PREFIX}/man/man1/mozilla-firefox.1 \
+		${PREFIX}/share/applications/firefox.desktop
+	ln -f ${PREFIX}/man/man1/mozilla-firefox.1 ${PREFIX}/man/man1/firefox.1
 	${INSTALL_SCRIPT} ${MOB}/firefox ${PREFIX}/bin
 	ln -f ${PREFIX}/bin/firefox ${PREFIX}/bin/mozilla-firefox
 	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
 	${INSTALL_PROGRAM} ${MOB}/firefox-bin ${MOB}/mozilla-xremote-client \
 		${MOB}/regxpcom ${MOZ}
 	ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin
-	@sed -e 's,!!PREFIX!!,${TRUEPREFIX},g; s,!!LOCALBASE!!,${LOCALBASE},g' \
-		< ${FILESDIR}/README.OpenBSD > ${MOZ}/README.OpenBSD
-	${INSTALL_MAN} ${WRKSRC}/xpfe/bootstrap/firefox.1 ${PREFIX}/man/man1/
-	@ln -f ${PREFIX}/man/man1/firefox.1 ${PREFIX}/man/man1/mozilla-firefox.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-	@sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \
-		< ${FILESDIR}/firefox.desktop > \
-			${PREFIX}/share/applications/firefox.desktop
 
 .include <bsd.port.mk>
diff --git a/www/mozilla-firefox/distinfo b/www/mozilla-firefox/distinfo
index d4eabad6668..c57db5a1c6c 100644
--- a/www/mozilla-firefox/distinfo
+++ b/www/mozilla-firefox/distinfo
@@ -1,5 +1,5 @@
-MD5 (firefox-2.0.0.18-source.tar.bz2) = aRPwOOEl40+qjFQMt3veUQ==
-RMD160 (firefox-2.0.0.18-source.tar.bz2) = z4U5jamgBtcpYtxDhti8c0GUK98=
-SHA1 (firefox-2.0.0.18-source.tar.bz2) = uSpye/gSpFSLyI75VGSSqJgfwJ8=
-SHA256 (firefox-2.0.0.18-source.tar.bz2) = Z96GT0eUm8UeWqdAfAsvPLmudyiyjWxX5ooEjaMSGNc=
-SIZE (firefox-2.0.0.18-source.tar.bz2) = 40291897
+MD5 (firefox-3.0.4-source.tar.bz2) = ihrEpZQBCKlkWMUwenTJjQ==
+RMD160 (firefox-3.0.4-source.tar.bz2) = meNLdv7KIsdCh7Ho14oELDE8P5c=
+SHA1 (firefox-3.0.4-source.tar.bz2) = FnFbSvfKK61rqo1FCj/Zyzda1tY=
+SHA256 (firefox-3.0.4-source.tar.bz2) = aF33x/M/xxqMLQ+3HhkNWeLdkgB8Ks4a0XbmVfswEtc=
+SIZE (firefox-3.0.4-source.tar.bz2) = 36989339
diff --git a/www/mozilla-firefox/files/README.OpenBSD b/www/mozilla-firefox/files/README.OpenBSD
index 415bb061f83..2d88184c545 100644
--- a/www/mozilla-firefox/files/README.OpenBSD
+++ b/www/mozilla-firefox/files/README.OpenBSD
@@ -1,4 +1,4 @@
-$OpenBSD: README.OpenBSD,v 1.7 2008/07/26 16:23:32 ajacoutot Exp $
+$OpenBSD: README.OpenBSD,v 1.8 2008/11/20 23:41:32 martynas Exp $
 
 If you encounter strange problems relating to bookmarks, downloads,
 window placement, toolbars, history, or other settings, it is
@@ -54,3 +54,20 @@ Double-click on any cipher to toggle its state. For example, to
 enable TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, double-click on
 security.ssl3.ecdhe_ecdsa_aes128_sha until its boolean entry in the
 Value column changes to true.
+
+Using CUPS and LPR for printing
+
+Since version 3, Firefox uses standard printing dialog from gtk+2.
+In order to use CUPS for printing, you will need to install cups
+subpackage of gtk+2, i.e.:
+
+# pkg_add gtk+2-cups
+
+Gtk+2 doesn't try to use LPR printing backend by default.  In order
+to use LPR for printing, create ~/.gtkrc-2.0 with the following
+contents:
+
+gtk-print-backends = "file,lpr,cups"
+
+If you want to make this change available for all users, use
+/etc/gtkrc instead of ~/.gtkrc-2.0.
diff --git a/www/mozilla-firefox/files/mozilla-firefox.1 b/www/mozilla-firefox/files/mozilla-firefox.1
new file mode 100644
index 00000000000..978f3e147a8
--- /dev/null
+++ b/www/mozilla-firefox/files/mozilla-firefox.1
@@ -0,0 +1,115 @@
+.TH firefox 1 "March 28, 2005" firefox "Linux User's Manual"
+.SH NAME
+firefox \- redesign of Mozilla's browser component.
+
+.SH SYNOPSIS
+.B firefox
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.B firefox-bin
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.SH DESCRIPTION
+\fBFirefox\fR is an open-source web browser, designed for standards compliance,
+performance and portability.
+
+.SH USAGE
+\fBfirefox\fR is a simple shell script that will set up the environment for
+the actual executable, \fBfirefox-bin\fR.
+
+.SH OPTIONS
+A summary of the options supported by \fBfirefox\fR is included below.
+
+.SS "GTK options"
+\fB\-\-gdk-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to set
+.TP
+\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to unset
+.TP
+\fB\-\-gtk-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to set
+.TP
+\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to unset
+.TP
+\fB\-\-gtk-module=\fR\fIMODULE\fR
+Load an additional Gtk module
+
+.SS "X11 options"
+.TP
+.BI \-\-display= DISPLAY
+X display to use
+.TP
+.B \--sync
+Make X calls synchronous
+.TP
+.B \-\-no-xshm
+Don't use X shared memory extension
+.TP
+.BI \-\-xim-preedit= STYLE
+.TP
+.BI \-\-xim-status= STYLE
+.TP
+.B \-\-g-fatal-warnings
+Make all warnings fatal
+
+.SS "Firefox options"
+.TP
+\fB\-height\fR \fIvalue\fR
+Set height of startup window to \fIvalue\fR.
+.TP
+.B \-h, \-help
+Show summary of options.
+.TP
+\fB\-width\fR \fIvalue\fR
+Set width of startup window to \fIvalue\fR.
+.TP
+.B \-v, \-version
+Print \fBfirefox-bin\fR version.
+.TP
+\fB\-CreateProfile\fR \fIprofile\fR
+Create \fIprofile\fR.
+.TP
+\fB\-P\fR \fIprofile\fR
+Start with \fIprofile\fR.
+.TP
+.B \-ProfileManager
+Start with profile manager.
+.TP
+\fB\-UILocale\fR \fIlocale\fR
+Start with \fIlocale\fR resources as UI Locale.
+.TP
+\fB\-contentLocale\fR \fIlocale\fR
+Start with \fIlocale\fR resources as content Locale.
+.TP
+.B \-safe-mode
+Disables extensions and themes for the session.
+.TP
+.B \-jsconsole
+Start with Javascript Console
+.TP
+\fB\-chrome\fR \fIurl\fR
+Load the specified chrome.
+.TP
+.B \-browser
+Open a browser window.
+
+.SH FILES
+\fI!!PREFIX!!/bin/firefox\fR - shell script wrapping \fBfirefox\fR
+.br
+\fI!!PREFIX!!/mozilla-firefox/firefox-bin\fR - \fBfirefox\fR executable
+
+.SH VERSION
+!!VERSION!!
+
+.SH BUGS
+To report a bug, please visit \fIhttps://bugzilla.mozilla.org/\fR
+
+.SH "SEE ALSO"
+.BR galeon(1)
+
+.SH AUTHORS
+.TP
+.B The Mozilla Organization
+.I http://www.mozilla.org/about.html
diff --git a/www/mozilla-firefox/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp b/www/mozilla-firefox/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp
new file mode 100644
index 00000000000..f55637ac2ac
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- accessible/src/atk/nsAppRootAccessible.cpp.orig	Thu Oct 11 13:13:32 2007
++++ accessible/src/atk/nsAppRootAccessible.cpp	Fri Jun 13 19:31:10 2008
+@@ -55,7 +55,7 @@ typedef GType (* AtkGetTypeType) (void);
+ GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
+ static PRBool sATKChecked = PR_FALSE;
+ static PRLibrary *sATKLib = nsnull;
+-static const char sATKLibName[] = "libatk-1.0.so.0";
++static const char sATKLibName[] = "libatk-1.0.so";
+ static const char sATKHyperlinkImplGetTypeSymbol[] =
+     "atk_hyperlink_impl_get_type";
+ static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
diff --git a/www/mozilla-firefox/patches/patch-browser_app_application_ini b/www/mozilla-firefox/patches/patch-browser_app_application_ini
new file mode 100644
index 00000000000..47372cdcc9b
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-browser_app_application_ini
@@ -0,0 +1,11 @@
+$OpenBSD: patch-browser_app_application_ini,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- browser/app/application.ini.orig	Tue Aug 26 22:20:03 2008
++++ browser/app/application.ini	Tue Oct 14 04:13:51 2008
+@@ -56,7 +56,4 @@ EnableProfileMigrator=1
+ EnableExtensionManager=1
+ 
+ [Crash Reporter]
+-#if MOZILLA_OFFICIAL
+-Enabled=1
+-#endif
+ ServerURL=https://crash-reports.mozilla.com/submit
diff --git a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
index e8244c78410..c4fe702ce94 100644
--- a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
+++ b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-browser_app_mozilla_in,v 1.9 2008/07/20 09:49:00 claudio Exp $
---- browser/app/mozilla.in.orig	Thu Nov  8 10:53:19 2007
-+++ browser/app/mozilla.in	Tue Nov 27 11:43:00 2007
-@@ -92,7 +92,13 @@ moz_pis_startstop_scripts()
+$OpenBSD: patch-browser_app_mozilla_in,v 1.10 2008/11/20 23:41:32 martynas Exp $
+--- browser/app/mozilla.in.orig	Fri Oct  5 10:29:26 2007
++++ browser/app/mozilla.in	Sat Nov 17 16:13:18 2007
+@@ -52,6 +52,11 @@
  #uncomment for debugging
  #set -x
  
@@ -11,20 +11,18 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.9 2008/07/20 09:49:00 claudio Exp $
 +fi
 +
  moz_libdir=%MOZAPPDIR%
-+MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=_LOCALBASE_/lib/mozilla-plugins}
- MRE_HOME=%MREDIR%
  
  # Use run-mozilla.sh in the current dir if it exists
-@@ -172,7 +178,11 @@ do
+@@ -130,6 +135,12 @@ do
+       ;;
    esac
  done
- 
--export MRE_HOME
++
 +if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]; then
 +	export GDK_USE_XFT=0
 +fi
 +
-+export MOZ_PLUGIN_PATH MRE_HOME
++export MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=_LOCALBASE_/lib/mozilla-plugins}
  
- ## Start addon scripts
- moz_pis_startstop_scripts "start"
+ if [ $debugging = 1 ]
+ then
diff --git a/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js b/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
new file mode 100644
index 00000000000..94bc7932016
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
@@ -0,0 +1,25 @@
+$OpenBSD: patch-browser_app_profile_firefox_js,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- browser/app/profile/firefox.js.orig	Mon Jul 21 21:47:20 2008
++++ browser/app/profile/firefox.js	Wed Oct 15 23:41:06 2008
+@@ -89,7 +89,7 @@ pref("browser.dictionaries.download.url", "https://%LO
+ // App-specific update preferences
+ 
+ // Whether or not app updates are enabled
+-pref("app.update.enabled", true);
++pref("app.update.enabled", false);
+ 
+ // This preference turns on app.update.mode and allows automatic download and
+ // install to take place. We use a separate boolean toggle for this to make
+@@ -590,10 +590,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
+ 
+ #ifdef MOZ_SAFE_BROWSING
+ // Safe browsing does nothing unless this pref is set
+-pref("browser.safebrowsing.enabled", true);
++pref("browser.safebrowsing.enabled", false);
+ 
+ // Prevent loading of pages identified as malware
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.malware.enabled", false);
+ 
+ // Non-enhanced mode (local url lists) URL list to check for updates
+ pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.1");
diff --git a/www/mozilla-firefox/patches/patch-browser_base_jar_mn b/www/mozilla-firefox/patches/patch-browser_base_jar_mn
new file mode 100644
index 00000000000..12e3cb66cce
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-browser_base_jar_mn
@@ -0,0 +1,13 @@
+$OpenBSD: patch-browser_base_jar_mn,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- browser/base/jar.mn.orig	Sun Apr 13 00:26:19 2008
++++ browser/base/jar.mn	Fri Jul 18 00:54:00 2008
+@@ -21,9 +21,6 @@ browser.jar:
+ *       content/browser/browser.js                    (content/browser.js)
+ *       content/browser/browser.xul                   (content/browser.xul)
+ *       content/browser/credits.xhtml                 (content/credits.xhtml)
+-*       content/browser/EULA.js                       (content/EULA.js)
+-*       content/browser/EULA.xhtml                    (content/EULA.xhtml)
+-*       content/browser/EULA.xul                      (content/EULA.xul)
+ *       content/browser/metaData.js                   (content/metaData.js)
+ *       content/browser/metaData.xul                  (content/metaData.xul)
+ *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
diff --git a/www/mozilla-firefox/patches/patch-browser_components_nsBrowserGlue_js b/www/mozilla-firefox/patches/patch-browser_components_nsBrowserGlue_js
new file mode 100644
index 00000000000..948cec1aeb0
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-browser_components_nsBrowserGlue_js
@@ -0,0 +1,37 @@
+$OpenBSD: patch-browser_components_nsBrowserGlue_js,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- browser/components/nsBrowserGlue.js.orig	Tue Sep 16 22:07:25 2008
++++ browser/components/nsBrowserGlue.js	Tue Sep 23 20:40:15 2008
+@@ -175,33 +175,6 @@ BrowserGlue.prototype = {
+   // profile startup handler (contains profile initialization routines)
+   _onProfileStartup: function() 
+   {
+-    // Check to see if the EULA must be shown on startup
+-
+-    var prefBranch = Cc["@mozilla.org/preferences-service;1"].
+-                     getService(Ci.nsIPrefBranch);
+-    var mustDisplayEULA = false;
+-    try {
+-      mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
+-    } catch (e) {
+-      // Pref might not exist
+-    }
+-
+-    // Make sure it hasn't already been accepted
+-    if (mustDisplayEULA) {
+-      try {
+-        var EULAVersion = prefBranch.getIntPref("browser.EULA.version");
+-        mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA." + EULAVersion + ".accepted");
+-      } catch(ex) {
+-      }
+-    }
+-
+-    if (mustDisplayEULA) {
+-      var ww2 = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+-                getService(Ci.nsIWindowWatcher);
+-      ww2.openWindow(null, "chrome://browser/content/EULA.xul", 
+-                     "_blank", "chrome,centerscreen,modal,resizable=yes", null);
+-    }
+-
+     this.Sanitizer.onStartup();
+     // check if we're in safe mode
+     var app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).
diff --git a/www/mozilla-firefox/patches/patch-config_autoconf_mk_in b/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
index ce4a645d83e..879bb889901 100644
--- a/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
+++ b/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.5 2007/01/12 21:46:17 kurt Exp $
---- config/autoconf.mk.in.orig	Thu Sep 14 21:07:03 2006
-+++ config/autoconf.mk.in	Mon Dec 11 15:51:39 2006
-@@ -57,13 +57,13 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+$OpenBSD: patch-config_autoconf_mk_in,v 1.6 2008/11/20 23:41:32 martynas Exp $
+--- config/autoconf.mk.in.orig	Thu Oct 11 21:50:54 2007
++++ config/autoconf.mk.in	Sun Nov 18 15:03:16 2007
+@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -10,11 +10,13 @@ $OpenBSD: patch-config_autoconf_mk_in,v 1.5 2007/01/12 21:46:17 kurt Exp $
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
--idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +idldir		= $(prefix)/mozilla-firefox/idl
  
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(prefix)/mozilla-firefox
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(prefix)/mozilla-firefox
++sdkdir		= $(prefix)/mozilla-firefox
  
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
diff --git a/www/mozilla-firefox/patches/patch-config_rules_mk b/www/mozilla-firefox/patches/patch-config_rules_mk
new file mode 100644
index 00000000000..17cf122423b
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-config_rules_mk
@@ -0,0 +1,16 @@
+$OpenBSD: patch-config_rules_mk,v 1.6 2008/11/20 23:41:32 martynas Exp $
+--- config/rules.mk.orig	Wed Jun 25 02:29:46 2008
++++ config/rules.mk	Fri Jul 25 04:37:19 2008
+@@ -482,6 +482,12 @@ endif
+ endif
+ endif
+ 
++ifeq ($(OS_ARCH),OpenBSD)
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++endif
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(filter mips mipsel,$(OS_TEST)))
+ ifeq ($(MODULE),layout)
diff --git a/www/mozilla-firefox/patches/patch-configure_in b/www/mozilla-firefox/patches/patch-configure_in
index 667081157f9..7f74833d12a 100644
--- a/www/mozilla-firefox/patches/patch-configure_in
+++ b/www/mozilla-firefox/patches/patch-configure_in
@@ -1,7 +1,16 @@
-$OpenBSD: patch-configure_in,v 1.14 2008/11/13 16:57:14 martynas Exp $
---- configure.in.orig	Sun Oct 19 19:14:06 2008
-+++ configure.in	Wed Nov 12 21:01:21 2008
-@@ -2030,7 +2030,7 @@ case "$target" in
+$OpenBSD: patch-configure_in,v 1.15 2008/11/20 23:41:32 martynas Exp $
+--- configure.in.orig	Thu Aug 14 13:00:32 2008
++++ configure.in	Tue Sep 23 20:37:31 2008
+@@ -128,7 +128,7 @@ LIBGNOME_VERSION=2.0
+ STARTUP_NOTIFICATION_VERSION=0.8
+ DBUS_VERSION=0.60
+ LCMS_VERSION=1.17
+-SQLITE_VERSION=3.5.9
++SQLITE_VERSION=3.5
+ 
+ MSMANIFEST_TOOL=
+ 
+@@ -2223,7 +2223,7 @@ case "$target" in
  	;;
  
  *-openbsd*)
@@ -10,21 +19,12 @@ $OpenBSD: patch-configure_in,v 1.14 2008/11/13 16:57:14 martynas Exp $
      DSO_CFLAGS=''
      DSO_PIC_CFLAGS='-fPIC'
      DSO_LDOPTS='-shared -fPIC'
-@@ -3880,7 +3880,7 @@ _SAVE_LIBS=$LIBS
- CFLAGS="$ZLIB_CFLAGS $CFLAGS"
- LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
- if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
--    CFLAGS="-I${PNG_DIR}/include $CFLAGS"
-+    CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS"
-     LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
- fi
- if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
-@@ -3910,7 +3910,7 @@ LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
+@@ -4047,7 +4047,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
+     _USE_SYSTEM_NSS=1 )
  
- if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
--    PNG_CFLAGS="-I${PNG_DIR}/include"
-+    PNG_CFLAGS="-I${PNG_DIR}/include/libpng"
-     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
+ if test -n "$_USE_SYSTEM_NSS"; then
+-    AM_PATH_NSS(3.12.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
++    AM_PATH_NSS(3.12, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
  fi
  
+ if test -n "$MOZ_NATIVE_NSS"; then
diff --git a/www/mozilla-firefox/patches/patch-content_xslt_public_txDouble_h b/www/mozilla-firefox/patches/patch-content_xslt_public_txDouble_h
new file mode 100644
index 00000000000..0703e46d083
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-content_xslt_public_txDouble_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-content_xslt_public_txDouble_h,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- content/xslt/public/txDouble.h.orig	Fri Jan 25 09:02:04 2008
++++ content/xslt/public/txDouble.h	Mon Jul 14 01:25:38 2008
+@@ -63,7 +63,7 @@ static fp_except_t oldmask = fpsetmask(~allmask);
+  */
+ 
+ #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
+-#if !defined(__VFP_FP__)
++#if !defined(__VFP_FP__) && !defined(__OpenBSD__) /* Armel ABI */
+ #define FPU_IS_ARM_FPA
+ #endif
+ #endif
diff --git a/www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp b/www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp
new file mode 100644
index 00000000000..cbd677c04ca
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp
@@ -0,0 +1,25 @@
+$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- content/xslt/src/base/txDouble.cpp.orig	Fri Jan 25 10:02:04 2008
++++ content/xslt/src/base/txDouble.cpp	Thu Jun 19 22:39:42 2008
+@@ -49,14 +49,16 @@
+  * Utility class for doubles
+  */
+ 
++#define STRICT_ALIGN __attribute__ ((aligned (8)))
++
+ //-- Initialize Double related constants
+-const txdpun nanMask =    TX_DOUBLE_NaN;
++const txdpun nanMask STRICT_ALIGN =    TX_DOUBLE_NaN;
+ #ifdef IS_BIG_ENDIAN
+-const txdpun infMask =    {{TX_DOUBLE_HI32_EXPMASK, 0}};
+-const txdpun negInfMask = {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
++const txdpun infMask STRICT_ALIGN =    {{TX_DOUBLE_HI32_EXPMASK, 0}};
++const txdpun negInfMask STRICT_ALIGN = {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
+ #else
+-const txdpun infMask =    {{0, TX_DOUBLE_HI32_EXPMASK}};
+-const txdpun negInfMask = {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
++const txdpun infMask STRICT_ALIGN =    {{0, TX_DOUBLE_HI32_EXPMASK}};
++const txdpun negInfMask STRICT_ALIGN = {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
+ #endif
+ 
+ const double Double::NaN = nanMask.d;
diff --git a/www/mozilla-firefox/patches/patch-content_xul_templates_src_nsTemplateMatchSet_h b/www/mozilla-firefox/patches/patch-content_xul_templates_src_nsTemplateMatchSet_h
deleted file mode 100644
index 55524ab51be..00000000000
--- a/www/mozilla-firefox/patches/patch-content_xul_templates_src_nsTemplateMatchSet_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-content_xul_templates_src_nsTemplateMatchSet_h,v 1.2 2007/04/06 14:33:36 martynas Exp $
---- content/xul/templates/src/nsTemplateMatchSet.h.orig	Sun Apr 18 00:52:30 2004
-+++ content/xul/templates/src/nsTemplateMatchSet.h	Fri Apr  6 17:21:07 2007
-@@ -207,7 +207,11 @@ class nsTemplateMatchRefSet (protected)
-      * If the set is currently
-      */
-     struct InlineMatches {
-+#ifdef __LP64__
-+        PRUint64         mCount;
-+#else
-         PRUint32         mCount;
-+#endif
-         nsTemplateMatch* mEntries[kMaxInlineMatches];
-     };
- 
diff --git a/www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp b/www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp
new file mode 100644
index 00000000000..d16e085d1e7
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp
@@ -0,0 +1,28 @@
+$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig	Fri Oct  5 22:13:18 2007
++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp	Thu Sep 25 01:30:45 2008
+@@ -63,6 +63,7 @@
+ #include "nsISimpleEnumerator.h"
+ #include "nsIDirectoryEnumerator.h"
+ #include "nsIFile.h"
++#include "nsILocalFile.h"
+ #include "nsDirectoryServiceUtils.h"
+ #include "nsDirectoryServiceDefs.h"
+ #include "mozISpellI18NManager.h"
+@@ -331,6 +332,16 @@ mozHunspell::LoadDictionaryList()
+       appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries"));
+       LoadDictionariesFromDir(appDir);
+     }
++  }
++
++  // try to load the generic mozilla/dictionaries
++  nsCOMPtr<nsIFile> mozillaDir;
++  nsCOMPtr<nsILocalFile> localFile;
++  rv = NS_NewNativeLocalFile(nsDependentCString(
++    "_LOCALBASE_/share/mozilla-dicts"), PR_TRUE, getter_AddRefs(localFile));
++  if (localFile && NS_SUCCEEDED(rv)) {
++    localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(mozillaDir));
++    LoadDictionariesFromDir(mozillaDir);
+   }
+ 
+   nsCOMPtr<nsISimpleEnumerator> dictDirs;
diff --git a/www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_Makefile_in b/www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_Makefile_in
deleted file mode 100644
index 717642dd459..00000000000
--- a/www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_Makefile_in
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-extensions_spellcheck_myspell_src_Makefile_in,v 1.1 2007/04/06 14:33:36 martynas Exp $
---- extensions/spellcheck/myspell/src/Makefile.in.orig	Mon Mar 12 19:27:15 2007
-+++ extensions/spellcheck/myspell/src/Makefile.in	Mon Mar 12 19:43:59 2007
-@@ -81,4 +81,6 @@ EXTRA_DSO_LDOPTS = \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(NULL)
- 
-+DEFINES += -DLOCALBASE=\"$(prefix)\"
-+
- include $(topsrcdir)/config/rules.mk
diff --git a/www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_mozMySpell_cpp b/www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_mozMySpell_cpp
deleted file mode 100644
index 3d8c1cb1d9a..00000000000
--- a/www/mozilla-firefox/patches/patch-extensions_spellcheck_myspell_src_mozMySpell_cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$OpenBSD: patch-extensions_spellcheck_myspell_src_mozMySpell_cpp,v 1.1 2007/04/06 14:33:36 martynas Exp $
---- extensions/spellcheck/myspell/src/mozMySpell.cpp.orig	Fri Jun 30 01:16:17 2006
-+++ extensions/spellcheck/myspell/src/mozMySpell.cpp	Mon Mar 12 19:16:59 2007
-@@ -64,6 +64,9 @@
- #include "nsISimpleEnumerator.h"
- #include "nsIDirectoryEnumerator.h"
- #include "nsIFile.h"
-+#include "nsID.h"
-+#include "nsEmbedString.h"
-+#include "nsILocalFile.h"
- #include "nsDirectoryServiceUtils.h"
- #include "nsDirectoryServiceDefs.h"
- #include "mozISpellI18NManager.h"
-@@ -321,6 +324,15 @@ mozMySpell::LoadDictionaryList()
-   }
- 
-   LoadDictionariesFromDir(dictDir);
-+
-+  // provide common LOCALBASE/share/mozilla-dicts for all mozilla apps
-+  nsCOMPtr<nsILocalFile> file;
-+  rv = NS_NewNativeLocalFile(nsEmbedCString(LOCALBASE"/share/mozilla-dicts"), PR_TRUE,
-+                             getter_AddRefs(file));
-+  if (NS_SUCCEEDED(rv)) {
-+    file->QueryInterface(NS_GET_IID(nsIFile), (void**)&dictDir);
-+    LoadDictionariesFromDir(dictDir);
-+  }
- 
-   nsCOMPtr<nsISimpleEnumerator> dictDirs;
-   rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,
diff --git a/www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp b/www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp
deleted file mode 100644
index 1146ebc25f3..00000000000
--- a/www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$OpenBSD: patch-extensions_transformiix_source_base_Double_cpp,v 1.3 2005/12/20 23:44:00 bernd Exp $
---- extensions/transformiix/source/base/Double.cpp.orig	Thu Jun 17 02:12:42 2004
-+++ extensions/transformiix/source/base/Double.cpp	Sat Sep 10 09:47:31 2005
-@@ -115,17 +115,19 @@ typedef union txdpun {
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+#define STRICT_ALIGN __attribute__ ((aligned (8)))
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-+const PRUint32 nanMask[2] STRICT_ALIGN =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-                                 0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const PRUint32 infMask[2] STRICT_ALIGN =    {TX_DOUBLE_HI32_EXPMASK, 0};
-+const PRUint32 negInfMask[2] STRICT_ALIGN = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
-+const PRUint32 nanMask[2] STRICT_ALIGN =    {0xffffffff,
-                                 TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const PRUint32 infMask[2] STRICT_ALIGN =    {0, TX_DOUBLE_HI32_EXPMASK};
-+const PRUint32 negInfMask[2] STRICT_ALIGN = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
- #endif
- 
- const double Double::NaN = *((double*)nanMask);
diff --git a/www/mozilla-firefox/patches/patch-gfx_src_gtk_Makefile_in b/www/mozilla-firefox/patches/patch-gfx_src_gtk_Makefile_in
deleted file mode 100644
index 4507f1772f8..00000000000
--- a/www/mozilla-firefox/patches/patch-gfx_src_gtk_Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-gfx_src_gtk_Makefile_in,v 1.1 2007/02/05 00:11:55 espie Exp $
---- gfx/src/gtk/Makefile.in.orig	Sun Feb  4 20:53:15 2007
-+++ gfx/src/gtk/Makefile.in	Sun Feb  4 20:57:26 2007
-@@ -207,6 +207,10 @@ ifdef MOZ_ENABLE_PANGO
- EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
- endif
- 
-+ifdef MOZ_ENABLE_COREXFONTS
-+EXTRA_DSO_LDOPTS += -lpangox-1.0
-+endif
-+
- EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
- CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
- CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
diff --git a/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp b/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp
deleted file mode 100644
index 4f661272116..00000000000
--- a/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.8 2007/04/06 14:33:36 martynas Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Thu Nov 30 04:17:21 2006
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Apr  6 17:21:07 2007
-@@ -995,7 +995,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, const nsFont& a
- 
-         fontps *fps = new fontps;
-         fps->entry = xftEntry;
--        fps->charset = fc_charset;
-+        fps->charset = FcCharSetCopy(fc_charset);
-         fps->fontps = nsnull;
-         fpi.fontps->AppendElement(fps);
-     }
diff --git a/www/mozilla-firefox/patches/patch-gfx_src_psshared_nsCUPSShim_cpp b/www/mozilla-firefox/patches/patch-gfx_src_psshared_nsCUPSShim_cpp
index 5d369819005..d623a8e6894 100644
--- a/www/mozilla-firefox/patches/patch-gfx_src_psshared_nsCUPSShim_cpp
+++ b/www/mozilla-firefox/patches/patch-gfx_src_psshared_nsCUPSShim_cpp
@@ -1,4 +1,4 @@
-$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2007/04/06 14:33:36 martynas Exp $
+$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.3 2008/11/20 23:41:32 martynas Exp $
 --- gfx/src/psshared/nsCUPSShim.cpp.orig	Sun May  8 18:01:20 2005
 +++ gfx/src/psshared/nsCUPSShim.cpp	Fri Apr  6 17:21:07 2007
 @@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
diff --git a/www/mozilla-firefox/patches/patch-gfx_src_thebes_Makefile_in b/www/mozilla-firefox/patches/patch-gfx_src_thebes_Makefile_in
new file mode 100644
index 00000000000..82866d63a21
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-gfx_src_thebes_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-gfx_src_thebes_Makefile_in,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- gfx/src/thebes/Makefile.in.orig	Mon Feb 18 10:50:16 2008
++++ gfx/src/thebes/Makefile.in	Sun Apr 13 18:36:03 2008
+@@ -153,6 +153,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
+ CXXFLAGS += $(MOZ_PANGO_CFLAGS)
+ endif
+ 
++ifdef MOZ_ENABLE_COREXFONTS
++EXTRA_DSO_LDOPTS += -lpangox-1.0
++endif
++
+ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ CXXFLAGS += $(CAIRO_FT_CFLAGS)
+ endif
diff --git a/www/mozilla-firefox/patches/patch-js_Makefile_in b/www/mozilla-firefox/patches/patch-js_Makefile_in
deleted file mode 100644
index 7c0fd55788f..00000000000
--- a/www/mozilla-firefox/patches/patch-js_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-js_Makefile_in,v 1.1 2008/08/19 23:53:45 martynas Exp $
---- js/Makefile.in.orig	Wed Aug 20 01:24:26 2008
-+++ js/Makefile.in	Wed Aug 20 01:29:00 2008
-@@ -61,6 +61,6 @@ include $(DEPTH)/config/autoconf.mk
- # See top-level makefile for details
- #
- 
--DIRS		= src/fdlibm src
-+DIRS		= src
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/www/mozilla-firefox/patches/patch-js_src_build_mk b/www/mozilla-firefox/patches/patch-js_src_build_mk
new file mode 100644
index 00000000000..952b73f1256
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-js_src_build_mk
@@ -0,0 +1,10 @@
+$OpenBSD: patch-js_src_build_mk,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- js/src/build.mk.orig	Wed Feb 14 18:58:53 2007
++++ js/src/build.mk	Thu Aug 21 17:43:27 2008
+@@ -38,6 +38,5 @@
+ TIERS += js
+ 
+ tier_js_dirs += \
+-	js/src/fdlibm \
+ 	js/src \
+ 	$(NULL)
diff --git a/www/mozilla-firefox/patches/patch-js_src_jsnum_h b/www/mozilla-firefox/patches/patch-js_src_jsnum_h
index 420714fb8ae..2258f8a8918 100644
--- a/www/mozilla-firefox/patches/patch-js_src_jsnum_h
+++ b/www/mozilla-firefox/patches/patch-js_src_jsnum_h
@@ -1,12 +1,12 @@
-$OpenBSD: patch-js_src_jsnum_h,v 1.2 2007/11/28 20:22:26 martynas Exp $
---- js/src/jsnum.h.orig	Thu Nov  1 22:52:24 2007
-+++ js/src/jsnum.h	Fri Nov  9 15:33:55 2007
-@@ -61,7 +61,7 @@ JS_BEGIN_EXTERN_C
+$OpenBSD: patch-js_src_jsnum_h,v 1.3 2008/11/20 23:41:32 martynas Exp $
+--- js/src/jsnum.h.orig	Mon Mar 10 20:27:44 2008
++++ js/src/jsnum.h	Mon Jul 14 01:25:38 2008
+@@ -56,7 +56,7 @@ JS_BEGIN_EXTERN_C
+  * the high and low words are in big endian order).
   */
- 
  #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
--#ifndef __QNXNTO__
-+#if !defined(__QNXNTO__) && !defined(__OpenBSD__) /* Armel ABI */
- #define CPU_IS_ARM
+-#if !defined(__VFP_FP__)
++#if !defined(__VFP_FP__) && !defined(__OpenBSD__) /* Armel ABI */
+ #define FPU_IS_ARM_FPA
  #endif
  #endif
diff --git a/www/mozilla-firefox/patches/patch-js_src_liveconnect_nsISecureLiveconnect_h b/www/mozilla-firefox/patches/patch-js_src_liveconnect_nsISecureLiveconnect_h
deleted file mode 100644
index 4e86b7e9af7..00000000000
--- a/www/mozilla-firefox/patches/patch-js_src_liveconnect_nsISecureLiveconnect_h
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-js_src_liveconnect_nsISecureLiveconnect_h,v 1.1 2007/10/14 18:33:09 kurt Exp $
---- js/src/liveconnect/nsISecureLiveconnect.h.orig	Mon Oct  8 23:41:14 2007
-+++ js/src/liveconnect/nsISecureLiveconnect.h	Mon Oct  8 23:43:54 2007
-@@ -51,7 +51,17 @@
- #include "nsIFactory.h"
- #include "jni.h"
- 
-+/*
-+ * jint is 32 bit, jlong is 64 bit.  So we must consider 64-bit platform.
-+ *
-+ * http://java.sun.com/j2se/1.4.2/docs/guide/jni/spec/types.html#wp428
-+ */
-+
-+#if JS_BYTES_PER_WORD == 8
-+typedef jlong jsobject;
-+#else
- typedef jint jsobject;
-+#endif /* JS_BYTES_PER_WORD == 8 */
- 
- class nsISecureLiveconnect : public nsISupports {
- public:
diff --git a/www/mozilla-firefox/patches/patch-js_src_xpconnect_shell_Makefile_in b/www/mozilla-firefox/patches/patch-js_src_xpconnect_shell_Makefile_in
index a1bf6994a31..1e50f79caa4 100644
--- a/www/mozilla-firefox/patches/patch-js_src_xpconnect_shell_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-js_src_xpconnect_shell_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.1 2008/07/04 13:47:25 martynas Exp $
---- js/src/xpconnect/shell/Makefile.in.orig	Tue Apr  5 15:35:51 2005
-+++ js/src/xpconnect/shell/Makefile.in	Wed Jul  2 13:36:12 2008
-@@ -56,6 +56,8 @@ REQUIRES	= xpconnect \
- CPPSRCS		= xpcshell.cpp
+$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.2 2008/11/20 23:41:32 martynas Exp $
+--- js/src/xpconnect/shell/Makefile.in.orig	Thu Aug  7 12:12:57 2008
++++ js/src/xpconnect/shell/Makefile.in	Tue Sep 23 20:37:32 2008
+@@ -59,6 +59,8 @@ CMMSRCS += xpcshellMacUtils.mm
+ endif
  
  LIBS		= \
 +		-Wl,-rpath-link,_LOCALBASE_/lib/ \
 +		-Wl,-rpath-link,_X11BASE_/lib/ \
+ 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
  		$(MOZ_JS_LIBS) \
  		$(XPCOM_LIBS) \
- 		$(NSPR_LIBS) \
diff --git a/www/mozilla-firefox/patches/patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp b/www/mozilla-firefox/patches/patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp
new file mode 100644
index 00000000000..eedebb5fccf
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp
@@ -0,0 +1,30 @@
+$OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp.orig	Sat Dec  8 02:08:09 2007
++++ modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp	Tue May  6 03:25:21 2008
+@@ -208,7 +208,7 @@ ensure_libgnomeui()
+   // Attempt to get the libgnomeui symbol references. We do it this way so that stock icons from Init()
+   // don't get held back by InitWithGnome()'s libgnomeui dependency.
+   if (!gTriedToLoadGnomeLibs) {
+-    gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so.0");
++    gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so");
+     if (!gLibGnomeUI)
+       return NS_ERROR_NOT_AVAILABLE;
+ 
+@@ -234,7 +234,7 @@ static nsresult
+ ensure_libgnome()
+ {
+   if (!gTriedToLoadGnomeLibs) {
+-    gLibGnome = PR_LoadLibrary("libgnome-2.so.0");
++    gLibGnome = PR_LoadLibrary("libgnome-2.so");
+     if (!gLibGnome)
+       return NS_ERROR_NOT_AVAILABLE;
+ 
+@@ -256,7 +256,7 @@ static nsresult
+ ensure_libgnomevfs()
+ {
+   if (!gTriedToLoadGnomeLibs) {
+-    gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so.0");
++    gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so");
+     if (!gLibGnomeVFS)
+       return NS_ERROR_NOT_AVAILABLE;
+ 
diff --git a/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js b/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js
deleted file mode 100644
index 29e6cf1527d..00000000000
--- a/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js
+++ /dev/null
@@ -1,61 +0,0 @@
-$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.12 2008/11/13 16:57:14 martynas Exp $
---- modules/libpref/src/init/all.js.orig	Mon Oct 13 00:48:38 2008
-+++ modules/libpref/src/init/all.js	Wed Nov 12 21:00:51 2008
-@@ -1944,33 +1944,33 @@ pref("font.name.monospace.ko", "monospace");
- 
- // th
- 
--pref("font.name.serif.tr", "Times");
--pref("font.name.sans-serif.tr", "Helvetica");
--pref("font.name.monospace.tr", "Courier");
-+pref("font.name.serif.tr", "serif");
-+pref("font.name.sans-serif.tr", "sans-serif");
-+pref("font.name.monospace.tr", "monospace");
- 
- pref("font.name.serif.x-baltic", "serif");
- pref("font.name.sans-serif.x-baltic", "sans-serif");
- pref("font.name.monospace.x-baltic", "monospace");
- 
--pref("font.name.serif.x-central-euro", "Times");
--pref("font.name.sans-serif.x-central-euro", "Helvetica");
--pref("font.name.monospace.x-central-euro", "Courier");
-+pref("font.name.serif.x-central-euro", "serif");
-+pref("font.name.sans-serif.x-central-euro", "sans-serif");
-+pref("font.name.monospace.x-central-euro", "monospace");
- 
- pref("font.name.serif.x-cyrillic", "serif");
- pref("font.name.sans-serif.x-cyrillic", "sans-serif");
- pref("font.name.monospace.x-cyrillic", "monospace");
- 
--pref("font.name.serif.x-unicode", "Times");
--pref("font.name.sans-serif.x-unicode", "Helvetica");
--pref("font.name.monospace.x-unicode", "Courier");
-+pref("font.name.serif.x-unicode", "serif");
-+pref("font.name.sans-serif.x-unicode", "sans-serif");
-+pref("font.name.monospace.x-unicode", "monospace");
- 
--pref("font.name.serif.x-user-def", "Times");
--pref("font.name.sans-serif.x-user-def", "Helvetica");
--pref("font.name.monospace.x-user-def", "Courier");
-+pref("font.name.serif.x-user-def", "serif");
-+pref("font.name.sans-serif.x-user-def", "sans-serif");
-+pref("font.name.monospace.x-user-def", "monospace");
- 
--pref("font.name.serif.x-western", "Times");
--pref("font.name.sans-serif.x-western", "Helvetica");
--pref("font.name.monospace.x-western", "Courier");
-+pref("font.name.serif.x-western", "serif");
-+pref("font.name.sans-serif.x-western", "sans-serif");
-+pref("font.name.monospace.x-western", "monospace");
- 
- pref("font.name.serif.zh-CN", "serif");
- pref("font.name.sans-serif.zh-CN", "sans-serif");
-@@ -2110,7 +2110,7 @@ pref("font.scale.outline.min",      6);
- 
- // TrueType
- pref("font.FreeType2.enable", false);
--pref("font.freetype2.shared-library", "libfreetype.so.6");
-+pref("font.freetype2.shared-library", "libfreetype.so");
- // if libfreetype was built without hinting compiled in
- // it is best to leave hinting off
- pref("font.FreeType2.autohinted", false);
diff --git a/www/mozilla-firefox/patches/patch-netwerk_cookie_src_Makefile_in b/www/mozilla-firefox/patches/patch-netwerk_cookie_src_Makefile_in
new file mode 100644
index 00000000000..74497e5da26
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-netwerk_cookie_src_Makefile_in
@@ -0,0 +1,9 @@
+$OpenBSD: patch-netwerk_cookie_src_Makefile_in,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- netwerk/cookie/src/Makefile.in.orig	Sun Oct  5 22:38:13 2008
++++ netwerk/cookie/src/Makefile.in	Sun Oct  5 22:40:34 2008
+@@ -60,5 +60,4 @@ CPPSRCS		= \
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-CXXFLAGS += $(WARNINGS_AS_ERRORS)
+ DEFINES += -DIMPL_NS_NET
diff --git a/www/mozilla-firefox/patches/patch-other-licenses_branding_firefox_pref_firefox-branding_js b/www/mozilla-firefox/patches/patch-other-licenses_branding_firefox_pref_firefox-branding_js
new file mode 100644
index 00000000000..effbe788439
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-other-licenses_branding_firefox_pref_firefox-branding_js
@@ -0,0 +1,17 @@
+$OpenBSD: patch-other-licenses_branding_firefox_pref_firefox-branding_js,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- other-licenses/branding/firefox/pref/firefox-branding.js.orig	Tue Sep 16 22:07:25 2008
++++ other-licenses/branding/firefox/pref/firefox-branding.js	Tue Oct 14 23:04:26 2008
+@@ -1,5 +1,5 @@
+-pref("startup.homepage_override_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_welcome_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
++pref("startup.homepage_override_url","about:blank");
++pref("startup.homepage_welcome_url","about:blank");
+ // URL user can browse to manually if for some reason all update installation
+ // attempts fail.
+ pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/");
+@@ -14,4 +14,4 @@ pref("browser.search.param.yahoo-fr", "moz2");
+ pref("browser.search.param.yahoo-fr-cjkt", "moz2");
+ pref("browser.search.param.yahoo-f-CN", "D3_g");
+ 
+-pref("browser.EULA.override", false); // Do show EULA on first start
++pref("browser.EULA.override", true); // Do show EULA on first start
diff --git a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
index 37cce12bdbd..9997e006cd4 100644
--- a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
+++ b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
@@ -1,6 +1,6 @@
-$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.9 2008/07/04 13:47:25 martynas Exp $
---- security/coreconf/OpenBSD.mk.orig	Sun May  6 11:08:36 2007
-+++ security/coreconf/OpenBSD.mk	Wed Jul  2 11:52:33 2008
+$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.10 2008/11/20 23:41:32 martynas Exp $
+--- security/coreconf/OpenBSD.mk.orig	Thu Nov 22 06:39:56 2007
++++ security/coreconf/OpenBSD.mk	Sun Apr 13 18:35:49 2008
 @@ -56,7 +56,7 @@ OS_LIBS			+= -pthread
  DSO_LDOPTS		+= -pthread
  endif
@@ -8,5 +8,5 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.9 2008/07/04 13:47:25 martynas
 -DLL_SUFFIX		= so.1.0
 +DLL_SUFFIX		= so.${SO_VERSION}
  
- OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
+ OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
  
diff --git a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in
index 29727c840f8..6507f3d9808 100644
--- a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.2 2008/07/04 13:47:25 martynas Exp $
---- security/manager/ssl/src/Makefile.in.orig	Wed Jun  4 23:42:03 2008
-+++ security/manager/ssl/src/Makefile.in	Wed Jul  2 11:53:02 2008
-@@ -127,7 +127,10 @@ REQUIRES	= nspr \
+$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.3 2008/11/20 23:41:32 martynas Exp $
+--- security/manager/ssl/src/Makefile.in.orig	Wed Dec  5 09:34:57 2007
++++ security/manager/ssl/src/Makefile.in	Sun Apr 13 20:35:35 2008
+@@ -135,7 +135,10 @@ REQUIRES	= nspr \
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
  
diff --git a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
index 20f1d6c6a54..d4ff3654a12 100644
--- a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
+++ b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
@@ -1,27 +1,27 @@
-$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.3 2008/07/17 16:47:39 martynas Exp $
---- security/manager/ssl/src/nsNSSComponent.cpp.orig	Tue Jul  1 01:54:11 2008
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Wed Jul 16 03:18:18 2008
-@@ -702,11 +702,10 @@ nsNSSComponent::InstallLoadableRoots()
-       return;
+$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.4 2008/11/20 23:41:32 martynas Exp $
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Tue Oct 30 22:26:27 2007
++++ security/manager/ssl/src/nsNSSComponent.cpp	Sun Nov 18 16:34:06 2007
+@@ -753,11 +753,10 @@ nsNSSComponent::InstallLoadableRoots()
+     return;
  
-     const char *possible_ckbi_locations[] = {
-+      0, // This special value means: 
-+        //   search for ckbi in the the system NSS_LIBDIR
-       NS_GRE_DIR,
--      NS_XPCOM_CURRENT_PROCESS_DIR,
--      0 // This special value means: 
--        //   search for ckbi in the directories on the shared
--        //   library/DLL search path
-+      NS_XPCOM_CURRENT_PROCESS_DIR
-     };
+   const char *possible_ckbi_locations[] = {
+-    NS_XPCOM_CURRENT_PROCESS_DIR,
++    0, // This special value means: 
++       //   search for ckbi in NSS_LIBDIR
+     NS_GRE_DIR,
+-    0 // This special value means: 
+-      //   search for ckbi in the directories on the shared
+-      //   library/DLL search path
++    NS_XPCOM_CURRENT_PROCESS_DIR
+   };
  
-     for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
-@@ -715,7 +714,7 @@ nsNSSComponent::InstallLoadableRoots()
+   for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
+@@ -766,7 +765,7 @@ nsNSSComponent::InstallLoadableRoots()
  
-       if (!possible_ckbi_locations[il])
-       {
--        fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
-+        fullModuleName = PR_GetLibraryName(NSS_LIBDIR, "nssckbi");
-       }
-       else
-       {
+     if (!possible_ckbi_locations[il])
+     {
+-      fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
++      fullLibraryPath = PR_GetLibraryName(NSS_LIBDIR, "nssckbi");
+     }
+     else
+     {
diff --git a/www/mozilla-firefox/patches/patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp b/www/mozilla-firefox/patches/patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp
new file mode 100644
index 00000000000..3772a727d81
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp
@@ -0,0 +1,45 @@
+$OpenBSD: patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp.orig	Mon Aug 25 23:59:14 2008
++++ toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp	Tue Sep 23 20:37:33 2008
+@@ -2023,8 +2023,20 @@ nsUrlClassifierDBServiceWorker::GetShaEntries(PRUint32
+           return NS_ERROR_FAILURE;
+         }
+         const nsCSubstring& str = Substring(chunk, start, 4);
++#if 0
++        // You can't just cast a char* to an int* and access through it
+         const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
+         entry->mAddChunkId = PR_ntohl(*p);
++#else
++        // the old-school way...
++        union {
++          PRUint32 i;
++          char c[4];
++        } u;
++
++        memcpy(u.c, reinterpret_cast<const char *>(str.BeginReading()), 4);
++        entry->mAddChunkId = PR_ntohl(u.i);
++#endif
+         if (entry->mAddChunkId == 0) {
+           NS_WARNING("Received invalid chunk number.");
+           return NS_ERROR_FAILURE;
+@@ -2052,8 +2064,20 @@ nsUrlClassifierDBServiceWorker::GetShaEntries(PRUint32
+ 
+         if (chunkType == CHUNK_SUB) {
+           const nsCSubstring& str = Substring(chunk, start, 4);
++#if 0
++          // You can't just cast a char* to an int* and access through it
+           const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
+           entry->mAddChunkId = PR_ntohl(*p);
++#else
++          // the old-school way...
++          union {
++            PRUint32 i;
++            char c[4];
++          } u;
++
++          memcpy(u.c, reinterpret_cast<const char *>(str.BeginReading()), 4);
++          entry->mAddChunkId = PR_ntohl(u.i);
++#endif
+           if (entry->mAddChunkId == 0) {
+             NS_WARNING("Received invalid chunk number.");
+             return NS_ERROR_FAILURE;
diff --git a/www/mozilla-firefox/patches/patch-toolkit_xre_nsNativeAppSupportUnix_cpp b/www/mozilla-firefox/patches/patch-toolkit_xre_nsNativeAppSupportUnix_cpp
new file mode 100644
index 00000000000..62f8bca8367
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-toolkit_xre_nsNativeAppSupportUnix_cpp
@@ -0,0 +1,17 @@
+$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- toolkit/xre/nsNativeAppSupportUnix.cpp.orig	Thu Feb 21 12:55:06 2008
++++ toolkit/xre/nsNativeAppSupportUnix.cpp	Tue May  6 03:25:56 2008
+@@ -214,11 +214,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
+ 
+   *aRetVal = PR_TRUE;
+ 
+-  PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so.0");
++  PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so");
+   if (!gnomeuiLib)
+     return NS_OK;
+ 
+-  PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so.0");
++  PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so");
+   if (!gnomeLib) {
+     PR_UnloadLibrary(gnomeuiLib);
+     return NS_OK;
diff --git a/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp b/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
new file mode 100644
index 00000000000..44f9a376106
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
@@ -0,0 +1,16 @@
+$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- toolkit/xre/nsXREDirProvider.cpp.orig	Mon Mar 17 21:05:25 2008
++++ toolkit/xre/nsXREDirProvider.cpp	Fri Jun 13 19:54:14 2008
+@@ -1119,11 +1119,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
+   NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
+   static const char *const sysSExtDir = 
+-#ifdef HAVE_USR_LIB64_DIR
+-    "/usr/lib64/mozilla/extensions";
+-#else
+-    "/usr/lib/mozilla/extensions";
+-#endif
++    "_LOCALBASE_/lib/mozilla-extensions";
+ 
+   rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE,
+                              getter_AddRefs(localDir));
diff --git a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsBidiKeyboard_cpp b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsBidiKeyboard_cpp
new file mode 100644
index 00000000000..52e8f30cd92
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsBidiKeyboard_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- widget/src/gtk2/nsBidiKeyboard.cpp.orig	Wed Apr 16 23:03:19 2008
++++ widget/src/gtk2/nsBidiKeyboard.cpp	Fri Jun 13 19:41:59 2008
+@@ -54,7 +54,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard)
+ nsBidiKeyboard::nsBidiKeyboard()
+ {
+     if (!gtklib)
+-        gtklib = PR_LoadLibrary("libgtk-x11-2.0.so.0");
++        gtklib = PR_LoadLibrary("libgtk-x11-2.0.so");
+ 
+     if (gtklib && !GdkKeymapHaveBidiLayouts)
+             GdkKeymapHaveBidiLayouts = (GdkKeymapHaveBidiLayoutsType) PR_FindFunctionSymbol(gtklib, "gdk_keymap_have_bidi_layouts");
diff --git a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsIdleServiceGTK_cpp b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsIdleServiceGTK_cpp
new file mode 100644
index 00000000000..28c0622a1dd
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsIdleServiceGTK_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- widget/src/gtk2/nsIdleServiceGTK.cpp.orig	Thu Sep 27 19:53:48 2007
++++ widget/src/gtk2/nsIdleServiceGTK.cpp	Tue May  6 03:27:58 2008
+@@ -78,7 +78,7 @@ static void Initialize()
+ #endif
+ 
+     // This will leak - See comments in ~nsIdleServiceGTK().
+-    PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
++    PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
+     if (!xsslib) // ouch.
+     {
+ #ifdef PR_LOGGING
diff --git a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsScreenManagerGtk_cpp b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsScreenManagerGtk_cpp
new file mode 100644
index 00000000000..963605dd2b3
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsScreenManagerGtk_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- widget/src/gtk2/nsScreenManagerGtk.cpp.orig	Wed May  2 23:07:33 2007
++++ widget/src/gtk2/nsScreenManagerGtk.cpp	Tue May  6 03:27:26 2008
+@@ -80,7 +80,7 @@ nsScreenManagerGtk :: EnsureInit(void)
+     XineramaScreenInfo *screenInfo = NULL;
+ 
+     // We are leaking xineramalib, but there is no other way to do this.
+-    PRLibrary* xineramalib = PR_LoadLibrary("libXinerama.so.1");
++    PRLibrary* xineramalib = PR_LoadLibrary("libXinerama.so");
+     if (xineramalib) {
+       _XnrmIsActive_fn _XnrmIsActive = (_XnrmIsActive_fn)
+           PR_FindFunctionSymbol(xineramalib, "XineramaIsActive");
diff --git a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp
index 56e2a546b09..b6cc259f87e 100644
--- a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.3 2006/09/17 21:02:58 steven Exp $
---- widget/src/gtk2/nsSound.cpp.orig	Thu Aug 17 04:41:52 2006
-+++ widget/src/gtk2/nsSound.cpp	Fri Sep 15 07:41:32 2006
-@@ -114,7 +114,7 @@ nsSound::Init()
+$OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.4 2008/11/20 23:41:32 martynas Exp $
+--- widget/src/gtk2/nsSound.cpp.orig	Sun May 20 11:56:36 2007
++++ widget/src/gtk2/nsSound.cpp	Sat Nov 17 16:18:43 2007
+@@ -115,7 +115,7 @@ nsSound::Init()
  
      EsdOpenSoundType EsdOpenSound;
  
@@ -9,4 +9,4 @@ $OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.3 2006/09/17 21:02:58 steven Exp
 +    elib = PR_LoadLibrary("libesd.so");
      if (!elib) return NS_ERROR_FAILURE;
  
-     EsdOpenSound = (EsdOpenSoundType) PR_FindSymbol(elib, "esd_open_sound");
+     EsdOpenSound = (EsdOpenSoundType) PR_FindFunctionSymbol(elib, "esd_open_sound");
diff --git a/www/mozilla-firefox/patches/patch-xpcom_base_nsStackWalk_cpp b/www/mozilla-firefox/patches/patch-xpcom_base_nsStackWalk_cpp
new file mode 100644
index 00000000000..33293a256c1
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-xpcom_base_nsStackWalk_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- xpcom/base/nsStackWalk.cpp.orig	Wed Mar 12 00:46:31 2008
++++ xpcom/base/nsStackWalk.cpp	Sun Apr 13 20:34:51 2008
+@@ -1124,7 +1124,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAdd
+ #define __USE_GNU
+ #endif
+ 
+-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
++#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__OpenBSD__)
+ #include <dlfcn.h>
+ #endif
+ 
diff --git a/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp b/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp
deleted file mode 100644
index 5abe9555f5b..00000000000
--- a/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.3 2007/04/06 14:33:36 martynas Exp $
---- xpcom/components/nsNativeComponentLoader.cpp.orig	Tue Nov 14 23:09:15 2006
-+++ xpcom/components/nsNativeComponentLoader.cpp	Fri Apr  6 17:21:08 2007
-@@ -668,7 +668,7 @@ nsNativeComponentLoader::AutoRegisterComponent(PRInt32
-         ".shlb",    /* Mac ? */
-         ".dso",     /* Unix ? */
-         ".dylib",   /* Unix: Mach */
--        ".so.1.0",  /* Unix: BSD */
-+        ".so._SO_VERSION_",  /* Unix: BSD */
-         ".sl",      /* Unix: HP-UX */
- #if defined(VMS)
-         ".exe",     /* Open VMS */
diff --git a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
new file mode 100644
index 00000000000..bc72870f9ee
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
@@ -0,0 +1,20 @@
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.10 2008/11/20 23:41:32 martynas Exp $
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Wed Apr  9 09:34:20 2008
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Sep 14 16:48:09 2008
+@@ -192,7 +192,7 @@ endif
+ #
+ # OpenBSD/ARM
+ #
+-ifneq (,$(filter OpenBSDarmish OpenBSDzaurus,$(OS_ARCH)$(OS_TEST)))
++ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDarm)
+ CPPSRCS		:= xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp
+ endif
+ 
+@@ -340,6 +340,7 @@ endif
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDpowerpc)
+ CPPSRCS		:= xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s
++AS		:= $(CC) -c -x assembler-with-cpp
+ endif
+ 
+ #
diff --git a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s
new file mode 100644
index 00000000000..2344d229474
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s
@@ -0,0 +1,227 @@
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s.orig	Sun Dec 23 01:57:11 2007
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s	Sun Sep 14 22:24:42 2008
+@@ -1,43 +1,43 @@
+-# -*- Mode: Asm -*-
+-#
+-# ***** BEGIN LICENSE BLOCK *****
+-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+-#
+-# The contents of this file are subject to the Mozilla Public License Version
+-# 1.1 (the "License"); you may not use this file except in compliance with
+-# the License. You may obtain a copy of the License at
+-# http:#www.mozilla.org/MPL/
+-#
+-# Software distributed under the License is distributed on an "AS IS" basis,
+-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+-# for the specific language governing rights and limitations under the
+-# License.
+-#
+-# The Original Code is mozilla.org code.
+-#
+-# The Initial Developer of the Original Code is
+-# Netscape Communications Corporation.
+-# Portions created by the Initial Developer are Copyright (C) 1999
+-# the Initial Developer. All Rights Reserved.
+-#
+-# Contributor(s):
+-#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+-#   beard@netscape.com (Patrick Beard)
+-#   waterson@netscape.com (Chris Waterson)
+-#
+-# Alternatively, the contents of this file may be used under the terms of
+-# either the GNU General Public License Version 2 or later (the "GPL"), or
+-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+-# in which case the provisions of the GPL or the LGPL are applicable instead
+-# of those above. If you wish to allow use of your version of this file only
+-# under the terms of either the GPL or the LGPL, and not to allow others to
+-# use your version of this file under the terms of the MPL, indicate your
+-# decision by deleting the provisions above and replace them with the notice
+-# and other provisions required by the GPL or the LGPL. If you do not delete
+-# the provisions above, a recipient may use your version of this file under
+-# the terms of any one of the MPL, the GPL or the LGPL.
+-#
+-# ***** END LICENSE BLOCK *****
++// -*- Mode: Asm -*-
++//
++// ***** BEGIN LICENSE BLOCK *****
++// Version: MPL 1.1/GPL 2.0/LGPL 2.1
++//
++// The contents of this file are subject to the Mozilla Public License Version
++// 1.1 (the "License"); you may not use this file except in compliance with
++// the License. You may obtain a copy of the License at
++// http://www.mozilla.org/MPL/
++//
++// Software distributed under the License is distributed on an "AS IS" basis,
++// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++// for the specific language governing rights and limitations under the
++// License.
++//
++// The Original Code is mozilla.org code.
++//
++// The Initial Developer of the Original Code is
++// Netscape Communications Corporation.
++// Portions created by the Initial Developer are Copyright (C) 1999
++// the Initial Developer. All Rights Reserved.
++//
++// Contributor(s):
++//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
++//   beard@netscape.com (Patrick Beard)
++//   waterson@netscape.com (Chris Waterson)
++//
++// Alternatively, the contents of this file may be used under the terms of
++// either the GNU General Public License Version 2 or later (the "GPL"), or
++// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++// in which case the provisions of the GPL or the LGPL are applicable instead
++// of those above. If you wish to allow use of your version of this file only
++// under the terms of either the GPL or the LGPL, and not to allow others to
++// use your version of this file under the terms of the MPL, indicate your
++// decision by deleting the provisions above and replace them with the notice
++// and other provisions required by the GPL or the LGPL. If you do not delete
++// the provisions above, a recipient may use your version of this file under
++// the terms of any one of the MPL, the GPL or the LGPL.
++//
++// ***** END LICENSE BLOCK *****
+ 
+ .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+ .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+@@ -53,80 +53,80 @@
+ .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+ .set f30,30; .set f31,31
+-		      
+-        .section ".text"
++
++	.section ".text"
+ 	.align 2
+ 	.globl NS_InvokeByIndex_P
+ 	.type  NS_InvokeByIndex_P,@function
+ 
+-#
+-# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
+-#                  PRUint32 paramCount, nsXPTCVariant* params)
+-#
++//
++// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
++//                    PRUint32 paramCount, nsXPTCVariant* params)
++//
+ 
+ NS_InvokeByIndex_P:
+-	stwu    sp,-32(sp)			# setup standard stack frame
+-	mflr    r0				# save LR
+-	stw     r3,8(sp)			# r3 <= that
+-	stw     r4,12(sp)			# r4 <= methodIndex
+-	stw     r30,16(sp)
+-	stw     r31,20(sp)
++	stwu	sp,-32(sp)			// setup standard stack frame
++	mflr	r0				// save LR
++	stw	r3,8(sp)			// r3 <= that
++	stw	r4,12(sp)			// r4 <= methodIndex
++	stw	r30,16(sp)
++	stw	r31,20(sp)
+ 
+-	stw     r0,36(sp)			# store LR backchain
+-	mr      r31,sp
++	stw	r0,36(sp)			// store LR backchain
++	mr	r31,sp
+ 
+-	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
+-	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
+-	lwz     r9,0(sp)			# r9 = backchain
+-	neg     r0,r0
+-	stwux   r9,sp,r0			# reserve stack space and save SP backchain
++	rlwinm	r10,r5,3,0,27			// r10 = (ParamCount * 2 * 4) & ~0x0f
++	addi	r0,r10,96			// reserve stack for GPR and FPR register save area r0 = r10 + 96
++	lwz	r9,0(sp)			// r9 = backchain
++	neg	r0,r0
++	stwux	r9,sp,r0			// reserve stack space and save SP backchain
+ 
+-	addi    r3,sp,8				# r3 <= args
+-	mr      r4,r5				# r4 <= paramCount
+-	mr      r5,r6				# r5 <= params
+-	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
+-	mr      r30,r6				# store in r30 for use later...
+-	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
++	addi	r3,sp,8				// r3 <= args
++	mr	r4,r5				// r4 <= paramCount
++	mr	r5,r6				// r5 <= params
++	add	r6,r3,r10			// r6 <= gpregs ( == args + r10 )
++	mr	r30,r6				// store in r30 for use later...
++	addi	r7,r6,32			// r7 <= fpregs ( == gpregs + 32 )
+ 
+-	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
++	bl	invoke_copy_to_stack@local	// (args, paramCount, params, gpregs, fpregs)
+ 
+-	lfd     f1,32(r30)			# load FP registers with method parameters
+-	lfd     f2,40(r30)   
+-	lfd     f3,48(r30)  
+-	lfd     f4,56(r30)  
+-	lfd     f5,64(r30)  
+-	lfd     f6,72(r30)  
+-	lfd     f7,80(r30)  
+-	lfd     f8,88(r30)
++	lfd	f1,32(r30)			// load FP registers with method parameters
++	lfd	f2,40(r30)
++	lfd	f3,48(r30)
++	lfd	f4,56(r30)
++	lfd	f5,64(r30)
++	lfd	f6,72(r30)
++	lfd	f7,80(r30)
++	lfd	f8,88(r30)
+ 
+-	lwz     r3,8(r31)			# r3 <= that
+-	lwz     r4,12(r31)			# r4 <= methodIndex
+-	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
+-#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION  >= 100) # G++ pre-V3 ABI
+-	addi	r4,r4,2				# skip first two vtable entries
++	lwz	r3,8(r31)			// r3 <= that
++	lwz	r4,12(r31)			// r4 <= methodIndex
++	lwz	r5,0(r3)			// r5 <= vtable ( == *that )
++#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) // G++ pre-V3 ABI
++	addi	r4,r4,2				// skip first two vtable entries
+ #endif
+-	slwi    r4,r4,2				# convert to offset ( *= 4 )
+-	lwzx    r0,r5,r4			# r0 <= methodpointer ( == vtable + offset )
++	slwi	r4,r4,2				// convert to offset ( *= 4 )
++	lwzx	r0,r5,r4			// r0 <= methodpointer ( == vtable + offset )
+ 
+-        lwz     r4,4(r30)			# load GP regs with method parameters
+-	lwz     r5,8(r30)
+-	lwz     r6,12(r30)
+-	lwz     r7,16(r30)
+-	lwz     r8,20(r30)
+-	lwz     r9,24(r30)
+-	lwz     r10,28(r30)
++	lwz	r4,4(r30)			// load GP regs with method parameters
++	lwz	r5,8(r30)
++	lwz	r6,12(r30)
++	lwz	r7,16(r30)
++	lwz	r8,20(r30)
++	lwz	r9,24(r30)
++	lwz	r10,28(r30)
+ 
+-	mtlr    r0				# copy methodpointer to LR
+-	blrl					# call method
+-	
+-	lwz     r30,16(r31)			# restore r30 & r31
+-	lwz     r31,20(r31)
+-	
+-	lwz     r11,0(sp)			# clean up the stack
+-	lwz     r0,4(r11)
+-	mtlr    r0
+-	mr      sp,r11
++	mtlr	r0				// copy methodpointer to LR
++	blrl					// call method
++
++	lwz	r30,16(r31)			// restore r30 & r31
++	lwz	r31,20(r31)
++
++	lwz	r11,0(sp)			// clean up the stack
++	lwz	r0,4(r11)
++	mtlr	r0
++	mr	sp,r11
+ 	blr
+ 
+-# Magic indicating no need for an executable stack
++// Magic indicating no need for an executable stack
+ .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s
new file mode 100644
index 00000000000..e23b0c94bae
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s
@@ -0,0 +1,170 @@
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.1 2008/11/20 23:41:32 martynas Exp $
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s.orig	Sun Dec 23 01:57:11 2007
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s	Sun Sep 14 22:21:55 2008
+@@ -1,43 +1,43 @@
+-# -*- Mode: Asm -*-
+-#
+-# ***** BEGIN LICENSE BLOCK *****
+-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+-#
+-# The contents of this file are subject to the Mozilla Public License Version
+-# 1.1 (the "License"); you may not use this file except in compliance with
+-# the License. You may obtain a copy of the License at
+-# http:#www.mozilla.org/MPL/
+-#
+-# Software distributed under the License is distributed on an "AS IS" basis,
+-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+-# for the specific language governing rights and limitations under the
+-# License.
+-#
+-# The Original Code is mozilla.org code.
+-#
+-# The Initial Developer of the Original Code is
+-# Netscape Communications Corporation.
+-# Portions created by the Initial Developer are Copyright (C) 1999
+-# the Initial Developer. All Rights Reserved.
+-#
+-# Contributor(s):
+-#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+-#   beard@netscape.com (Patrick Beard)
+-#   waterson@netscape.com (Chris Waterson)
+-#
+-# Alternatively, the contents of this file may be used under the terms of
+-# either the GNU General Public License Version 2 or later (the "GPL"), or
+-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+-# in which case the provisions of the GPL or the LGPL are applicable instead
+-# of those above. If you wish to allow use of your version of this file only
+-# under the terms of either the GPL or the LGPL, and not to allow others to
+-# use your version of this file under the terms of the MPL, indicate your
+-# decision by deleting the provisions above and replace them with the notice
+-# and other provisions required by the GPL or the LGPL. If you do not delete
+-# the provisions above, a recipient may use your version of this file under
+-# the terms of any one of the MPL, the GPL or the LGPL.
+-#
+-# ***** END LICENSE BLOCK *****
++// -*- Mode: Asm -*-
++//
++// ***** BEGIN LICENSE BLOCK *****
++// Version: MPL 1.1/GPL 2.0/LGPL 2.1
++//
++// The contents of this file are subject to the Mozilla Public License Version
++// 1.1 (the "License"); you may not use this file except in compliance with
++// the License. You may obtain a copy of the License at
++// http://www.mozilla.org/MPL/
++//
++// Software distributed under the License is distributed on an "AS IS" basis,
++// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++// for the specific language governing rights and limitations under the
++// License.
++//
++// The Original Code is mozilla.org code.
++//
++// The Initial Developer of the Original Code is
++// Netscape Communications Corporation.
++// Portions created by the Initial Developer are Copyright (C) 1999
++// the Initial Developer. All Rights Reserved.
++//
++// Contributor(s):
++//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
++//   beard@netscape.com (Patrick Beard)
++//   waterson@netscape.com (Chris Waterson)
++//
++// Alternatively, the contents of this file may be used under the terms of
++// either the GNU General Public License Version 2 or later (the "GPL"), or
++// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++// in which case the provisions of the GPL or the LGPL are applicable instead
++// of those above. If you wish to allow use of your version of this file only
++// under the terms of either the GPL or the LGPL, and not to allow others to
++// use your version of this file under the terms of the MPL, indicate your
++// decision by deleting the provisions above and replace them with the notice
++// and other provisions required by the GPL or the LGPL. If you do not delete
++// the provisions above, a recipient may use your version of this file under
++// the terms of any one of the MPL, the GPL or the LGPL.
++//
++// ***** END LICENSE BLOCK *****
+ 
+ .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+ .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+@@ -54,29 +54,29 @@
+ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+ .set f30,30; .set f31,31
+ 
+-        .section ".text"
+-        .align 2
++	.section ".text"
++	.align 2
+ 	.globl SharedStub
+ 	.type  SharedStub,@function
+ 
+ SharedStub:
+-        stwu	sp,-112(sp)			# room for 
+-						# linkage (8),
+-						# gprData (32),
+-						# fprData (64), 
+-						# stack alignment(8)
+-        mflr	r0
+-	stw	r0,116(sp)			# save LR backchain
++	stwu	sp,-112(sp)			// room for
++						// linkage (8),
++						// gprData (32),
++						// fprData (64),
++						// stack alignment(8)
++	mflr	r0
++	stw	r0,116(sp)			// save LR backchain
+ 
+-	stw	r4,12(sp)			# save GP registers
+-	stw	r5,16(sp)			# (n.b. that we don't save r3
+-	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
++	stw	r4,12(sp)			// save GP registers
++	stw	r5,16(sp)			// (n.b. that we don't save r3
++	stw	r6,20(sp)			// because PrepareAndDispatch() is savvy)
+ 	stw	r7,24(sp)
+ 	stw	r8,28(sp)
+ 	stw	r9,32(sp)
+ 	stw	r10,36(sp)
+ 
+-	stfd	f1,40(sp)			# save FP registers
++	stfd	f1,40(sp)			// save FP registers
+ 	stfd	f2,48(sp)
+ 	stfd	f3,56(sp)
+ 	stfd	f4,64(sp)
+@@ -85,23 +85,23 @@ SharedStub:
+ 	stfd	f7,88(sp)
+ 	stfd	f8,96(sp)
+ 
+-						# r3 has the 'self' pointer already
+-	
+-	mr      r4,r11				# r4 <= methodIndex selector, passed
+-						# via r11 in the nsXPTCStubBase::StubXX() call
+-	
+-	addi	r5,sp,120			# r5 <= pointer to callers args area,
+-						# beyond r3-r10/f1-f8 mapped range
+-	
+-	addi	r6,sp,8				# r6 <= gprData
+-	addi	r7,sp,40			# r7 <= fprData
+-      
+-	bl	PrepareAndDispatch@local	# Go!
+-    
+-	lwz	r0,116(sp)			# restore LR
++						// r3 has the 'self' pointer already
++
++	mr	r4,r11				// r4 <= methodIndex selector, passed
++						// via r11 in the nsXPTCStubBase::StubXX() call
++
++	addi	r5,sp,120			// r5 <= pointer to callers args area,
++						// beyond r3-r10/f1-f8 mapped range
++
++	addi	r6,sp,8				// r6 <= gprData
++	addi	r7,sp,40			// r7 <= fprData
++
++	bl	PrepareAndDispatch@local	// Go!
++
++	lwz	r0,116(sp)			// restore LR
+ 	mtlr	r0
+-	la	sp,112(sp)			# clean up the stack
++	la	sp,112(sp)			// clean up the stack
+ 	blr
+ 
+-# Magic indicating no need for an executable stack
++// Magic indicating no need for an executable stack
+ .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/www/mozilla-firefox/patches/patch-xpfe_bootstrap_mozilla_man_in b/www/mozilla-firefox/patches/patch-xpfe_bootstrap_mozilla_man_in
deleted file mode 100644
index d6c5502a7ad..00000000000
--- a/www/mozilla-firefox/patches/patch-xpfe_bootstrap_mozilla_man_in
+++ /dev/null
@@ -1,75 +0,0 @@
-$OpenBSD: patch-xpfe_bootstrap_mozilla_man_in,v 1.2 2007/04/06 14:33:36 martynas Exp $
---- xpfe/bootstrap/mozilla.man.in.orig	Sun Apr  3 03:07:04 2005
-+++ xpfe/bootstrap/mozilla.man.in	Fri Apr  6 17:21:08 2007
-@@ -1,6 +1,6 @@
- .TH @MOZ_APP_NAME@ 1 "March 28, 2005" @MOZ_APP_NAME@ "Linux User's Manual"
- .SH NAME
--@MOZ_APP_NAME@ \- an internet application suite (browser, mail, etc.)
-+@MOZ_APP_NAME@ \- redesign of Mozilla's browser component.
- 
- .SH SYNOPSIS
- .B @MOZ_APP_NAME@
-@@ -62,9 +62,6 @@ Set height of startup window to \fIvalue\fR.
- .B \-h, \-help
- Show summary of options.
- .TP
--.B \-installer
--Start with 4.x migration window.
--.TP
- \fB\-width\fR \fIvalue\fR
- Set width of startup window to \fIvalue\fR.
- .TP
-@@ -77,45 +74,26 @@ Create \fIprofile\fR.
- \fB\-P\fR \fIprofile\fR
- Start with \fIprofile\fR.
- .TP
--.B \-ProfileWizard
--Start with profile wizard.
--.TP
- .B \-ProfileManager
- Start with profile manager.
- .TP
--.B \-SelectProfile
--Start with profile selection dialog.
-+\fB\-UILocale\fR \fIlocale\fR
-+Start with \fIlocale\fR resources as UI Locale.
- .TP
--\fB\-lang\fR \fIlang-region\fR
--Start with \fIlang-region\fR resources.
-+\fB\-contentLocale\fR \fIlocale\fR
-+Start with \fIlocale\fR resources as content Locale.
- .TP
--\fB\-remote\fR \fIcommand\fR
--Execute \fIcommand\fR in an already running @MOZ_APP_DISPLAYNAME@ process.  For more info,
--see: \fIhttp://www.mozilla.org/unix/remote.html\fR
-+.B \-safe-mode
-+Disables extensions and themes for the session.
- .TP
--.B \-splash
--Enable splash screen.
--.TP
--.B \-addressbook
--Start with the addressbook.
--.TP
--.B \-news
--Start with news.
--.TP
- .B \-jsconsole
- Start with Javascript Console
- .TP
--\fB\-edit\fR \fIurl\fR
--Start with editor.
--.TP
- \fB\-chrome\fR \fIurl\fR
- Load the specified chrome.
- .TP
--.B \-mail
--Start with mail.
--.TP
--\fB\-compose\fR \fIurl\fR
--Start with mail compose.
-+.B \-browser
-+Open a browser window.
- 
- .SH FILES
- \fI@bindir@/@MOZ_APP_NAME@\fR - shell script wrapping \fB@MOZ_APP_NAME@\fR
diff --git a/www/mozilla-firefox/pkg/DESCR b/www/mozilla-firefox/pkg/DESCR
index ccaf23efaad..87be926863c 100644
--- a/www/mozilla-firefox/pkg/DESCR
+++ b/www/mozilla-firefox/pkg/DESCR
@@ -1,4 +1,4 @@
-Firefox 2 is the next generation release of the award-winning Firefox
+Firefox 3 is the next generation release of the award-winning Firefox
 web browser from Mozilla. It is full of helpful features to make
 your time online more productive.
 
diff --git a/www/mozilla-firefox/pkg/PLIST b/www/mozilla-firefox/pkg/PLIST
index 3bab3755317..c215cebc228 100644
--- a/www/mozilla-firefox/pkg/PLIST
+++ b/www/mozilla-firefox/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.20 2008/07/25 08:03:15 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.21 2008/11/20 23:41:32 martynas Exp $
 @conflict firefox3-*
 @conflict mozilla-firebird-*
+@pkgpath www/firefox3
 @pkgpath www/mozilla-firefox,-main
 bin/firefox
 bin/mozilla-firefox
@@ -9,11 +10,12 @@ bin/mozilla-firefox
 mozilla-firefox/
 mozilla-firefox/LICENSE
 mozilla-firefox/README.OpenBSD
+mozilla-firefox/application.ini
+mozilla-firefox/blocklist.xml
 mozilla-firefox/browserconfig.properties
 mozilla-firefox/chrome/
 mozilla-firefox/chrome/browser.jar
 mozilla-firefox/chrome/browser.manifest
-mozilla-firefox/chrome/chromelist.txt
 mozilla-firefox/chrome/classic.jar
 mozilla-firefox/chrome/classic.manifest
 mozilla-firefox/chrome/comm.jar
@@ -22,7 +24,9 @@ mozilla-firefox/chrome/en-US.jar
 mozilla-firefox/chrome/en-US.manifest
 mozilla-firefox/chrome/icons/
 mozilla-firefox/chrome/icons/default/
-mozilla-firefox/chrome/icons/default/default.xpm
+mozilla-firefox/chrome/icons/default/default16.png
+mozilla-firefox/chrome/icons/default/default32.png
+mozilla-firefox/chrome/icons/default/default48.png
 mozilla-firefox/chrome/pippki.jar
 mozilla-firefox/chrome/pippki.manifest
 mozilla-firefox/chrome/reporter.jar
@@ -34,16 +38,16 @@ mozilla-firefox/components/FeedConverter.js
 mozilla-firefox/components/FeedProcessor.js
 mozilla-firefox/components/FeedWriter.js
 mozilla-firefox/components/WebContentConverter.js
-mozilla-firefox/components/accessibility-atk.xpt
+mozilla-firefox/components/aboutRobots.js
 mozilla-firefox/components/accessibility.xpt
 mozilla-firefox/components/alerts.xpt
 mozilla-firefox/components/appshell.xpt
 mozilla-firefox/components/appstartup.xpt
 mozilla-firefox/components/autocomplete.xpt
 mozilla-firefox/components/autoconfig.xpt
-mozilla-firefox/components/bookmarks.xpt
 mozilla-firefox/components/browser-feeds.xpt
 mozilla-firefox/components/browsercompsbase.xpt
+mozilla-firefox/components/browserplaces.xpt
 mozilla-firefox/components/browsersearch.xpt
 mozilla-firefox/components/caps.xpt
 mozilla-firefox/components/chardet.xpt
@@ -57,6 +61,7 @@ mozilla-firefox/components/content_htmldoc.xpt
 mozilla-firefox/components/content_xmldoc.xpt
 mozilla-firefox/components/content_xslt.xpt
 mozilla-firefox/components/content_xtf.xpt
+mozilla-firefox/components/contentprefs.xpt
 mozilla-firefox/components/cookie.xpt
 mozilla-firefox/components/directory.xpt
 mozilla-firefox/components/docshell.xpt
@@ -67,7 +72,9 @@ 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_json.xpt
 mozilla-firefox/components/dom_loadsave.xpt
+mozilla-firefox/components/dom_offline.xpt
 mozilla-firefox/components/dom_range.xpt
 mozilla-firefox/components/dom_sidebar.xpt
 mozilla-firefox/components/dom_storage.xpt
@@ -83,20 +90,21 @@ mozilla-firefox/components/editor.xpt
 mozilla-firefox/components/embed_base.xpt
 mozilla-firefox/components/extensions.xpt
 mozilla-firefox/components/exthandler.xpt
+mozilla-firefox/components/exthelper.xpt
 mozilla-firefox/components/fastfind.xpt
 mozilla-firefox/components/feeds.xpt
 mozilla-firefox/components/filepicker.xpt
 mozilla-firefox/components/find.xpt
+mozilla-firefox/components/fuel.xpt
+mozilla-firefox/components/fuelApplication.js
 mozilla-firefox/components/gfx.xpt
-mozilla-firefox/components/gksvgrenderer.xpt
-mozilla-firefox/components/history.xpt
 mozilla-firefox/components/htmlparser.xpt
+mozilla-firefox/components/imgicon.xpt
 mozilla-firefox/components/imglib2.xpt
 mozilla-firefox/components/inspector.xpt
 mozilla-firefox/components/intl.xpt
 mozilla-firefox/components/jar.xpt
 mozilla-firefox/components/jsconsole-clhandler.js
-mozilla-firefox/components/jsconsole.xpt
 mozilla-firefox/components/jsdservice.xpt
 mozilla-firefox/components/layout_base.xpt
 mozilla-firefox/components/layout_printing.xpt
@@ -109,67 +117,66 @@ mozilla-firefox/components/layout_xul_tree.xpt
 @lib mozilla-firefox/components/libbrowsercomps.so.${LIBbrowsercomps_VERSION}
 @lib mozilla-firefox/components/libbrowserdirprovider.so.${LIBbrowserdirprovider_VERSION}
 @lib mozilla-firefox/components/libcaps.so.${LIBcaps_VERSION}
+@lib mozilla-firefox/components/libchardet.so.${LIBchardet_VERSION}
 @lib mozilla-firefox/components/libchrome.so.${LIBchrome_VERSION}
 @lib mozilla-firefox/components/libcommandlines.so.${LIBcommandlines_VERSION}
 @lib mozilla-firefox/components/libcomposer.so.${LIBcomposer_VERSION}
 @lib mozilla-firefox/components/libcookie.so.${LIBcookie_VERSION}
 @lib mozilla-firefox/components/libdocshell.so.${LIBdocshell_VERSION}
-@lib mozilla-firefox/components/libeditor.so.${LIBeditor_VERSION}
 @lib mozilla-firefox/components/libembedcomponents.so.${LIBembedcomponents_VERSION}
 @lib mozilla-firefox/components/libfileview.so.${LIBfileview_VERSION}
-@lib mozilla-firefox/components/libgfx_gtk.so.${LIBgfx_gtk_VERSION}
-@lib mozilla-firefox/components/libgfxps.so.${LIBgfxps_VERSION}
+@lib mozilla-firefox/components/libgkgfxthebes.so.${LIBgkgfxthebes_VERSION}
 @lib mozilla-firefox/components/libgklayout.so.${LIBgklayout_VERSION}
 @lib mozilla-firefox/components/libgkplugin.so.${LIBgkplugin_VERSION}
 @lib mozilla-firefox/components/libhtmlpars.so.${LIBhtmlpars_VERSION}
 @lib mozilla-firefox/components/libi18n.so.${LIBi18n_VERSION}
+@lib mozilla-firefox/components/libimgicon.so.${LIBimgicon_VERSION}
 @lib mozilla-firefox/components/libimglib2.so.${LIBimglib2_VERSION}
+@lib mozilla-firefox/components/libintlapp.so.${LIBintlapp_VERSION}
 @lib mozilla-firefox/components/libjar50.so.${LIBjar50_VERSION}
 @lib mozilla-firefox/components/libjsd.so.${LIBjsd_VERSION}
-@lib mozilla-firefox/components/libmork.so.${LIBmork_VERSION}
 @lib mozilla-firefox/components/libmozfind.so.${LIBmozfind_VERSION}
-@lib mozilla-firefox/components/libmyspell.so.${LIBmyspell_VERSION}
 @lib mozilla-firefox/components/libnecko.so.${LIBnecko_VERSION}
-@lib mozilla-firefox/components/libnecko2.so.${LIBnecko2_VERSION}
 @lib mozilla-firefox/components/libnsappshell.so.${LIBnsappshell_VERSION}
 @lib mozilla-firefox/components/liboji.so.${LIBoji_VERSION}
 @lib mozilla-firefox/components/libpermissions.so.${LIBpermissions_VERSION}
 @lib mozilla-firefox/components/libpipboot.so.${LIBpipboot_VERSION}
 @lib mozilla-firefox/components/libpipnss.so.${LIBpipnss_VERSION}
 @lib mozilla-firefox/components/libpippki.so.${LIBpippki_VERSION}
+@lib mozilla-firefox/components/libplaces.so.${LIBplaces_VERSION}
 @lib mozilla-firefox/components/libpref.so.${LIBpref_VERSION}
 @lib mozilla-firefox/components/librdf.so.${LIBrdf_VERSION}
 @lib mozilla-firefox/components/libremoteservice.so.${LIBremoteservice_VERSION}
-@lib mozilla-firefox/components/libsearchservice.so.${LIBsearchservice_VERSION}
+@lib mozilla-firefox/components/libsatchel.so.${LIBsatchel_VERSION}
 @lib mozilla-firefox/components/libspellchecker.so.${LIBspellchecker_VERSION}
 @lib mozilla-firefox/components/libstoragecomps.so.${LIBstoragecomps_VERSION}
 @lib mozilla-firefox/components/libsystem-pref.so.${LIBsystem-pref_VERSION}
+@lib mozilla-firefox/components/libtkautocomplete.so.${LIBtkautocomplete_VERSION}
 @lib mozilla-firefox/components/libtoolkitcomps.so.${LIBtoolkitcomps_VERSION}
-@lib mozilla-firefox/components/libtransformiix.so.${LIBtransformiix_VERSION}
 @lib mozilla-firefox/components/libtxmgr.so.${LIBtxmgr_VERSION}
 @lib mozilla-firefox/components/libuconv.so.${LIBuconv_VERSION}
 @lib mozilla-firefox/components/libucvmath.so.${LIBucvmath_VERSION}
 @lib mozilla-firefox/components/libuniversalchardet.so.${LIBuniversalchardet_VERSION}
+@lib mozilla-firefox/components/libunixproxy.so.${LIBunixproxy_VERSION}
 @lib mozilla-firefox/components/libwebbrwsr.so.${LIBwebbrwsr_VERSION}
-@lib mozilla-firefox/components/libwebsrvcs.so.${LIBwebsrvcs_VERSION}
 @lib mozilla-firefox/components/libwidget_gtk2.so.${LIBwidget_gtk2_VERSION}
+@lib mozilla-firefox/components/libwindowds.so.${LIBwindowds_VERSION}
 @lib mozilla-firefox/components/libxmlextras.so.${LIBxmlextras_VERSION}
-@lib mozilla-firefox/components/libxpcom_compat_c.so.${LIBxpcom_compat_c_VERSION}
 @lib mozilla-firefox/components/libxpconnect.so.${LIBxpconnect_VERSION}
 @lib mozilla-firefox/components/libxpinstall.so.${LIBxpinstall_VERSION}
+@lib mozilla-firefox/components/libzipwriter.so.${LIBzipwriter_VERSION}
 mozilla-firefox/components/locale.xpt
+mozilla-firefox/components/loginmgr.xpt
 mozilla-firefox/components/lwbrk.xpt
 mozilla-firefox/components/microsummaries.xpt
 mozilla-firefox/components/migration.xpt
 mozilla-firefox/components/mimetype.xpt
 mozilla-firefox/components/mozbrwsr.xpt
 mozilla-firefox/components/mozfind.xpt
-mozilla-firefox/components/mozgnome.xpt
 mozilla-firefox/components/necko.xpt
 mozilla-firefox/components/necko_about.xpt
 mozilla-firefox/components/necko_cache.xpt
 mozilla-firefox/components/necko_cookie.xpt
-mozilla-firefox/components/necko_data.xpt
 mozilla-firefox/components/necko_dns.xpt
 mozilla-firefox/components/necko_file.xpt
 mozilla-firefox/components/necko_ftp.xpt
@@ -178,18 +185,25 @@ mozilla-firefox/components/necko_res.xpt
 mozilla-firefox/components/necko_socket.xpt
 mozilla-firefox/components/necko_strconv.xpt
 mozilla-firefox/components/necko_viewsource.xpt
-mozilla-firefox/components/nsBookmarkTransactionManager.js
+mozilla-firefox/components/nsAddonRepository.js
+mozilla-firefox/components/nsBadCertHandler.js
+mozilla-firefox/components/nsBlocklistService.js
 mozilla-firefox/components/nsBrowserContentHandler.js
 mozilla-firefox/components/nsBrowserGlue.js
-mozilla-firefox/components/nsCloseAllWindows.js
+mozilla-firefox/components/nsContentDispatchChooser.js
+mozilla-firefox/components/nsContentPrefService.js
 mozilla-firefox/components/nsDefaultCLH.js
-mozilla-firefox/components/nsDictionary.js
+mozilla-firefox/components/nsDownloadManagerUI.js
 mozilla-firefox/components/nsExtensionManager.js
 mozilla-firefox/components/nsFilePicker.js
+mozilla-firefox/components/nsHandlerService.js
 mozilla-firefox/components/nsHelperAppDlg.js
-mozilla-firefox/components/nsInterfaceInfoToIDL.js
-mozilla-firefox/components/nsKillAll.js
+mozilla-firefox/components/nsLivemarkService.js
+mozilla-firefox/components/nsLoginInfo.js
+mozilla-firefox/components/nsLoginManager.js
+mozilla-firefox/components/nsLoginManagerPrompter.js
 mozilla-firefox/components/nsMicrosummaryService.js
+mozilla-firefox/components/nsPlacesTransactionsService.js
 mozilla-firefox/components/nsProgressDialog.js
 mozilla-firefox/components/nsProxyAutoConfig.js
 mozilla-firefox/components/nsResetPref.js
@@ -200,35 +214,37 @@ mozilla-firefox/components/nsSessionStartup.js
 mozilla-firefox/components/nsSessionStore.js
 mozilla-firefox/components/nsSetDefaultBrowser.js
 mozilla-firefox/components/nsSidebar.js
+mozilla-firefox/components/nsTaggingService.js
+mozilla-firefox/components/nsTryToClose.js
 mozilla-firefox/components/nsURLFormatter.js
 mozilla-firefox/components/nsUpdateService.js
 mozilla-firefox/components/nsUrlClassifierLib.js
 mozilla-firefox/components/nsUrlClassifierListManager.js
-mozilla-firefox/components/nsUrlClassifierTable.js
-mozilla-firefox/components/nsXmlRpcClient.js
+mozilla-firefox/components/nsWebHandlerApp.js
 mozilla-firefox/components/oji.xpt
-mozilla-firefox/components/passwordmgr.xpt
+mozilla-firefox/components/parentalcontrols.xpt
 mozilla-firefox/components/pipboot.xpt
 mozilla-firefox/components/pipnss.xpt
 mozilla-firefox/components/pippki.xpt
+mozilla-firefox/components/places.xpt
 mozilla-firefox/components/plugin.xpt
+mozilla-firefox/components/pluginGlue.js
 mozilla-firefox/components/pref.xpt
 mozilla-firefox/components/prefetch.xpt
 mozilla-firefox/components/profile.xpt
-mozilla-firefox/components/progressDlg.xpt
 mozilla-firefox/components/proxyObjInst.xpt
 mozilla-firefox/components/rdf.xpt
-mozilla-firefox/components/safebrowsing.xpt
 mozilla-firefox/components/satchel.xpt
 mozilla-firefox/components/saxparser.xpt
-mozilla-firefox/components/search.xpt
 mozilla-firefox/components/sessionstore.xpt
 mozilla-firefox/components/shellservice.xpt
 mozilla-firefox/components/shistory.xpt
 mozilla-firefox/components/spellchecker.xpt
+mozilla-firefox/components/storage-Legacy.js
 mozilla-firefox/components/storage.xpt
 mozilla-firefox/components/toolkitprofile.xpt
 mozilla-firefox/components/toolkitremote.xpt
+mozilla-firefox/components/txEXSLTRegExFunctions.js
 mozilla-firefox/components/txmgr.xpt
 mozilla-firefox/components/txtsvc.xpt
 mozilla-firefox/components/uconv.xpt
@@ -240,16 +256,14 @@ mozilla-firefox/components/urlformatter.xpt
 mozilla-firefox/components/webBrowser_core.xpt
 mozilla-firefox/components/webbrowserpersist.xpt
 mozilla-firefox/components/webshell_idls.xpt
-mozilla-firefox/components/websrvcs.xpt
 mozilla-firefox/components/widget.xpt
 mozilla-firefox/components/windowds.xpt
 mozilla-firefox/components/windowwatcher.xpt
-mozilla-firefox/components/xml-rpc.xpt
 mozilla-firefox/components/xpcom_base.xpt
 mozilla-firefox/components/xpcom_components.xpt
 mozilla-firefox/components/xpcom_ds.xpt
 mozilla-firefox/components/xpcom_io.xpt
-mozilla-firefox/components/xpcom_obsolete.xpt
+mozilla-firefox/components/xpcom_system.xpt
 mozilla-firefox/components/xpcom_threads.xpt
 mozilla-firefox/components/xpcom_xpti.xpt
 mozilla-firefox/components/xpconnect.xpt
@@ -257,6 +271,7 @@ mozilla-firefox/components/xpinstall.xpt
 mozilla-firefox/components/xulapp.xpt
 mozilla-firefox/components/xuldoc.xpt
 mozilla-firefox/components/xultmpl.xpt
+mozilla-firefox/components/zipwriter.xpt
 mozilla-firefox/defaults/
 mozilla-firefox/defaults/autoconfig/
 mozilla-firefox/defaults/autoconfig/platform.js
@@ -275,22 +290,10 @@ mozilla-firefox/defaults/profile/chrome/userContent-example.css
 mozilla-firefox/defaults/profile/localstore.rdf
 mozilla-firefox/defaults/profile/mimeTypes.rdf
 mozilla-firefox/defaults/profile/prefs.js
-mozilla-firefox/defaults/profile/search.rdf
 mozilla-firefox/dictionaries/
 mozilla-firefox/dictionaries/en-US.aff
 mozilla-firefox/dictionaries/en-US.dic
 mozilla-firefox/extensions/
-mozilla-firefox/extensions/inspector@mozilla.org/
-mozilla-firefox/extensions/inspector@mozilla.org/chrome/
-mozilla-firefox/extensions/inspector@mozilla.org/chrome.manifest
-mozilla-firefox/extensions/inspector@mozilla.org/chrome/chromelist.txt
-mozilla-firefox/extensions/inspector@mozilla.org/chrome/inspector.jar
-mozilla-firefox/extensions/inspector@mozilla.org/components/
-mozilla-firefox/extensions/inspector@mozilla.org/components/inspector-cmdline.js
-mozilla-firefox/extensions/inspector@mozilla.org/defaults/
-mozilla-firefox/extensions/inspector@mozilla.org/defaults/preferences/
-mozilla-firefox/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
-mozilla-firefox/extensions/inspector@mozilla.org/install.rdf
 mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
 mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @bin mozilla-firefox/firefox-bin
@@ -303,20 +306,29 @@ mozilla-firefox/icons/document.png
 mozilla-firefox/icons/mozicon128.png
 mozilla-firefox/icons/mozicon16.xpm
 mozilla-firefox/icons/mozicon50.xpm
-mozilla-firefox/init.d/
-mozilla-firefox/init.d/README
 @lib mozilla-firefox/libgfxpsshar.so.${LIBgfxpsshar_VERSION}
 @lib mozilla-firefox/libgkgfx.so.${LIBgkgfx_VERSION}
-@lib mozilla-firefox/libgtkembedmoz.so.${LIBgtkembedmoz_VERSION}
 @lib mozilla-firefox/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
 @lib mozilla-firefox/libjsj.so.${LIBjsj_VERSION}
 @lib mozilla-firefox/libmozjs.so.${LIBmozjs_VERSION}
+@lib mozilla-firefox/libmozlcms.so.${LIBmozlcms_VERSION}
+@lib mozilla-firefox/libthebes.so.${LIBthebes_VERSION}
 @lib mozilla-firefox/libxpcom.so.${LIBxpcom_VERSION}
-@lib mozilla-firefox/libxpcom_compat.so.${LIBxpcom_compat_VERSION}
 @lib mozilla-firefox/libxpcom_core.so.${LIBxpcom_core_VERSION}
-@lib mozilla-firefox/libxpistub.so.${LIBxpistub_VERSION}
+@lib mozilla-firefox/libxul.so.${LIBxul_VERSION}
+mozilla-firefox/modules/
+mozilla-firefox/modules/DownloadUtils.jsm
+mozilla-firefox/modules/ISO8601DateUtils.jsm
+mozilla-firefox/modules/JSON.jsm
+mozilla-firefox/modules/Microformats.js
+mozilla-firefox/modules/PluralForm.jsm
+mozilla-firefox/modules/XPCOMUtils.jsm
+mozilla-firefox/modules/debug.js
+mozilla-firefox/modules/distribution.js
+mozilla-firefox/modules/utils.js
 @bin mozilla-firefox/mozilla-firefox-bin
 @bin mozilla-firefox/mozilla-xremote-client
+mozilla-firefox/platform.ini
 mozilla-firefox/plugins/
 @lib mozilla-firefox/plugins/libnullplugin.so.${LIBnullplugin_VERSION}
 @lib mozilla-firefox/plugins/libunixprintplugin.so.${LIBunixprintplugin_VERSION}
@@ -325,11 +337,11 @@ mozilla-firefox/res/
 mozilla-firefox/res/EditorOverride.css
 mozilla-firefox/res/arrow.gif
 mozilla-firefox/res/arrowd.gif
-mozilla-firefox/res/bloatcycle.html
 mozilla-firefox/res/broken-image.gif
 mozilla-firefox/res/charsetData.properties
 mozilla-firefox/res/charsetalias.properties
-mozilla-firefox/res/cmessage.txt
+mozilla-firefox/res/contenteditable.css
+mozilla-firefox/res/designmode.css
 mozilla-firefox/res/dtd/
 mozilla-firefox/res/dtd/mathml.dtd
 mozilla-firefox/res/dtd/xhtml11.dtd
@@ -341,93 +353,22 @@ mozilla-firefox/res/entityTables/htmlEntityVersions.properties
 mozilla-firefox/res/entityTables/mathml20.properties
 mozilla-firefox/res/entityTables/transliterate.properties
 mozilla-firefox/res/fonts/
-mozilla-firefox/res/fonts/fontEncoding.properties
 mozilla-firefox/res/fonts/mathfont.properties
-mozilla-firefox/res/fonts/mathfontCMEX10.properties
-mozilla-firefox/res/fonts/mathfontCMSY10.properties
-mozilla-firefox/res/fonts/mathfontMTExtra.properties
-mozilla-firefox/res/fonts/mathfontMath1.properties
-mozilla-firefox/res/fonts/mathfontMath2.properties
-mozilla-firefox/res/fonts/mathfontMath4.properties
-mozilla-firefox/res/fonts/mathfontPUA.properties
-mozilla-firefox/res/fonts/mathfontSymbol.properties
-mozilla-firefox/res/fonts/pangoFontEncoding.properties
+mozilla-firefox/res/fonts/mathfontSTIXNonUnicode.properties
+mozilla-firefox/res/fonts/mathfontSTIXSize1.properties
+mozilla-firefox/res/fonts/mathfontStandardSymbolsL.properties
+mozilla-firefox/res/fonts/mathfontUnicode.properties
 mozilla-firefox/res/forms.css
 mozilla-firefox/res/grabber.gif
 mozilla-firefox/res/hiddenWindow.html
 mozilla-firefox/res/html/
 mozilla-firefox/res/html.css
-mozilla-firefox/res/html/gopher-audio.gif
-mozilla-firefox/res/html/gopher-binary.gif
-mozilla-firefox/res/html/gopher-find.gif
-mozilla-firefox/res/html/gopher-image.gif
-mozilla-firefox/res/html/gopher-menu.gif
-mozilla-firefox/res/html/gopher-movie.gif
-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/html/folder.png
 mozilla-firefox/res/langGroups.properties
 mozilla-firefox/res/language.properties
 mozilla-firefox/res/loading-image.gif
 mozilla-firefox/res/mathml.css
 mozilla-firefox/res/quirk.css
-mozilla-firefox/res/sample.unixpsfonts.properties
-mozilla-firefox/res/samples/
-mozilla-firefox/res/samples/Anieyes.gif
-mozilla-firefox/res/samples/aform.css
-mozilla-firefox/res/samples/beeptest.html
-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/demoform.css
-mozilla-firefox/res/samples/find.html
-mozilla-firefox/res/samples/gear1.gif
-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/scrollbarTest1.xul
-mozilla-firefox/res/samples/scrollbarTest2.xul
-mozilla-firefox/res/samples/sliderTest1.xul
-mozilla-firefox/res/samples/soundtest.html
-mozilla-firefox/res/samples/test.wav
-mozilla-firefox/res/samples/test0.html
-mozilla-firefox/res/samples/test1.html
-mozilla-firefox/res/samples/test10.html
-mozilla-firefox/res/samples/test11.html
-mozilla-firefox/res/samples/test12.html
-mozilla-firefox/res/samples/test13.html
-mozilla-firefox/res/samples/test14.html
-mozilla-firefox/res/samples/test15.html
-mozilla-firefox/res/samples/test16.html
-mozilla-firefox/res/samples/test2.html
-mozilla-firefox/res/samples/test3.html
-mozilla-firefox/res/samples/test4.html
-mozilla-firefox/res/samples/test5.html
-mozilla-firefox/res/samples/test6.html
-mozilla-firefox/res/samples/test7.html
-mozilla-firefox/res/samples/test8-1.html
-mozilla-firefox/res/samples/test8.html
-mozilla-firefox/res/samples/test8dom.html
-mozilla-firefox/res/samples/test8sca.html
-mozilla-firefox/res/samples/test8siz.html
-mozilla-firefox/res/samples/test8tab.html
-mozilla-firefox/res/samples/test9.html
-mozilla-firefox/res/samples/test9a.html
-mozilla-firefox/res/samples/test9b.html
-mozilla-firefox/res/samples/test_ed.html
-mozilla-firefox/res/samples/test_form.html
-mozilla-firefox/res/samples/test_gfx.html
-mozilla-firefox/res/samples/test_lbox.html
-mozilla-firefox/res/samples/test_pr.html
-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/xulTest.css
 mozilla-firefox/res/svg.css
 mozilla-firefox/res/table-add-column-after-active.gif
 mozilla-firefox/res/table-add-column-after-hover.gif
@@ -447,41 +388,8 @@ mozilla-firefox/res/table-remove-column.gif
 mozilla-firefox/res/table-remove-row-active.gif
 mozilla-firefox/res/table-remove-row-hover.gif
 mozilla-firefox/res/table-remove-row.gif
-mozilla-firefox/res/throbber/
-mozilla-firefox/res/throbber/anim.gif
-mozilla-firefox/res/throbber/anims00.gif
-mozilla-firefox/res/throbber/anims01.gif
-mozilla-firefox/res/throbber/anims02.gif
-mozilla-firefox/res/throbber/anims03.gif
-mozilla-firefox/res/throbber/anims04.gif
-mozilla-firefox/res/throbber/anims05.gif
-mozilla-firefox/res/throbber/anims06.gif
-mozilla-firefox/res/throbber/anims07.gif
-mozilla-firefox/res/throbber/anims08.gif
-mozilla-firefox/res/throbber/anims09.gif
-mozilla-firefox/res/throbber/anims10.gif
-mozilla-firefox/res/throbber/anims11.gif
-mozilla-firefox/res/throbber/anims12.gif
-mozilla-firefox/res/throbber/anims13.gif
-mozilla-firefox/res/throbber/anims14.gif
-mozilla-firefox/res/throbber/anims15.gif
-mozilla-firefox/res/throbber/anims16.gif
-mozilla-firefox/res/throbber/anims17.gif
-mozilla-firefox/res/throbber/anims18.gif
-mozilla-firefox/res/throbber/anims19.gif
-mozilla-firefox/res/throbber/anims20.gif
-mozilla-firefox/res/throbber/anims21.gif
-mozilla-firefox/res/throbber/anims22.gif
-mozilla-firefox/res/throbber/anims23.gif
-mozilla-firefox/res/throbber/anims24.gif
-mozilla-firefox/res/throbber/anims25.gif
-mozilla-firefox/res/throbber/anims26.gif
-mozilla-firefox/res/throbber/anims27.gif
-mozilla-firefox/res/throbber/anims28.gif
-mozilla-firefox/res/throbber/anims29.gif
 mozilla-firefox/res/ua.css
 mozilla-firefox/res/unixcharset.properties
-mozilla-firefox/res/viewer.properties
 mozilla-firefox/res/viewsource.css
 mozilla-firefox/run-mozilla.sh
 mozilla-firefox/searchplugins/
@@ -490,6 +398,7 @@ mozilla-firefox/searchplugins/answers.xml
 mozilla-firefox/searchplugins/creativecommons.xml
 mozilla-firefox/searchplugins/eBay.xml
 mozilla-firefox/searchplugins/google.xml
+mozilla-firefox/searchplugins/wikipedia.xml
 mozilla-firefox/searchplugins/yahoo.xml
 share/applications/firefox.desktop
 @exec %D/bin/update-desktop-database