- Update to 1.5.0.1

13 files changed, 5 insertions, 140 deletions

diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 401e9f9d3098..a1487e7a1c1b 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.27 2005/11/28 19:28:49 ahze Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	1.5
-PORTREVISION=	6
+DISTVERSION=	1.5.0.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -22,7 +21,6 @@ USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index fcf2eb8bbb61..f6e21e43fbe0 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779
-SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b
-SIZE (firefox-1.5-source.tar.bz2) = 34491496
+MD5 (firefox-1.5.0.1-source.tar.bz2) = c76f02956645bc823241379e27f76bb5
+SHA256 (firefox-1.5.0.1-source.tar.bz2) = b398cd9c32168669077a535475f4da67b925523de99147977603ffa3b8897814
+SIZE (firefox-1.5.0.1-source.tar.bz2) = 34705286
diff --git a/www/firefox36/files/patch-Double.cpp b/www/firefox36/files/patch-Double.cpp
index 06d16060503c..5cd13e4ff4fe 100644
--- a/www/firefox36/files/patch-Double.cpp
+++ b/www/firefox36/files/patch-Double.cpp
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
 +++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
 @@ -51,10 +51,10 @@
diff --git a/www/firefox36/files/patch-bugzilla319004 b/www/firefox36/files/patch-bugzilla319004
deleted file mode 100644
index 9eaa7ead5572..000000000000
--- a/www/firefox36/files/patch-bugzilla319004
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: toolkit/components/history/src/nsGlobalHistory.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v
-retrieving revision 1.58.2.2
-diff -u -8 -p -r1.58.2.2 nsGlobalHistory.cpp
---- toolkit/components/history/src/nsGlobalHistory.cpp.orig	23 Oct 2005 18:55:54 -0000	1.58.2.2
-+++ toolkit/components/history/src/nsGlobalHistory.cpp	8 Dec 2005 19:46:10 -0000
-@@ -108,16 +108,20 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
- 
- #define PREF_BRANCH_BASE                        "browser."
- #define PREF_BROWSER_HISTORY_EXPIRE_DAYS        "history_expire_days"
- #define PREF_AUTOCOMPLETE_ONLY_TYPED            "urlbar.matchOnlyTyped"
- #define PREF_AUTOCOMPLETE_ENABLED               "urlbar.autocomplete.enabled"
- 
- #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
- 
-+// see bug #319004 -- clamp title and URL to generously-large but not too large
-+// length
-+#define HISTORY_STRING_LENGTH_MAX 65536
-+
- // sync history every 10 seconds
- #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
- //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
- 
- // the value of mLastNow expires every 3 seconds
- #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC)
- 
- #define MSECS_PER_DAY (PR_MSEC_PER_SEC * 60 * 60 * 24)
-@@ -1105,30 +1109,37 @@ nsGlobalHistory::GetCount(PRUint32* aCou
- }
- 
- NS_IMETHODIMP
- nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle)
- {
-   nsresult rv;
-   NS_ENSURE_ARG_POINTER(aURI);
- 
--  const nsAFlatString& titleString = PromiseFlatString(aTitle);
-+  nsString realTitleString(aTitle);
-+  if (realTitleString.Length() > HISTORY_STRING_LENGTH_MAX)
-+    realTitleString.Left(realTitleString, HISTORY_STRING_LENGTH_MAX);
-+
-+  const nsAFlatString& titleString = PromiseFlatString(realTitleString);
- 
-   // skip about: URIs to avoid reading in the db (about:blank, especially)
-   PRBool isAbout;
-   rv = aURI->SchemeIs("about", &isAbout);
-   NS_ENSURE_SUCCESS(rv, rv);
-   if (isAbout) return NS_OK;
- 
-   NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE);
-   
-   nsCAutoString URISpec;
-   rv = aURI->GetSpec(URISpec);
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-+  if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX)
-+    URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX);
-+
-   nsCOMPtr<nsIMdbRow> row;
-   rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row));
- 
-   // if the row doesn't exist, we silently succeed
-   if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK;
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-   // Get the old title so we can notify observers
-Index: mork/src/morkSink.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/db/mork/src/morkSink.cpp,v
-retrieving revision 1.8
-diff -u -8 -p -r1.8 morkSink.cpp
---- db/mork/src/morkSink.cpp	17 Apr 2004 21:49:24 -0000	1.8
-+++ db/mork/src/morkSink.cpp	8 Dec 2005 19:45:59 -0000
-@@ -110,25 +110,20 @@ morkSpool::SpillPutc(morkEnv* ev, int c)
-       {
-         mork_size size = coil->mBlob_Size;
-         mork_fill fill = (mork_fill) (at - body); // current content size
-         if ( fill <= size ) // less content than medium size?
-         {
-           coil->mBuf_Fill = fill;
-           if ( at >= end ) // need to grow the coil?
-           {
--            if ( size > 2048 ) // grow slower over 2K?
--              size += 512;
-+            if ( size > 65536 )
-+              size += 65536;
-             else
--            {
--              mork_size growth = ( size * 4 ) / 3; // grow by 33%
--              if ( growth < 64 ) // grow faster under (64 * 3)?
--                growth = 64;
--              size += growth;
--            }
-+              size *= 2;
-             if ( coil->GrowCoil(ev, size) ) // made coil bigger?
-             {
-               body = (mork_u1*) coil->mBuf_Body;
-               if ( body ) // have a coil body?
-               {
-                 mSink_At = at = body + fill;
-                 mSink_End = end = body + coil->mBlob_Size;
-               }
diff --git a/www/firefox36/files/patch-build_unix_run-mozilla.sh b/www/firefox36/files/patch-build_unix_run-mozilla.sh
index 9b72375be0d6..87114cc7b898 100644
--- a/www/firefox36/files/patch-build_unix_run-mozilla.sh
+++ b/www/firefox36/files/patch-build_unix_run-mozilla.sh
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $
-
 --- build/unix/run-mozilla.sh.orig	Mon Dec 15 12:27:28 2003
 +++ build/unix/run-mozilla.sh	Wed Feb 11 14:24:17 2004
 @@ -355,7 +355,7 @@
diff --git a/www/firefox36/files/patch-config-mkdepend-imakemdep.h b/www/firefox36/files/patch-config-mkdepend-imakemdep.h
index 1761d513f04f..b688e664475d 100644
--- a/www/firefox36/files/patch-config-mkdepend-imakemdep.h
+++ b/www/firefox36/files/patch-config-mkdepend-imakemdep.h
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- 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 @@
diff --git a/www/firefox36/files/patch-config-rules.mk b/www/firefox36/files/patch-config-rules.mk
index 61c1b1503d4e..ecc3c8194dcc 100644
--- a/www/firefox36/files/patch-config-rules.mk
+++ b/www/firefox36/files/patch-config-rules.mk
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
 +++ config/rules.mk	Sun Feb  1 15:11:41 2004
 @@ -444,7 +444,11 @@
diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
index 1afef24a4ef0..41c462d74f62 100644
--- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- 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 @@
diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
index 80dd4ba7a8e8..07ad43b4334d 100644
--- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- 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 @@
diff --git a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
index d3c1e463f5a0..51edeb95a7a7 100644
--- a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
 @@ -49,6 +49,9 @@
diff --git a/www/firefox36/files/patch-xptcall-alpha b/www/firefox36/files/patch-xptcall-alpha
index e89460e6e544..29631a98e61e 100644
--- a/www/firefox36/files/patch-xptcall-alpha
+++ b/www/firefox36/files/patch-xptcall-alpha
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
 @@ -0,0 +1,184 @@
diff --git a/www/firefox36/files/patch-xptcall-sparc64 b/www/firefox36/files/patch-xptcall-sparc64
index 7d0faf06fa54..9599a8a71336 100644
--- a/www/firefox36/files/patch-xptcall-sparc64
+++ b/www/firefox36/files/patch-xptcall-sparc64
@@ -1,6 +1,3 @@
-$FreeBSD$
-  $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $
-
 --- /dev/null	Mon May 26 13:22:00 2003
 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
 @@ -0,0 +1,123 @@
diff --git a/www/firefox36/pkg-deinstall.in b/www/firefox36/pkg-deinstall.in
index f7ea61bf3963..0abb7e7c0458 100644
--- a/www/firefox36/pkg-deinstall.in
+++ b/www/firefox36/pkg-deinstall.in
@@ -1,8 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
-#    $MCom: ports/www/firefox/pkg-deinstall.in,v 1.8 2005/11/22 21:29:14 ahze Exp $
-#
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
 # Fix the chrome registry.