- Remove www/firefox3: Upstream support dropped. Please consider using

  www/firefox or www/firefox35 (if you depend on the java plugin) instead.

Feature safe:	yes

31 files changed, 1 insertions, 1039 deletions

diff --git a/MOVED b/MOVED
index 6ad2ab0a0ce1..22da2b162d66 100644
--- a/MOVED
+++ b/MOVED
@@ -4442,3 +4442,4 @@ misc/freedialog||2010-06-10|Removed, has been in base for a decade
 print/lyx15||2010-06-14|Removed, print/lyx has been updated to the latest version
 sysutils/tinybsd||2010-06-18|Incorporated into base system long ago
 www/mythweb|www/mythplugin-mythweb|2010-06-21|Renamed: Common prefix for all MythTV plugins
+www/firefox3|www/firefox35|2010-06-23|Upstream support dropped
diff --git a/www/Makefile b/www/Makefile
index 1daafb7406c0..30ea2eb04928 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -227,7 +227,6 @@
     SUBDIR += firefox-sync
     SUBDIR += firefox-i18n
     SUBDIR += firefox-remote
-    SUBDIR += firefox3
     SUBDIR += firefox3-devel
     SUBDIR += firefox3-i18n
     SUBDIR += firefox35
diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile
deleted file mode 100644
index 2685f6b9c620..000000000000
--- a/www/firefox3/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-# New ports collection makefile for:	phoenix
-# Date created:			2002/10/21
-# Whom:				Alan Eldridge <alane@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports-stable/www/firefox3/Makefile,v 1.20 2008/12/31 01:52:03 mezz Exp $
-#
-
-PORTNAME=	firefox
-DISTVERSION=	3.0.19
-PORTEPOCH=	1
-CATEGORIES=	www ipv6
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
-
-MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Web browser based on the browser portion of Mozilla
-
-BUILD_DEPENDS=	nspr>=4.7:${PORTSDIR}/devel/nspr
-
-DEPRECATED=	Upstream support dropped. Please consider using www/firefox or www/firefox35 instead
-LATEST_LINK=	firefox3
-USE_GECKO=	gecko
-CONFLICTS=	firefox-3.[1-6]*
-MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-png -nss -dbm -jpeg
-MOZILLA_NAME=	Firefox${MOZILLA_SUFX}
-MOZILLA_SUFX=	3
-MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
-MOZ_TOOLKIT=	cairo-gtk2
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib \
-			lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include
-
-WANT_GNOME=	yes
-ALL_TARGET=	default
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS=	-O2
-HAS_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
-NO_MOZPKGINSTALL=yes
-
-FIREFOX_ICON=		${MOZILLA}.png
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
-MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
-		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg --enable-svg-renderer=cairo \
-		--enable-application=browser \
-		--enable-official-branding \
-		--enable-canvas --enable-libxul
-
-SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
-
-OPTIONS=	DBUS "Enable D-BUS support" on \
-		NEWTAB "Open external links in a new tab" on \
-		SMB "Enable smb:// URI support using gnomevfs" off
-
-.include <bsd.port.pre.mk>
-
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+=	libgnomeui
-MOZ_OPTIONS+=	--enable-gnomeui
-.else
-MOZ_OPTIONS+=	--disable-gnomeui
-.endif
-
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-.endif
-
-post-extract::
-	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
-		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
-
-post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
-		${WRKSRC}/storage/build/Makefile.in \
-		${WRKSRC}/db/sqlite3/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
-.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs
-	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/' \
-		${WRKSRC}/${ii}/all.js
-.endfor
-.if ${ARCH} == "sparc64"
-	@(cd ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix && \
-	    ${LN} -s xptcstubs_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_freebsd.s && \
-	    ${LN} -s xptcstubs_sparc64_openbsd.cpp xptcstubs_sparc64_freebsd.cpp && \
-	    ${LN} -s xptcinvoke_sparc64_openbsd.cpp xptcinvoke_sparc64_freebsd.cpp && \
-	    ${LN} -s xptcinvoke_asm_sparc64_openbsd.s xptcinvoke_asm_sparc64_freebsd.s)
-.endif
-
-port-pre-install:
-#	${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib
-	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
-	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
-	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
-.if !defined(WITHOUT_NEWTAB)
-	${ECHO_CMD} >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
-		>> ${SYSTEM_PREFS}
-.endif # !defined(WITHOUT_NEWTAB)
-
-post-install:
-	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
-	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
-	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-
-.include <bsd.port.post.mk>
diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo
deleted file mode 100644
index 8c8a952648f2..000000000000
--- a/www/firefox3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (firefox-3.0.19-source.tar.bz2) = 451ee1df43b057c7acd39800be726b77
-SHA256 (firefox-3.0.19-source.tar.bz2) = 2f00b94144db7e98054e273608a428abeadf72609d5239b5b24d8da6d7c7f3da
-SIZE (firefox-3.0.19-source.tar.bz2) = 37392306
diff --git a/www/firefox3/files/firefox.desktop.in b/www/firefox3/files/firefox.desktop.in
deleted file mode 100644
index d72090e1aabf..000000000000
--- a/www/firefox3/files/firefox.desktop.in
+++ /dev/null
@@ -1,191 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=@MOZILLA_NAME@ Web Browser
-Name[am]=
-Name[ar]=
-Name[az]=@MOZILLA_NAME@ Veb Səyyahı
-Name[be]=
-Name[bg]=Интернет браузър @MOZILLA_NAME@
-Name[bn]=
-Name[bs]=@MOZILLA_NAME@ web preglednik
-Name[ca]=Navegador web @MOZILLA_NAME@
-Name[cs]=Prohlížeč WWW @MOZILLA_NAME@
-Name[cy]=Y Porwr Gwe @MOZILLA_NAME@
-Name[da]=@MOZILLA_NAME@ - internetsurfning
-Name[de]=@MOZILLA_NAME@ Webbrowser
-Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@
-Name[en_CA]=@MOZILLA_NAME@ Web Browser
-Name[en_GB]=@MOZILLA_NAME@ Web Browser
-Name[es]=Navegador Web @MOZILLA_NAME@
-Name[et]=@MOZILLA_NAME@ veebibrauser
-Name[eu]=@MOZILLA_NAME@ web arakatzailea
-Name[fi]=@MOZILLA_NAME@, WWW-selain
-Name[fr]=Navigateur Web @MOZILLA_NAME@
-Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@
-Name[gu]=એપીફની વૅબ બ્રાઉઝર
-Name[he]=דפדפן @MOZILLA_NAME@
-Name[hi]=
-Name[hr]=@MOZILLA_NAME@ Web preglednik
-Name[hu]=@MOZILLA_NAME@ webböngésző
-Name[id]=Web Browser @MOZILLA_NAME@
-Name[it]=Browser web @MOZILLA_NAME@
-Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ
-Name[ko]=@MOZILLA_NAME@ 웹 브라우저
-Name[li]=@MOZILLA_NAME@ Web Browser
-Name[lt]=@MOZILLA_NAME@ web naršyklė
-Name[mk]=@MOZILLA_NAME@ веб прелистувач
-Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസ‌ര്
-Name[mn]=@MOZILLA_NAME@ веб хөтөч
-Name[ms]=Pelungsur Web @MOZILLA_NAME@
-Name[nb]=@MOZILLA_NAME@ nettleser
-Name[nl]=@MOZILLA_NAME@ Webbrowser
-Name[nn]=@MOZILLA_NAME@ nettlesar
-Name[no]=@MOZILLA_NAME@ nettleser
-Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-Name[pl]=Przeglądarka WWW @MOZILLA_NAME@
-Name[pt]=Navegador Web @MOZILLA_NAME@
-Name[pt_BR]=Navegador Web @MOZILLA_NAME@
-Name[ro]=Navigatorul @MOZILLA_NAME@
-Name[ru]=Веб-браузер @MOZILLA_NAME@
-Name[sk]=
-Name[sl]=Spletni brskalnik @MOZILLA_NAME@
-Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web
-Name[sr]=
-Name[sr@Latn]=Veb čitač Spoznaja
-Name[sv]=Webbläsaren @MOZILLA_NAME@
-Name[ta]=எபிபனி வலை உலாவி
-Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi
-Name[tr]=@MOZILLA_NAME@ Web Tarayıcı
-Name[uk]=Переглядач web @MOZILLA_NAME@
-Name[vi]=Trình Duyệt Web @MOZILLA_NAME@
-Name[wa]=Betchteu waibe epiphany
-Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器
-Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器
-GenericName=Web Browser
-GenericName[ar]=متصفّح الانترنت
-GenericName[az]=Veb Səyyahı
-GenericName[be]=Вандроўнік па павуціньню
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[bs]=Web preglednik
-GenericName[ca]=Navegador web
-GenericName[cs]=Prohlížeč WWW
-GenericName[cy]=Porwr Gwe
-GenericName[da]=Internetsurfning
-GenericName[de]=Webbrowser
-GenericName[el]=Περιηγητής Ιστοσελίδων
-GenericName[en_CA]=Web Browser
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web @MOZILLA_NAME@
-GenericName[ga]=Brabhsálaí Lín
-GenericName[gu]=વેબ બ્રાઉઝર
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[id]=Browser Web
-GenericName[it]=Browser web
-GenericName[ja]=GNOME ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[li]=Wèb Browser
-GenericName[lt]=Web naršyklė
-GenericName[mk]=Веб прелистувач
-GenericName[mn]=Веб хөтөч
-GenericName[ms]=Pelungsur Web
-GenericName[nb]=Nettleser
-GenericName[nl]=Web-browser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator Internet
-GenericName[ru]=Веб-браузер
-GenericName[sk]=WWW prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sq]=Shfletuesi Web
-GenericName[sr]=Веб читач
-GenericName[sr@Latn]=Veb čitač
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tk]=Web Ahtarçysy
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Переглядач web-сторінок
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[zh_CN]=Web 浏览器
-GenericName[zh_TW]=網頁瀏覽器
-Comment=Browse the web
-Comment[ar]=تصفح الانترنت
-Comment[az]=Vebi gəzin
-Comment[be]=Вандраваць па павуціньню
-Comment[bg]=Сърфиране в интернет
-Comment[bn]=ওয়েব ব্রাউজ করুন
-Comment[bs]=Pregledaj na internetu
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížet WWW
-Comment[cy]=Pori'r we
-Comment[da]=Surf på internettet
-Comment[de]=Im Web surfen
-Comment[el]=Περιήγηση στον παγκόσμιο ιστό
-Comment[en_CA]=Browse the web
-Comment[en_GB]=Browse the web
-Comment[es]=Navegar por la web
-Comment[et]=Sirvi veebi
-Comment[eu]=Arakatu web-a
-Comment[fi]=Selaa WWW:tä
-Comment[fr]=Naviguer sur Internet
-Comment[ga]=Brabhsáil an Líon
-Comment[gu]=વેબમાં શોધો
-Comment[he]=גלוש ברשת
-Comment[hi]=वेब ब्राउज़ करें
-Comment[hr]=Pregledaj Web
-Comment[hu]=A világháló böngészése
-Comment[id]=Jelajah web
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[li]=Blajere op internet
-Comment[lt]=Naršyti internete
-Comment[mk]=Прелистувајте на веб
-Comment[ml]=വലക്കെട്ട് തിരയുക
-Comment[mn]=Веб броузе хийх
-Comment[ms]=Layari web
-Comment[nb]=Surf på nettet
-Comment[nl]=Websurfen
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegar na web
-Comment[pt_BR]=Navegar na web
-Comment[ro]=Navigare Internet
-Comment[ru]=Веб-браузер
-Comment[sk]=Prehliadať internet
-Comment[sl]=Brskaj po spletu
-Comment[sq]=Eksploro web-in
-Comment[sr]=Прегледај веб
-Comment[sr@Latn]=Pregledaj veb
-Comment[sv]=Surfa på nätet
-Comment[ta]=வலையில் உலாவு
-Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@
-Comment[tk]=Webi Ahtar
-Comment[tr]=Web'e Gözat
-Comment[uk]=Програма перегляду web-сторінок
-Comment[vi]=Duyệt web
-Comment[wa]=Naivyî avå les waibes
-Comment[zh_CN]=浏览 Web
-Comment[zh_TW]=瀏覽網頁
-Exec=@MOZILLA@ %u
-Icon=@FIREFOX_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
diff --git a/www/firefox3/files/patch-build_unix_run-mozilla.sh b/www/firefox3/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 92777d76a378..000000000000
--- a/www/firefox3/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/unix/run-mozilla.sh.orig	Tue Feb 14 19:56:54 2006
-+++ build/unix/run-mozilla.sh	Fri Dec  8 15:49:48 2006
-@@ -443,6 +443,9 @@
- export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
- export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
- 
-+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox3
-+export MOZ_PLUGIN_PATH
-+
- if [ $moz_debug -eq 1 ]
- then
- 	moz_debug_program ${1+"$@"}
diff --git a/www/firefox3/files/patch-config-mkdepend-imakemdep.h b/www/firefox3/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e664475d..000000000000
--- a/www/firefox3/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
diff --git a/www/firefox3/files/patch-config-rules.mk b/www/firefox3/files/patch-config-rules.mk
deleted file mode 100644
index 8ab35f5a8326..000000000000
--- a/www/firefox3/files/patch-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ config/rules.mk	Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
- 
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
- 
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/www/firefox3/files/patch-config_autoconf.mk.in b/www/firefox3/files/patch-config_autoconf.mk.in
deleted file mode 100644
index b39d9bacf0d7..000000000000
--- a/www/firefox3/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
-+++ config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
-@@ -58,14 +58,14 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/%%MOZILLA%%
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/%%MOZILLA%%
-+sdkdir		= $(libdir)/%%MOZILLA%%
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
diff --git a/www/firefox3/files/patch-config_mkdepend_Makefile.in b/www/firefox3/files/patch-config_mkdepend_Makefile.in
deleted file mode 100644
index bace012a282e..000000000000
--- a/www/firefox3/files/patch-config_mkdepend_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,7 @@
- include $(topsrcdir)/config/rules.mk
- 
- HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= $(XCFLAGS)
- 
- ifdef GNU_CC
- _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox3/files/patch-content_xslt_public_txDouble.h b/www/firefox3/files/patch-content_xslt_public_txDouble.h
deleted file mode 100644
index 534bccba48be..000000000000
--- a/www/firefox3/files/patch-content_xslt_public_txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */
diff --git a/www/firefox3/files/patch-db_sqlite3_src_Makefile.in b/www/firefox3/files/patch-db_sqlite3_src_Makefile.in
deleted file mode 100644
index 71b84da6d4c2..000000000000
--- a/www/firefox3/files/patch-db_sqlite3_src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
-+++ db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
-@@ -45,6 +45,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+OS_CFLAGS	 = -I../../../dist/include/sqlite3
-+OS_LIBS		 = %%PTHREAD_LIBS%%
- MODULE           = sqlite3
- LIBRARY_NAME     = sqlite3
- FORCE_SHARED_LIB = 1
diff --git a/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74f62..000000000000
--- a/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-                           &mStartLinksOnlyPref);
- 
--  PRBool isSoundEnabled = PR_TRUE;
-+  mIsSoundEnabled = PR_TRUE;
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
--                           &isSoundEnabled);
-+                           &mIsSoundEnabled);
-   nsXPIDLCString soundStr;
--  if (isSoundEnabled) {
-+  if (mIsSoundEnabled && mIsSoundEnabled) {
-     prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
-                              getter_Copies(soundStr));
-   }
-@@ -758,7 +758,7 @@
-     }
-     else {
-       // No find string to backspace in!
--      if (mIsBackspaceProtectOn) {
-+      if (mIsBackspaceProtectOn && mIsSoundEnabled) {
-         // This flag should be on only if the last key was a backspace.
-         // It keeps us from accidentally hitting backspace too many times and
-         // going back in history when we really just wanted to clear 
-@@ -1012,7 +1012,9 @@
- 
-     // Error sound (don't fire when backspace is pressed, they're 
-     // trying to correct the mistake!)
--    PlayNotFoundSound();
-+    if (mIsSoundEnabled) {
-+      PlayNotFoundSound();
-+    }
- 
-     // Remove bad character from buffer, so we can continue typing from
-     // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
--  if (mNotFoundSoundURL.IsEmpty())    // no sound
-+  if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled)    // no sound
-     return;
-   if (!mSoundInterface) {
-     mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b4334d..000000000000
--- a/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
-@@ -194,6 +194,9 @@
- 
-   nsCString mNotFoundSoundURL;
- 
-+  // Move the sound enabled boolean out for all methods to access.
-+  PRBool mIsSoundEnabled;
-+
-   // PRBool's are used instead of PRPackedBool's where the address of the
-   // boolean variable is getting passed into a method. For example:
-   // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/www/firefox3/files/patch-js_src_jsnum.c b/www/firefox3/files/patch-js_src_jsnum.c
deleted file mode 100644
index a3ef2769ab9c..000000000000
--- a/www/firefox3/files/patch-js_src_jsnum.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- js/src/jsnum.c.orig	Sun Nov  5 18:37:07 2006
-+++ js/src/jsnum.c	Sun Nov  5 18:42:31 2006
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
- 
- #else
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
-+#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
-+#else
-+
- #define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
- 
- #endif
- 
diff --git a/www/firefox3/files/patch-layout-style-nsCSSValue.h b/www/firefox3/files/patch-layout-style-nsCSSValue.h
deleted file mode 100644
index eb6793f08a77..000000000000
--- a/www/firefox3/files/patch-layout-style-nsCSSValue.h
+++ /dev/null
@@ -1,215 +0,0 @@
-# Ensure correct alignment for nsCSSValue objects inside nsCSSValue::Array.
-#  (Bug 476345)
-
---- layout/style/nsCSSValue.h.orig	2008-07-02 00:51:43.000000000 +0200
-+++ layout/style/nsCSSValue.h	2009-02-01 21:43:29.000000000 +0100
-@@ -286,104 +286,7 @@
-   // failure.
-   static nsStringBuffer* BufferFromString(const nsString& aValue);
-   
--  struct Array {
--
--    // return |Array| with reference count of zero
--    static Array* Create(PRUint16 aItemCount) {
--      return new (aItemCount) Array(aItemCount);
--    }
--
--    nsCSSValue& operator[](PRUint16 aIndex) {
--      NS_ASSERTION(aIndex < mCount, "out of range");
--      return *(First() + aIndex);
--    }
--
--    const nsCSSValue& operator[](PRUint16 aIndex) const {
--      NS_ASSERTION(aIndex < mCount, "out of range");
--      return *(First() + aIndex);
--    }
--
--    nsCSSValue& Item(PRUint16 aIndex) { return (*this)[aIndex]; }
--    const nsCSSValue& Item(PRUint16 aIndex) const { return (*this)[aIndex]; }
--
--    PRUint16 Count() const { return mCount; }
--
--    PRBool operator==(const Array& aOther) const
--    {
--      if (mCount != aOther.mCount)
--        return PR_FALSE;
--      for (PRUint16 i = 0; i < mCount; ++i)
--        if ((*this)[i] != aOther[i])
--          return PR_FALSE;
--      return PR_TRUE;
--    }
--
--    void AddRef() {
--      if (mRefCnt == PR_UINT16_MAX) {
--        NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
--        return;
--      }
--      ++mRefCnt;
--      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Array", sizeof(*this));
--    }
--    void Release() {
--      if (mRefCnt == PR_UINT16_MAX) {
--        NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
--        return;
--      }
--      --mRefCnt;
--      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Array");
--      if (mRefCnt == 0)
--        delete this;
--    }
--
--  private:
--
--    PRUint16 mRefCnt;
--    PRUint16 mCount;
--
--    void* operator new(size_t aSelfSize, PRUint16 aItemCount) CPP_THROW_NEW {
--      return ::operator new(aSelfSize + sizeof(nsCSSValue)*aItemCount);
--    }
--
--    void operator delete(void* aPtr) { ::operator delete(aPtr); }
--
--    nsCSSValue* First() {
--      return (nsCSSValue*) (((char*)this) + sizeof(*this));
--    }
--
--    const nsCSSValue* First() const {
--      return (const nsCSSValue*) (((const char*)this) + sizeof(*this));
--    }
--
--#define CSSVALUE_LIST_FOR_VALUES(var)                                         \
--  for (nsCSSValue *var = First(), *var##_end = var + mCount;                  \
--       var != var##_end; ++var)
--
--    Array(PRUint16 aItemCount)
--      : mRefCnt(0)
--      , mCount(aItemCount)
--    {
--      MOZ_COUNT_CTOR(nsCSSValue::Array);
--      CSSVALUE_LIST_FOR_VALUES(val) {
--        new (val) nsCSSValue();
--      }
--    }
--
--    ~Array()
--    {
--      MOZ_COUNT_DTOR(nsCSSValue::Array);
--      CSSVALUE_LIST_FOR_VALUES(val) {
--        val->~nsCSSValue();
--      }
--    }
--
--#undef CSSVALUE_LIST_FOR_VALUES
--
--  private:
--    Array(const Array& aOther); // not to be implemented
--  };
--
-+  struct Array;
-   struct URL {
-     // Methods are not inline because using an nsIPrincipal means requiring
-     // caps, which leads to REQUIRES hell, since this header is included all
-@@ -454,5 +357,102 @@
-   }         mValue;
- };
- 
--#endif /* nsCSSValue_h___ */
-+struct nsCSSValue::Array {
-+
-+  // return |Array| with reference count of zero
-+  static Array* Create(PRUint16 aItemCount) {
-+    return new (aItemCount) Array(aItemCount);
-+  }
-+
-+  nsCSSValue& operator[](PRUint16 aIndex) {
-+    NS_ASSERTION(aIndex < mCount, "out of range");
-+    return mArray[aIndex];
-+  }
-+
-+  const nsCSSValue& operator[](PRUint16 aIndex) const {
-+    NS_ASSERTION(aIndex < mCount, "out of range");
-+    return mArray[aIndex];
-+  }
-+
-+  nsCSSValue& Item(PRUint16 aIndex) { return (*this)[aIndex]; }
-+  const nsCSSValue& Item(PRUint16 aIndex) const { return (*this)[aIndex]; }
-+
-+  PRUint16 Count() const { return mCount; }
-+
-+  PRBool operator==(const Array& aOther) const
-+  {
-+    if (mCount != aOther.mCount)
-+      return PR_FALSE;
-+    for (PRUint16 i = 0; i < mCount; ++i)
-+      if ((*this)[i] != aOther[i])
-+        return PR_FALSE;
-+    return PR_TRUE;
-+  }
-+
-+  void AddRef() {
-+    if (mRefCnt == PR_UINT16_MAX) {
-+      NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
-+      return;
-+    }
-+    ++mRefCnt;
-+    NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Array", sizeof(*this));
-+  }
-+  void Release() {
-+    if (mRefCnt == PR_UINT16_MAX) {
-+      NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
-+      return;
-+    }
-+    --mRefCnt;
-+    NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Array");
-+    if (mRefCnt == 0)
-+      delete this;
-+  }
-+
-+private:
-+
-+  PRUint16 mRefCnt;
-+  const PRUint16 mCount;
-+  // This must be the last sub-object, since we extend this array to
-+  // be of size mCount; it needs to be a sub-object so it gets proper
-+  // alignment.
-+  nsCSSValue mArray[1];
- 
-+  void* operator new(size_t aSelfSize, PRUint16 aItemCount) CPP_THROW_NEW {
-+    return ::operator new(aSelfSize + sizeof(nsCSSValue) * (aItemCount - 1));
-+  }
-+
-+  void operator delete(void* aPtr) { ::operator delete(aPtr); }
-+
-+  nsCSSValue* First() { return mArray; }
-+
-+  const nsCSSValue* First() const { return mArray; }
-+
-+#define CSSVALUE_LIST_FOR_EXTRA_VALUES(var)                                   \
-+for (nsCSSValue *var = First() + 1, *var##_end = First() + mCount;          \
-+     var != var##_end; ++var)
-+
-+  Array(PRUint16 aItemCount)
-+    : mRefCnt(0)
-+    , mCount(aItemCount)
-+  {
-+    MOZ_COUNT_CTOR(nsCSSValue::Array);
-+    CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
-+      new (val) nsCSSValue();
-+    }
-+  }
-+
-+  ~Array()
-+  {
-+    MOZ_COUNT_DTOR(nsCSSValue::Array);
-+    CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
-+      val->~nsCSSValue();
-+    }
-+  }
-+
-+#undef CSSVALUE_LIST_FOR_VALUES
-+
-+private:
-+  Array(const Array& aOther); // not to be implemented
-+};
-+
-+#endif /* nsCSSValue_h___ */
diff --git a/www/firefox3/files/patch-layout_generic_Makefile.in b/www/firefox3/files/patch-layout_generic_Makefile.in
deleted file mode 100644
index 038b5df63eed..000000000000
--- a/www/firefox3/files/patch-layout_generic_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
-+++ layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
-@@ -188,9 +188,10 @@
- 		-I$(srcdir)/../../content/base/src \
- 		-I$(srcdir)/../../content/html/content/src \
- 		-I$(srcdir)/../../dom/src/base \
--		$(MOZ_CAIRO_CFLAGS) \
- 		$(NULL)
- 
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
-+
- ifdef MOZ_ENABLE_GTK2
- CXXFLAGS += $(MOZ_GTK2_CFLAGS)
- endif
diff --git a/www/firefox3/files/patch-security-coreconf-FreeBSD.mk b/www/firefox3/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 992a34b3d1f5..000000000000
--- a/www/firefox3/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,42 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig	2008-07-12 07:28:59.000000000 -0700
-+++ security/coreconf/FreeBSD.mk	2009-11-09 22:42:09.000000000 -0800
-@@ -45,8 +45,24 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
-+ifeq ($(OS_TEST),ia64)
-+CPU_ARCH		= ia64
-+else
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH		= powerpc
-+else
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH		= sparc64
-+else
- CPU_ARCH		= x86
- endif
-+endif
-+endif
-+endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -73,7 +89,7 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
-@@ -82,4 +98,4 @@
- 
- G++INCLUDES		= -I/usr/include/g++
- 
--INCLUDES		+= -I/usr/X11R6/include
-+#INCLUDES		+= -I/usr/local/include
diff --git a/www/firefox3/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox3/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
deleted file mode 100644
index f30d12229ccd..000000000000
--- a/www/firefox3/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
-@@ -110,6 +110,7 @@
- #include "nss.h"
- #include "pk11func.h"
- #include "ssl.h"
-+#define NSS_ENABLE_ECC 1
- #include "sslproto.h"
- #include "secmod.h"
- #include "sechash.h"
diff --git a/www/firefox3/files/patch-storage_build_Makefile.in b/www/firefox3/files/patch-storage_build_Makefile.in
deleted file mode 100644
index 18202a5a61d8..000000000000
--- a/www/firefox3/files/patch-storage_build_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
-@@ -77,6 +77,7 @@
- 	$(EXTRA_DSO_LIBS) \
- 	$(MOZ_COMPONENT_LIBS) \
- 	$(MOZ_JS_LIBS) \
-+	%%PTHREAD_LIBS%% \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/www/firefox3/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp b/www/firefox3/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp
deleted file mode 100644
index 1cefba669bf1..000000000000
--- a/www/firefox3/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- toolkit/components/history/src/nsGlobalHistory.cpp.orig	2006-02-02 20:55:17.000000000 +0100
-+++ toolkit/components/history/src/nsGlobalHistory.cpp
-@@ -322,7 +322,9 @@ matchAgeInDaysCallback(nsIMdbRow *row, v
-   if (err != 0) return PR_FALSE;
-   
-   PRTime rowDate;
--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &rowDate);
-+  long long ld;
-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+  rowDate = ld;
- 
-   PRInt32 days = GetAgeInDays(matchSearchTerm->now, rowDate);
-   
-@@ -1067,7 +1069,9 @@ nsGlobalHistory::GetRowValue(nsIMdbRow *
-   if (!yarn.mYarn_Fill || !yarn.mYarn_Buf)
-     return NS_OK;
- 
--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", aResult);
-+  long long ld;
-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+  *aResult = ld;
-   
-   return NS_OK;
- }
diff --git a/www/firefox3/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp b/www/firefox3/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
deleted file mode 100644
index 8d6955be7f59..000000000000
--- a/www/firefox3/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- toolkit/components/places/src/nsMorkHistoryImporter.cpp.orig	2008-03-19 20:30:49.000000000 +0100
-+++ toolkit/components/places/src/nsMorkHistoryImporter.cpp	2008-12-17 09:38:05.000000000 +0100
-@@ -148,9 +148,12 @@ AddToHistoryCB(const nsCSubstring &aRowI
-     }
- 
-     PRTime date;
--    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &date) != 1) {
-+    long long ld;
-+    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &ld) != 1) {
-       date = -1;
--    }
-+    } else {
-+      date = ld;
-+   }
- 
-     PRBool isTyped = values[kTypedColumn].EqualsLiteral("1");
-     PRInt32 transition = isTyped ?
diff --git a/www/firefox3/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp b/www/firefox3/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp
deleted file mode 100644
index 09a9e6035e60..000000000000
--- a/www/firefox3/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-# reported upstream as: https://bugzilla.mozilla.org/show_bug.cgi?id=469276
-
---- toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp.orig	2008-08-25 22:59:14.000000000 +0200
-+++ toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp	2008-12-12 16:31:11.000000000 +0100
-@@ -2023,8 +2023,9 @@
-           return NS_ERROR_FAILURE;
-         }
-         const nsCSubstring& str = Substring(chunk, start, 4);
--        const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
--        entry->mAddChunkId = PR_ntohl(*p);
-+        PRUint32 p;
-+	memcpy(&p, str.BeginReading(), 4);
-+        entry->mAddChunkId = PR_ntohl(p);
-         if (entry->mAddChunkId == 0) {
-           NS_WARNING("Received invalid chunk number.");
-           return NS_ERROR_FAILURE;
-@@ -2052,8 +2053,9 @@
- 
-         if (chunkType == CHUNK_SUB) {
-           const nsCSubstring& str = Substring(chunk, start, 4);
--          const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
--          entry->mAddChunkId = PR_ntohl(*p);
-+	  PRUint32 p;
-+	  memcpy(&p, str.BeginReading(), 4);
-+          entry->mAddChunkId = PR_ntohl(p);
-           if (entry->mAddChunkId == 0) {
-             NS_WARNING("Received invalid chunk number.");
-             return NS_ERROR_FAILURE;
diff --git a/www/firefox3/files/patch-toolkit_mozapps_installer_packager.mk b/www/firefox3/files/patch-toolkit_mozapps_installer_packager.mk
deleted file mode 100644
index 635c3c79c13c..000000000000
--- a/www/firefox3/files/patch-toolkit_mozapps_installer_packager.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
-+++ toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
-@@ -409,7 +409,7 @@
- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
diff --git a/www/firefox3/files/patch-toolkit_xre_Makefile.in b/www/firefox3/files/patch-toolkit_xre_Makefile.in
deleted file mode 100644
index 4a9c8533a2f8..000000000000
--- a/www/firefox3/files/patch-toolkit_xre_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- toolkit/xre/Makefile.in.orig	2007-09-10 10:31:53.000000000 -0400
-+++ toolkit/xre/Makefile.in	2007-09-10 10:35:00.000000000 -0400
-@@ -263,5 +263,3 @@
- libs:: platform.ini
- 	$(INSTALL) $^ $(DIST)/bin
- 
--install::
--	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
diff --git a/www/firefox3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index 9a41bbfc4602..000000000000
--- a/www/firefox3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- *  1 is AddRef
- *  2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
diff --git a/www/firefox3/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h b/www/firefox3/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
deleted file mode 100644
index 0440ce0a263f..000000000000
--- a/www/firefox3/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptcall/src/xptcprivate.h.orig	2009-11-09 21:43:49.000000000 -0800
-+++ xpcom/reflect/xptcall/src/xptcprivate.h	2009-11-09 21:44:05.000000000 -0800
-@@ -45,7 +45,7 @@
- 
- class xptiInterfaceEntry;
- 
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -62,7 +62,7 @@
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
- 
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
diff --git a/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
deleted file mode 100644
index b1aa7ce6c524..000000000000
--- a/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -70,6 +70,9 @@
- ifeq (Darwin,$(OS_ARCH))
- DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
- endif
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- endif
- #
-@@ -87,7 +90,7 @@
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -150,9 +153,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -311,7 +320,7 @@
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS		:= $(CC) -c -x assembler-with-cpp
-@@ -389,6 +398,15 @@
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
- #
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
-+endif
-+#
- # OpenBSD/SPARC
- #
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
diff --git a/www/firefox3/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp b/www/firefox3/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp
deleted file mode 100644
index ee3eede144f1..000000000000
--- a/www/firefox3/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- xpfe/components/history/src/nsGlobalHistory.cpp.orig	2007-12-03 05:25:14.000000000 +0100
-+++ xpfe/components/history/src/nsGlobalHistory.cpp
-@@ -304,7 +304,9 @@ matchAgeInDaysCallback(nsIMdbRow *row, v
-   if (err != 0) return PR_FALSE;
-   
-   PRTime rowDate;
--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &rowDate);
-+  long long ld;
-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+  rowDate = ld;
- 
-   PRInt32 days = matchSearchTerm->globalHist->GetAgeInDays(rowDate);
-   
-@@ -1000,7 +1002,9 @@ nsGlobalHistory::GetRowValue(nsIMdbRow *
-   if (!yarn.mYarn_Fill || !yarn.mYarn_Buf)
-     return NS_OK;
- 
--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", aResult);
-+  long long ld;
-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+  *aResult = ld;
- 
-   return NS_OK;
- }
diff --git a/www/firefox3/pkg-descr b/www/firefox3/pkg-descr
deleted file mode 100644
index 166df46a0e53..000000000000
--- a/www/firefox3/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Firefox is an award winning, free, open-source web browser for many platforms
-and is based on the Mozilla codebase. It is small, fast and easy to use, and
-offers many advanced features:
- o Popup Blocking
- o Tabbed Browsing
- o Live Bookmarks (ie. RSS)
- o Extensions
- o Themes
- o FastFind
- o Improved Security
-
-WWW: http://www.mozilla.com/firefox
diff --git a/www/firefox3/pkg-message b/www/firefox3/pkg-message
deleted file mode 100644
index 447c5a0aef6e..000000000000
--- a/www/firefox3/pkg-message
+++ /dev/null
@@ -1,32 +0,0 @@
-======================================================================
-
-SMB issues:
-Network group, machine, and share browsing does not work correctly.
-
-SFTP:
-Only sftp access using public key authentication works.  To easily
-setup public key authentication to "remote_host":
-
-ssh-keygen -t dsa
-cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys"
-
-The SSH sever on remote_host must allow pub key authentication.
-
-======================================================================
-
-Any bug reports should be addressed to the maintainers at:
-	gecko@FreeBSD.org
-You may also Cc: freebsd-ports@FreeBSD.org. Please do not send
-bug reports to any other addresses.
-
-Please include the following information with any bug report:
-* Output from 'uname -a'.
-* Date/time stamp from www/firefox-devel/Makefile.
-* Where/when did the problem occur: configuring, building, or
-	running firefox
-* How can you reproduce the problem?
-
-Thank you for your help in testing and reporting bugs, and we hope you
-enjoy using Firefox.
-The Maintainers (gecko@)
-======================================================================