- remove patch-bj that i forgot to remove at previous commit

- add $NetBSD$ to patch-ah

thanks to adrianp, wiz, kambe san.

6 files changed, 8 insertions, 52 deletions

diff --git a/www/mozilla-stable/distinfo b/www/mozilla-stable/distinfo
index 213b6dbf1ca..87c65ef915c 100644
--- a/www/mozilla-stable/distinfo
+++ b/www/mozilla-stable/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2004/12/25 15:39:43 taya Exp $
+$NetBSD: distinfo,v 1.13 2005/01/04 11:03:01 taya Exp $
 
 SHA1 (mozilla-source-1.7.5.tar.bz2) = 29c90cb72cc1ad71783cecb112427a848aa07f64
 Size (mozilla-source-1.7.5.tar.bz2) = 30440393 bytes
@@ -9,7 +9,7 @@ SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
 SHA1 (patch-af) = 547ebc0d72a012f636839f416f872125c15846ba
 SHA1 (patch-ag) = bdfc47157ac42ea826ee187ae0a23121561ec9f4
-SHA1 (patch-ah) = ffaa0800415c7e20a5242ae6b7369dc73354582a
+SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01
 SHA1 (patch-ai) = dd468f36359ee4520ee104c7c5b4c2335d953a98
 SHA1 (patch-aj) = 408c80da132d65ed7fa50e403fa863c7a3e5e287
 SHA1 (patch-ak) = 13082ce164b46edd8025cbc2866018dc121a919a
diff --git a/www/mozilla-stable/patches/patch-ah b/www/mozilla-stable/patches/patch-ah
index 31bc15ca033..8e380e49d1e 100644
--- a/www/mozilla-stable/patches/patch-ah
+++ b/www/mozilla-stable/patches/patch-ah
@@ -1,3 +1,5 @@
+$NetBSD: patch-ah,v 1.3 2005/01/04 11:03:01 taya Exp $
+
 diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
 --- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 10:09:33.000000000 +0900
 +++ ./gfx/idl/nsIFreeType2.idl	2004-06-11 00:32:42.000000000 +0900
diff --git a/www/mozilla-stable/patches/patch-bj b/www/mozilla-stable/patches/patch-bj
deleted file mode 100644
index 5c56cb013a7..00000000000
--- a/www/mozilla-stable/patches/patch-bj
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bj,v 1.4 2004/12/04 03:50:40 taya Exp $
-
---- uriloader/exthandler/nsExternalHelperAppService.cpp.orig	2004-11-11 15:56:52.000000000 +0100
-+++ uriloader/exthandler/nsExternalHelperAppService.cpp
-@@ -1747,6 +1747,11 @@ nsresult nsExternalAppHandler::ExecuteDe
-       // XXX Put progress dialog in barber-pole mode
-       //     and change text to say "Copying from:".
-       rv = MoveFile(mFinalFileDestination);
-+      if (NS_SUCCEEDED(rv) && action == nsIMIMEInfo::saveToDisk)
-+      {
-+        nsCOMPtr<nsILocalFile> destfile(do_QueryInterface(mFinalFileDestination));
-+        sSrv->FixFilePermissions(destfile);
-+      }
-     }
-     
-     // Notify dialog that download is complete.
-@@ -1913,7 +1918,6 @@ nsresult nsExternalAppHandler::MoveFile(
-      if (directoryLocation)
-      {
-        rv = mTempFile->MoveToNative(directoryLocation, fileName);
--       sSrv->FixFilePermissions(fileToUse);
-      }
-      if (NS_FAILED(rv))
-      {
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index a19d9b0db29..fc1f398d6bd 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2004/12/25 15:39:42 taya Exp $
+$NetBSD: distinfo,v 1.71 2005/01/04 11:03:00 taya Exp $
 
 SHA1 (mozilla-source-1.7.5.tar.bz2) = 29c90cb72cc1ad71783cecb112427a848aa07f64
 Size (mozilla-source-1.7.5.tar.bz2) = 30440393 bytes
@@ -9,7 +9,7 @@ SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
 SHA1 (patch-af) = 547ebc0d72a012f636839f416f872125c15846ba
 SHA1 (patch-ag) = bdfc47157ac42ea826ee187ae0a23121561ec9f4
-SHA1 (patch-ah) = ffaa0800415c7e20a5242ae6b7369dc73354582a
+SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01
 SHA1 (patch-ai) = dd468f36359ee4520ee104c7c5b4c2335d953a98
 SHA1 (patch-aj) = 408c80da132d65ed7fa50e403fa863c7a3e5e287
 SHA1 (patch-ak) = 13082ce164b46edd8025cbc2866018dc121a919a
diff --git a/www/mozilla/patches/patch-ah b/www/mozilla/patches/patch-ah
index 31bc15ca033..3f09add6c83 100644
--- a/www/mozilla/patches/patch-ah
+++ b/www/mozilla/patches/patch-ah
@@ -1,3 +1,5 @@
+$NetBSD: patch-ah,v 1.10 2005/01/04 11:03:01 taya Exp $
+
 diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
 --- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 10:09:33.000000000 +0900
 +++ ./gfx/idl/nsIFreeType2.idl	2004-06-11 00:32:42.000000000 +0900
diff --git a/www/mozilla/patches/patch-bj b/www/mozilla/patches/patch-bj
deleted file mode 100644
index daeec7e552b..00000000000
--- a/www/mozilla/patches/patch-bj
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bj,v 1.8 2004/11/12 02:11:22 wiz Exp $
-
---- uriloader/exthandler/nsExternalHelperAppService.cpp.orig	2004-11-11 15:56:52.000000000 +0100
-+++ uriloader/exthandler/nsExternalHelperAppService.cpp
-@@ -1747,6 +1747,11 @@ nsresult nsExternalAppHandler::ExecuteDe
-       // XXX Put progress dialog in barber-pole mode
-       //     and change text to say "Copying from:".
-       rv = MoveFile(mFinalFileDestination);
-+      if (NS_SUCCEEDED(rv) && action == nsIMIMEInfo::saveToDisk)
-+      {
-+        nsCOMPtr<nsILocalFile> destfile(do_QueryInterface(mFinalFileDestination));
-+        sSrv->FixFilePermissions(destfile);
-+      }
-     }
-     
-     // Notify dialog that download is complete.
-@@ -1913,7 +1918,6 @@ nsresult nsExternalAppHandler::MoveFile(
-      if (directoryLocation)
-      {
-        rv = mTempFile->MoveToNative(directoryLocation, fileName);
--       sSrv->FixFilePermissions(fileToUse);
-      }
-      if (NS_FAILED(rv))
-      {