- when official branding is not enabled, just call it "Browser".

- set the default start page to something more sensible.
- Bump PKGREVISION

5 files changed, 34 insertions, 3 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 96e62723f21..b50dce76ea7 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.57 2009/09/18 08:03:49 ghen Exp $
+# $NetBSD: Makefile,v 1.58 2009/09/23 16:46:31 tnn Exp $
 #
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${FIREFOX_VER}
 FIREFOX_VER=	3.5.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 7918accf32a..d249c282f41 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.97 2009/09/17 09:41:50 tnn Exp $
+$NetBSD: distinfo,v 1.98 2009/09/23 16:46:31 tnn Exp $
 
 SHA1 (firefox-3.5.3.source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb
 RMD160 (firefox-3.5.3.source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422
@@ -9,3 +9,6 @@ SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
 SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
 SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
 SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0
+SHA1 (patch-ra) = b215219b8429274ca3aa81790b62531aaf189127
+SHA1 (patch-rb) = 15970b5fe79621d47e573ddec074a6e67e8c5146
+SHA1 (patch-rc) = 890012b4fca22d965a40262830aabbb06a2da36e
diff --git a/www/firefox/patches/patch-ra b/www/firefox/patches/patch-ra
new file mode 100644
index 00000000000..bfa443c33ee
--- /dev/null
+++ b/www/firefox/patches/patch-ra
@@ -0,0 +1,9 @@
+$NetBSD: patch-ra,v 1.1 2009/09/23 16:46:32 tnn Exp $
+
+--- browser/branding/unofficial/locales/browserconfig.properties.orig	2009-08-24 17:52:36.000000000 +0200
++++ browser/branding/unofficial/locales/browserconfig.properties
+@@ -1,3 +1,3 @@
+ # Do NOT localize or otherwise change these values
+-browser.startup.homepage=http://www.mozilla.org/projects/shiretoko/
++browser.startup.homepage=http://www.google.com/firefox
+ 
diff --git a/www/firefox/patches/patch-rb b/www/firefox/patches/patch-rb
new file mode 100644
index 00000000000..1b3aa9b603b
--- /dev/null
+++ b/www/firefox/patches/patch-rb
@@ -0,0 +1,7 @@
+$NetBSD: patch-rb,v 1.1 2009/09/23 16:46:32 tnn Exp $
+
+--- browser/branding/unofficial/configure.sh.orig	2009-08-24 17:52:35.000000000 +0200
++++ browser/branding/unofficial/configure.sh
+@@ -1 +1 @@
+-MOZ_APP_DISPLAYNAME="Shiretoko"
++MOZ_APP_DISPLAYNAME="Browser"
diff --git a/www/firefox/patches/patch-rc b/www/firefox/patches/patch-rc
new file mode 100644
index 00000000000..b1b0654046e
--- /dev/null
+++ b/www/firefox/patches/patch-rc
@@ -0,0 +1,12 @@
+$NetBSD: patch-rc,v 1.1 2009/09/23 16:46:32 tnn Exp $
+
+--- browser/branding/unofficial/locales/en-US/brand.dtd.orig	2009-08-24 17:52:36.000000000 +0200
++++ browser/branding/unofficial/locales/en-US/brand.dtd
+@@ -1,5 +1,5 @@
+-<!ENTITY  brandShortName        "Shiretoko">
+-<!ENTITY  brandFullName         "Shiretoko">
++<!ENTITY  brandShortName        "Browser">
++<!ENTITY  brandFullName         "Browser">
+ <!ENTITY  vendorShortName       "mozilla.org">
+ <!ENTITY  logoCopyright         " ">
+