From b18bfe20763cad5c0ccbb4d65a2c21b9fce3cd92 Mon Sep 17 00:00:00 2001
From: Michael Johnson <ahze@FreeBSD.org>
Date: Tue, 28 Dec 2004 00:51:58 +0000
Subject: - Remove WITH_NEW_ICON knob - Mozilla license team has approved the
 FreeBSD Gnome team to   use official branding for firefox and thunderbird [1]
   o Add  --enable-official-branding to mozconfig   o Install official
 thunderbird/firefox icon as default.xpm icon - Fix error when running
 firefox/thunderbird -v [2] - Bump PORTREVISION

References:
	http://www.mozilla.org/foundation/licensing.html [1]
	http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt [1]
PR:		ports/75262 [2]
Submitted by:	girgen [2]
---
 www/flock/files/patch-browser_app_mozilla.in | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'www/flock/files/patch-browser_app_mozilla.in')

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
        ;;
-- 
cgit v1.2.3