27 files changed, 216 insertions, 90 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox-devel/files/patch-browser_app_mozilla.in b/www/firefox-devel/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox-devel/files/patch-browser_app_mozilla.in
+++ b/www/firefox-devel/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox-esr/files/mozconfig.in b/www/firefox-esr/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox-esr/files/mozconfig.in
+++ b/www/firefox-esr/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox-esr/files/patch-browser_app_mozilla.in b/www/firefox-esr/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox-esr/files/patch-browser_app_mozilla.in
+++ b/www/firefox-esr/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox/files/mozconfig.in
+++ b/www/firefox/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox/files/patch-browser_app_mozilla.in b/www/firefox/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox/files/patch-browser_app_mozilla.in
+++ b/www/firefox/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox10/files/mozconfig.in
+++ b/www/firefox10/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox10/files/patch-browser_app_mozilla.in b/www/firefox10/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox10/files/patch-browser_app_mozilla.in
+++ b/www/firefox10/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox15/files/mozconfig.in b/www/firefox15/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox15/files/mozconfig.in
+++ b/www/firefox15/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox15/files/patch-browser_app_mozilla.in b/www/firefox15/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox15/files/patch-browser_app_mozilla.in
+++ b/www/firefox15/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox3-devel/files/mozconfig.in
+++ b/www/firefox3-devel/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox3-devel/files/patch-browser_app_mozilla.in b/www/firefox3-devel/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox3-devel/files/patch-browser_app_mozilla.in
+++ b/www/firefox3-devel/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox35/files/mozconfig.in b/www/firefox35/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox35/files/mozconfig.in
+++ b/www/firefox35/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox35/files/patch-browser_app_mozilla.in b/www/firefox35/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox35/files/patch-browser_app_mozilla.in
+++ b/www/firefox35/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/firefox36/files/patch-browser_app_mozilla.in b/www/firefox36/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/firefox36/files/patch-browser_app_mozilla.in
+++ b/www/firefox36/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 3a517a8a51cb..dcfe38d03564 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -66,8 +66,7 @@ OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
 		XFT "Enable support for anti-aliased fonts" on \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEW_ICON "Install the new Firefox branding icon" off
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -237,11 +236,9 @@ post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
-.if defined(WITH_NEW_ICON)
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
-		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
 	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
 	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
+		${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
 
 .include <bsd.port.post.mk>
diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in
index a2c8dccba3ac..a354709bf72a 100644
--- a/www/flock/files/mozconfig.in
+++ b/www/flock/files/mozconfig.in
@@ -9,6 +9,9 @@ ac_add_options --disable-tests
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
+# See the following URL for approval email for using official branding
+# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
+ac_add_options --enable-official-branding
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
diff --git a/www/flock/files/patch-browser_app_mozilla.in b/www/flock/files/patch-browser_app_mozilla.in
index 3d5c7203e32b..d576c95816b8 100644
--- a/www/flock/files/patch-browser_app_mozilla.in
+++ b/www/flock/files/patch-browser_app_mozilla.in
@@ -1,5 +1,5 @@
---- browser/app/mozilla.in.orig	Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in	Sat Nov 13 00:57:22 2004
+--- browser/app/mozilla.in.orig	Tue Oct 26 05:26:11 2004
++++ browser/app/mozilla.in	Mon Dec 27 19:15:52 2004
 @@ -110,6 +110,7 @@
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@@ -8,7 +8,21 @@
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -207,12 +207,31 @@
+@@ -160,11 +161,11 @@
+ 	_optLast="${i}"
+ done #last arg
+ 
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ 	# Last argument seems to be a local file/directory
+ 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ 	# If it is just "relatively" (./file) specified, make it absolutely
+-	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++	[ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+ fi
+ ################################################################ Parse Arguments
+ 
+@@ -207,12 +208,31 @@
        script_args="$script_args -d $2"
        shift 2
        ;;