Pullup ticket 504 - requested by Shin'ichiro TAYA

security update for firefox

Revisions pulled up:
- pkgsrc/www/firefox/Makefile			1.15
- pkgsrc/www/firefox/Makefile-firefox.common	1.14, 1.16-1.18
- pkgsrc/www/firefox/PLIST			1.13-1.15
- pkgsrc/www/firefox/buildlink3.mk		1.5
- pkgsrc/www/firefox/distinfo			1.29
- pkgsrc/www/firefox-gtk1/PLIST			1.3-1.4
- pkgsrc/www/firefox-gtk1/buildlink3.mk		1.4

   Module Name:		pkgsrc
   Committed By:	taya
   Date:		Wed Apr 13 13:34:26 UTC 2005

   Modified Files:
   	pkgsrc/www/firefox: Makefile-firefox.common PLIST
   	pkgsrc/www/firefox-gtk1: PLIST

   Log Message:
   change extensions list as same as Linux official build.
   bump PKGREVISION.
   fix PR pkg/29595
---
   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Fri Apr 15 12:42:27 UTC 2005

   Modified Files:
   	pkgsrc/www/firefox: PLIST

   Log Message:
   Add two @exec ${MKDIR} lines for empty directories which have @dirrm
   lines, to fix binary packages.
---
   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Fri Apr 15 12:44:30 UTC 2005

   Modified Files:
   	pkgsrc/www/firefox-gtk1: PLIST

   Log Message:
   Add an @exec ${MKDIR} line for an empty directory which has a @dirrm
   line, to fix binary packages.
---
   Module Name:		pkgsrc
   Committed By:	taya
   Date:		Sun Apr 24 14:00:12 UTC 2005

   Modified Files:
   	pkgsrc/www/firefox: Makefile-firefox.common

   Log Message:
   concatinate extensions with separator ',' and set to MOZILLA_EXTENSIONS,
   instead of using ':ts' modifier.
   becase make of NetBSD-1.6.x doesn't have it.
   suggested by Jeremy C. Reed.
---
   Module Name:		pkgsrc
   Committed By:	reed
   Date:		Mon Apr 25 19:26:10 UTC 2005

   Modified Files:
   	pkgsrc/www/firefox: Makefile-firefox.common

   Log Message:
   Make sure build is without gssapi support. (Okayed by maintainer,
   taya ... well really he said "I don't object your idea.")

   This fixes a build bug when heimdal is detected but not buildlinked.
   It is a known mozilla bug:
    https://bugzilla.mozilla.org/show_bug.cgi?id=245467

   I didn't put this in the mozilla/Makefile.common, because didn't test
   that yet.

   This issue probably only happens when using /usr as the LOCALBASE,
   which is not really supported and maybe I am the only one to hit this
   with pkgsrc.

   Maybe later someone can consider adding a build option for GSSAPI,
   but I don't know anything about it in regards to a web browser myself.
---
   Module Name:		pkgsrc
   Committed By:	taya
   Date:		Sat May 14 15:27:10 UTC 2005

   Modified Files:
   	pkgsrc/www/firefox: Makefile Makefile-firefox.common PLIST
   	    buildlink3.mk distinfo
   	pkgsrc/www/firefox-gtk1: buildlink3.mk

   Log Message:
   Update firefox & firefox-gtk1 to 1.0.4.

   This is a security fix release.
   Fixed vulnerabilities are follows:

   MFSA 2005-44  Privilege escalation via non-DOM property overrides
   MFSA 2005-43 "Wrapped" javascript: urls bypass security checks
   MFSA 2005-42 Code execution via javascript: IconURL

7 files changed, 38 insertions, 96 deletions

diff --git a/www/firefox-gtk1/PLIST b/www/firefox-gtk1/PLIST
index 8e36aaf5e48..99cd14720df 100644
--- a/www/firefox-gtk1/PLIST
+++ b/www/firefox-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/27 15:15:24 taya Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2005/05/16 15:07:13 salo Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -47,26 +47,21 @@ lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmozldap.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmyspell.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
 lib/${MOZILLA}/components/liboji.${SO_SUFFIX}
-lib/${MOZILLA}/components/libp3p.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpipboot.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpipnss.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpippki.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpref.${SO_SUFFIX}
 lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
-lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX}
 lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libtransformiix.${SO_SUFFIX}
 lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX}
 lib/${MOZILLA}/components/libuconv.${SO_SUFFIX}
 lib/${MOZILLA}/components/libucvmath.${SO_SUFFIX}
 lib/${MOZILLA}/components/libuniversalchardet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebsrvcs.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwidget_gtk.${SO_SUFFIX}
@@ -110,7 +105,6 @@ lib/${MOZILLA}/chrome/browser.jar
 lib/${MOZILLA}/chrome/chromelist.txt
 lib/${MOZILLA}/chrome/classic.jar
 lib/${MOZILLA}/chrome/comm.jar
-lib/${MOZILLA}/chrome/content-packs.jar
 lib/${MOZILLA}/chrome/embed-sample.jar
 lib/${MOZILLA}/chrome/en-US.jar
 lib/${MOZILLA}/chrome/help.jar
@@ -183,8 +177,6 @@ lib/${MOZILLA}/components/mimetype.xpt
 lib/${MOZILLA}/components/mozbrwsr.xpt
 lib/${MOZILLA}/components/mozfind.xpt
 lib/${MOZILLA}/components/mozldap.xpt
-lib/${MOZILLA}/components/myspell/en-US.aff
-lib/${MOZILLA}/components/myspell/en-US.dic
 lib/${MOZILLA}/components/necko.xpt
 lib/${MOZILLA}/components/necko_about.xpt
 lib/${MOZILLA}/components/necko_cache.xpt
@@ -214,7 +206,6 @@ lib/${MOZILLA}/components/nsSidebar.js
 lib/${MOZILLA}/components/nsUpdateService.js
 lib/${MOZILLA}/components/nsXmlRpcClient.js
 lib/${MOZILLA}/components/oji.xpt
-lib/${MOZILLA}/components/p3p.xpt
 lib/${MOZILLA}/components/passwordmgr.xpt
 lib/${MOZILLA}/components/pipboot.xpt
 lib/${MOZILLA}/components/pipnss.xpt
@@ -232,8 +223,6 @@ lib/${MOZILLA}/components/search.xpt
 lib/${MOZILLA}/components/shellservice.xpt
 lib/${MOZILLA}/components/shistory.xpt
 lib/${MOZILLA}/components/sidebar.xpt
-lib/${MOZILLA}/components/signonviewer.xpt
-lib/${MOZILLA}/components/spellchecker.xpt
 lib/${MOZILLA}/components/toolkitprofile.xpt
 lib/${MOZILLA}/components/txmgr.xpt
 lib/${MOZILLA}/components/txtsvc.xpt
@@ -241,9 +230,6 @@ lib/${MOZILLA}/components/uconv.xpt
 lib/${MOZILLA}/components/unicharutil.xpt
 lib/${MOZILLA}/components/update.xpt
 lib/${MOZILLA}/components/uriloader.xpt
-lib/${MOZILLA}/components/wallet.xpt
-lib/${MOZILLA}/components/walleteditor.xpt
-lib/${MOZILLA}/components/walletpreview.xpt
 lib/${MOZILLA}/components/webBrowser_core.xpt
 lib/${MOZILLA}/components/webbrowserpersist.xpt
 lib/${MOZILLA}/components/webshell_idls.xpt
@@ -280,13 +266,6 @@ lib/${MOZILLA}/defaults/profile/localstore.rdf
 lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
 lib/${MOZILLA}/defaults/profile/prefs.js
 lib/${MOZILLA}/defaults/profile/search.rdf
-lib/${MOZILLA}/defaults/wallet/DistinguishedSchema.tbl
-lib/${MOZILLA}/defaults/wallet/FieldSchema.tbl
-lib/${MOZILLA}/defaults/wallet/PositionalSchema.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
-lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
-lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
 lib/${MOZILLA}/greprefs/all.js
 lib/${MOZILLA}/greprefs/non-shared.txt
 lib/${MOZILLA}/greprefs/security-prefs.js
@@ -1603,10 +1582,6 @@ include/${MOZILLA}/oji/nsIThreadManager.h
 include/${MOZILLA}/oji/nsJVMManager.h
 include/${MOZILLA}/oji/nsJVMPluginTagInfo.h
 include/${MOZILLA}/oji/nsjvm.h
-include/${MOZILLA}/p3p/nsIPolicyListener.h
-include/${MOZILLA}/p3p/nsIPolicyReference.h
-include/${MOZILLA}/p3p/nsIPolicyTarget.h
-include/${MOZILLA}/p3p/nsP3PCIID.h
 include/${MOZILLA}/passwordmgr/nsIPassword.h
 include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
 include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
@@ -1742,10 +1717,6 @@ include/${MOZILLA}/shistory/nsISHistory.h
 include/${MOZILLA}/shistory/nsISHistoryInternal.h
 include/${MOZILLA}/shistory/nsISHistoryListener.h
 include/${MOZILLA}/sidebar/nsISidebar.h
-include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
-include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
-include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
-include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
 include/${MOZILLA}/string/nsAString.h
 include/${MOZILLA}/string/nsAlgorithm.h
 include/${MOZILLA}/string/nsCharTraits.h
@@ -1845,12 +1816,6 @@ include/${MOZILLA}/view/nsIView.h
 include/${MOZILLA}/view/nsIViewManager.h
 include/${MOZILLA}/view/nsIViewObserver.h
 include/${MOZILLA}/view/nsViewsCID.h
-include/${MOZILLA}/wallet/nsCPassword.h
-include/${MOZILLA}/wallet/nsIPassword.h
-include/${MOZILLA}/wallet/nsIWalletService.h
-include/${MOZILLA}/walletviewers/nsISignonViewer.h
-include/${MOZILLA}/walletviewers/nsIWalletEditor.h
-include/${MOZILLA}/walletviewers/nsIWalletPreview.h
 include/${MOZILLA}/webbrowserpersist/nsCWebBrowserPersist.h
 include/${MOZILLA}/webbrowserpersist/nsIWebBrowserPersist.h
 include/${MOZILLA}/webbrwsr/nsCTooltipTextProvider.h
@@ -2256,13 +2221,13 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/res/dtd
 @dirrm lib/${MOZILLA}/res/builtin
 @dirrm lib/${MOZILLA}/res
+@exec ${MKDIR} %D/lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/ipc/modules
 @dirrm lib/${MOZILLA}/ipc
 @dirrm lib/${MOZILLA}/init.d
 @dirrm lib/${MOZILLA}/icons
 @dirrm lib/${MOZILLA}/greprefs
-@dirrm lib/${MOZILLA}/defaults/wallet
 @dirrm lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 @dirrm lib/${MOZILLA}/defaults/profile/extensions
 @dirrm lib/${MOZILLA}/defaults/profile/chrome
@@ -2270,7 +2235,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/defaults/pref
 @dirrm lib/${MOZILLA}/defaults/autoconfig
 @dirrm lib/${MOZILLA}/defaults
-@dirrm lib/${MOZILLA}/components/myspell
 @dirrm lib/${MOZILLA}/components
 @dirrm lib/${MOZILLA}/chrome
 @dirrm lib/${MOZILLA}
@@ -2294,8 +2258,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/webshell
 @dirrm include/${MOZILLA}/webbrwsr
 @dirrm include/${MOZILLA}/webbrowserpersist
-@dirrm include/${MOZILLA}/walletviewers
-@dirrm include/${MOZILLA}/wallet
 @dirrm include/${MOZILLA}/view
 @dirrm include/${MOZILLA}/util
 @dirrm include/${MOZILLA}/uriloader
@@ -2314,7 +2276,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/txmgr
 @dirrm include/${MOZILLA}/toolkitcomps
 @dirrm include/${MOZILLA}/string
-@dirrm include/${MOZILLA}/spellchecker
 @dirrm include/${MOZILLA}/sidebar
 @dirrm include/${MOZILLA}/shistory
 @dirrm include/${MOZILLA}/shellservice
@@ -2332,7 +2293,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/pipnss
 @dirrm include/${MOZILLA}/pipboot
 @dirrm include/${MOZILLA}/passwordmgr
-@dirrm include/${MOZILLA}/p3p
 @dirrm include/${MOZILLA}/oji
 @dirrm include/${MOZILLA}/nspr/private
 @dirrm include/${MOZILLA}/nspr/obsolete
diff --git a/www/firefox-gtk1/buildlink3.mk b/www/firefox-gtk1/buildlink3.mk
index fc8c8d4b678..c4439ae1d7d 100644
--- a/www/firefox-gtk1/buildlink3.mk
+++ b/www/firefox-gtk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1.2.1 2005/03/25 08:29:00 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.1.1.1.2.2 2005/05/16 15:07:13 salo Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FIREFOX_GTK2_BUILDLINK3_MK:=	${FIREFOX_GTK2_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	firefox-gtk1
 
 .if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.0
-BUILDLINK_RECOMMENDED.firefox-gtk1+=	firefox-gtk1>=1.0.2
+BUILDLINK_RECOMMENDED.firefox-gtk1+=	firefox-gtk1>=1.0.4
 BUILDLINK_PKGSRCDIR.firefox-gtk1?=	../../www/firefox-gtk1
 .endif	# FIREFOX_GTK2_BUILDLINK3_MK
 
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 679d81753c8..0cfa82ebd33 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/02/27 13:20:43 taya Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2005/05/16 15:07:13 salo Exp $
 
 MOZILLA=	firefox
 EXTRACT_SUFX=	.tar.bz2
@@ -8,4 +8,14 @@ COMMENT=	Lightweight gecko-based web browser
 MOZILLA_USE_GTK2=	# defined
 MOZILLA_USE_XFT=	YES
 
+PKGCONFIG_OVERRIDE+=	build/unix/firefox-gtkmozembed.pc
+PKGCONFIG_OVERRIDE+=	build/unix/firefox-js.pc
+PKGCONFIG_OVERRIDE+=	build/unix/firefox-nspr.pc
+PKGCONFIG_OVERRIDE+=	build/unix/firefox-nss.pc
+PKGCONFIG_OVERRIDE+=	build/unix/firefox-plugin.pc
+PKGCONFIG_OVERRIDE+=	build/unix/firefox-xpcom.pc
+# Some .pc files are filled in by the build process, so we can't fix the
+# rpaths until this has happened.
+PKGCONFIG_OVERRIDE_STAGE=	post-build
+
 .include "../../www/firefox/Makefile-firefox.common"
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 3a6026a9d09..5de9adb6ffa 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.11.2.3 2005/04/22 06:48:12 snj Exp $
+# $NetBSD: Makefile-firefox.common,v 1.11.2.4 2005/05/16 15:07:13 salo Exp $
 
 MOZILLA_BIN=	firefox-bin
-MOZ_VER=	1.0.3
+MOZ_VER=	1.0.4
 EXTRACT_SUFX=	.tar.bz2
 
 DISTNAME=	firefox-${MOZ_VER}-source
@@ -23,7 +23,10 @@ MAKE_ENV+=	MOZ_PHOENIX=1
 CONFIGURE_ARGS+=	--disable-mailnews
 CONFIGURE_ARGS+=	--disable-composer
 CONFIGURE_ARGS+=	--enable-single-profile
-CONFIGURE_ARGS+=	--enable-extensions=default,-irc,-typeaheadfind
+CONFIGURE_ARGS+=	--without-gssapi
+
+MOZILLA_EXTENSIONS=	cookie,gnomevfs,inspector,negotiateauth,pref,transformiix,universalchardet,webservices,xml-rpc,xmlextras
+CONFIGURE_ARGS+=	--enable-extensions=${MOZILLA_EXTENSIONS}
 
 USE_LANGUAGES+=		c++
 BUILD_MATHML=		# defined
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 5b1dda61829..a7f29eec16b 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/02/27 13:20:43 taya Exp $
+@comment $NetBSD: PLIST,v 1.12.2.1 2005/05/16 15:07:13 salo Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -47,18 +47,15 @@ lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmozldap.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmyspell.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
 lib/${MOZILLA}/components/liboji.${SO_SUFFIX}
-lib/${MOZILLA}/components/libp3p.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpipboot.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpipnss.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpippki.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpref.${SO_SUFFIX}
 lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
-lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX}
 lib/${MOZILLA}/components/libsystem-pref.${SO_SUFFIX}
 lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libtransformiix.${SO_SUFFIX}
@@ -66,8 +63,6 @@ lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX}
 lib/${MOZILLA}/components/libuconv.${SO_SUFFIX}
 lib/${MOZILLA}/components/libucvmath.${SO_SUFFIX}
 lib/${MOZILLA}/components/libuniversalchardet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebsrvcs.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwidget_gtk2.${SO_SUFFIX}
@@ -101,6 +96,14 @@ lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
 lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
 @comment end DSO
+@comment begin PKGCONFIG
+lib/pkgconfig/firefox-gtkmozembed.pc
+lib/pkgconfig/firefox-js.pc
+lib/pkgconfig/firefox-nspr.pc
+lib/pkgconfig/firefox-nss.pc
+lib/pkgconfig/firefox-plugin.pc
+lib/pkgconfig/firefox-xpcom.pc
+@comment end PKGCONFIG
 @comment begin DATA
 lib/${MOZILLA}/LICENSE
 lib/${MOZILLA}/README.txt
@@ -110,7 +113,6 @@ lib/${MOZILLA}/chrome/browser.jar
 lib/${MOZILLA}/chrome/chromelist.txt
 lib/${MOZILLA}/chrome/classic.jar
 lib/${MOZILLA}/chrome/comm.jar
-lib/${MOZILLA}/chrome/content-packs.jar
 lib/${MOZILLA}/chrome/embed-sample.jar
 lib/${MOZILLA}/chrome/en-US.jar
 lib/${MOZILLA}/chrome/help.jar
@@ -186,8 +188,6 @@ lib/${MOZILLA}/components/mozbrwsr.xpt
 lib/${MOZILLA}/components/mozfind.xpt
 lib/${MOZILLA}/components/mozgnome.xpt
 lib/${MOZILLA}/components/mozldap.xpt
-lib/${MOZILLA}/components/myspell/en-US.aff
-lib/${MOZILLA}/components/myspell/en-US.dic
 lib/${MOZILLA}/components/necko.xpt
 lib/${MOZILLA}/components/necko_about.xpt
 lib/${MOZILLA}/components/necko_cache.xpt
@@ -217,7 +217,6 @@ lib/${MOZILLA}/components/nsSidebar.js
 lib/${MOZILLA}/components/nsUpdateService.js
 lib/${MOZILLA}/components/nsXmlRpcClient.js
 lib/${MOZILLA}/components/oji.xpt
-lib/${MOZILLA}/components/p3p.xpt
 lib/${MOZILLA}/components/passwordmgr.xpt
 lib/${MOZILLA}/components/pipboot.xpt
 lib/${MOZILLA}/components/pipnss.xpt
@@ -235,8 +234,6 @@ lib/${MOZILLA}/components/search.xpt
 lib/${MOZILLA}/components/shellservice.xpt
 lib/${MOZILLA}/components/shistory.xpt
 lib/${MOZILLA}/components/sidebar.xpt
-lib/${MOZILLA}/components/signonviewer.xpt
-lib/${MOZILLA}/components/spellchecker.xpt
 lib/${MOZILLA}/components/toolkitprofile.xpt
 lib/${MOZILLA}/components/txmgr.xpt
 lib/${MOZILLA}/components/txtsvc.xpt
@@ -244,9 +241,6 @@ lib/${MOZILLA}/components/uconv.xpt
 lib/${MOZILLA}/components/unicharutil.xpt
 lib/${MOZILLA}/components/update.xpt
 lib/${MOZILLA}/components/uriloader.xpt
-lib/${MOZILLA}/components/wallet.xpt
-lib/${MOZILLA}/components/walleteditor.xpt
-lib/${MOZILLA}/components/walletpreview.xpt
 lib/${MOZILLA}/components/webBrowser_core.xpt
 lib/${MOZILLA}/components/webbrowserpersist.xpt
 lib/${MOZILLA}/components/webshell_idls.xpt
@@ -283,13 +277,6 @@ lib/${MOZILLA}/defaults/profile/localstore.rdf
 lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
 lib/${MOZILLA}/defaults/profile/prefs.js
 lib/${MOZILLA}/defaults/profile/search.rdf
-lib/${MOZILLA}/defaults/wallet/DistinguishedSchema.tbl
-lib/${MOZILLA}/defaults/wallet/FieldSchema.tbl
-lib/${MOZILLA}/defaults/wallet/PositionalSchema.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
-lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
-lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
 lib/${MOZILLA}/greprefs/all.js
 lib/${MOZILLA}/greprefs/non-shared.txt
 lib/${MOZILLA}/greprefs/security-prefs.js
@@ -1617,10 +1604,6 @@ include/${MOZILLA}/oji/nsIThreadManager.h
 include/${MOZILLA}/oji/nsJVMManager.h
 include/${MOZILLA}/oji/nsJVMPluginTagInfo.h
 include/${MOZILLA}/oji/nsjvm.h
-include/${MOZILLA}/p3p/nsIPolicyListener.h
-include/${MOZILLA}/p3p/nsIPolicyReference.h
-include/${MOZILLA}/p3p/nsIPolicyTarget.h
-include/${MOZILLA}/p3p/nsP3PCIID.h
 include/${MOZILLA}/passwordmgr/nsIPassword.h
 include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
 include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
@@ -1756,10 +1739,6 @@ include/${MOZILLA}/shistory/nsISHistory.h
 include/${MOZILLA}/shistory/nsISHistoryInternal.h
 include/${MOZILLA}/shistory/nsISHistoryListener.h
 include/${MOZILLA}/sidebar/nsISidebar.h
-include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
-include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
-include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
-include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
 include/${MOZILLA}/string/nsAString.h
 include/${MOZILLA}/string/nsAlgorithm.h
 include/${MOZILLA}/string/nsCharTraits.h
@@ -1861,12 +1840,6 @@ include/${MOZILLA}/view/nsIView.h
 include/${MOZILLA}/view/nsIViewManager.h
 include/${MOZILLA}/view/nsIViewObserver.h
 include/${MOZILLA}/view/nsViewsCID.h
-include/${MOZILLA}/wallet/nsCPassword.h
-include/${MOZILLA}/wallet/nsIPassword.h
-include/${MOZILLA}/wallet/nsIWalletService.h
-include/${MOZILLA}/walletviewers/nsISignonViewer.h
-include/${MOZILLA}/walletviewers/nsIWalletEditor.h
-include/${MOZILLA}/walletviewers/nsIWalletPreview.h
 include/${MOZILLA}/webbrowserpersist/nsCWebBrowserPersist.h
 include/${MOZILLA}/webbrowserpersist/nsIWebBrowserPersist.h
 include/${MOZILLA}/webbrwsr/nsCTooltipTextProvider.h
@@ -2271,13 +2244,13 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/res/dtd
 @dirrm lib/${MOZILLA}/res/builtin
 @dirrm lib/${MOZILLA}/res
+@exec ${MKDIR} %D/lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/ipc/modules
 @dirrm lib/${MOZILLA}/ipc
 @dirrm lib/${MOZILLA}/init.d
 @dirrm lib/${MOZILLA}/icons
 @dirrm lib/${MOZILLA}/greprefs
-@dirrm lib/${MOZILLA}/defaults/wallet
 @dirrm lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 @dirrm lib/${MOZILLA}/defaults/profile/extensions
 @dirrm lib/${MOZILLA}/defaults/profile/chrome
@@ -2285,7 +2258,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/defaults/pref
 @dirrm lib/${MOZILLA}/defaults/autoconfig
 @dirrm lib/${MOZILLA}/defaults
-@dirrm lib/${MOZILLA}/components/myspell
 @dirrm lib/${MOZILLA}/components
 @dirrm lib/${MOZILLA}/chrome/icons/default
 @dirrm lib/${MOZILLA}/chrome/icons
@@ -2311,8 +2283,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/webshell
 @dirrm include/${MOZILLA}/webbrwsr
 @dirrm include/${MOZILLA}/webbrowserpersist
-@dirrm include/${MOZILLA}/walletviewers
-@dirrm include/${MOZILLA}/wallet
 @dirrm include/${MOZILLA}/view
 @dirrm include/${MOZILLA}/util
 @dirrm include/${MOZILLA}/uriloader
@@ -2332,10 +2302,10 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/toolkitcomps
 @dirrm include/${MOZILLA}/system-pref
 @dirrm include/${MOZILLA}/string
-@dirrm include/${MOZILLA}/spellchecker
 @dirrm include/${MOZILLA}/sidebar
 @dirrm include/${MOZILLA}/shistory
 @dirrm include/${MOZILLA}/shellservice
+@exec ${MKDIR} %D/include/${MOZILLA}/seccmd
 @dirrm include/${MOZILLA}/seccmd
 @dirrm include/${MOZILLA}/satchel
 @dirrm include/${MOZILLA}/rdfutil
@@ -2351,7 +2321,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/pipnss
 @dirrm include/${MOZILLA}/pipboot
 @dirrm include/${MOZILLA}/passwordmgr
-@dirrm include/${MOZILLA}/p3p
 @dirrm include/${MOZILLA}/oji
 @dirrm include/${MOZILLA}/nspr/private
 @dirrm include/${MOZILLA}/nspr/obsolete
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index 2925b81db16..05036f73163 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2.2.1 2005/03/25 08:29:00 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.2.2.2 2005/05/16 15:07:13 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FIREFOX_BUILDLINK3_MK:=	${FIREFOX_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	firefox
 
 .if !empty(FIREFOX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.firefox+=	firefox>=1.0
-BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.0.2
+BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.0.4
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
 .endif	# FIREFOX_BUILDLINK3_MK
 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index a0d7cefa1cc..5b16ed185af 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25.2.3 2005/04/22 06:48:12 snj Exp $
+$NetBSD: distinfo,v 1.25.2.4 2005/05/16 15:07:13 salo Exp $
 
-SHA1 (firefox-1.0.3/firefox-1.0.3-source.tar.bz2) = afaf5e7664ff619b30a82e4239a04ce9fd4f1f8b
-RMD160 (firefox-1.0.3/firefox-1.0.3-source.tar.bz2) = e160e64ea82b3d992dbd119d72c6b8c602d2a0f2
-Size (firefox-1.0.3/firefox-1.0.3-source.tar.bz2) = 32784300 bytes
+SHA1 (firefox-1.0.4/firefox-1.0.4-source.tar.bz2) = d030628e52e1bebe9d6515d7fab5a126a1b6b38a
+RMD160 (firefox-1.0.4/firefox-1.0.4-source.tar.bz2) = 4b04740fe4615ddddd16ec296509177ab29d4edc
+Size (firefox-1.0.4/firefox-1.0.4-source.tar.bz2) = 32756592 bytes
 SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
 SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642