diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-25 05:55:27 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-25 05:55:27 +0000 |
commit | ce7f695e6dc3eb8add4969423ff13de6541564d0 (patch) | |
tree | 6792e6507820734326e29983dce7a67f9f386f94 /www/firefox15/files/patch-browser_app_mozilla.in | |
parent | * Update to 1.0.2 to fix security issues (see (diff) |
* Update to 1.0.2 to fix security issues (see
http://www.vuxml.org/freebsd/7d2aac52-9c6b-11d9-99a7-000a95bc6fae.html and
http://www.vuxml.org/freebsd/741f8841-9c6b-11d9-9dbe-000a95bc6fae.html for
more details)
* Fix some minor cosmetic issues with the startup script
Submitted by: Jose M Rodriguez (freebsd) <josemi@freebsd.jazztel.es>
Approved by: portmgr (implicit)
Notes
Notes:
svn path=/head/; revision=131937
Diffstat (limited to 'www/firefox15/files/patch-browser_app_mozilla.in')
-rw-r--r-- | www/firefox15/files/patch-browser_app_mozilla.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/www/firefox15/files/patch-browser_app_mozilla.in b/www/firefox15/files/patch-browser_app_mozilla.in index 492dacc527e4..6389a61b5e8b 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 Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Mon Feb 28 23:32:14 2005 ++++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 @@ -29,51 +29,83 @@ ## the mozilla-bin binary to work. ## @@ -123,7 +123,7 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,149 +114,217 @@ +@@ -82,149 +114,221 @@ curdir=`dirname "$progname"` progbase=`basename "$progname"` run_moz="$curdir/run-mozilla.sh" @@ -421,8 +421,12 @@ + # FIXME problems with freedesktop StartupNotify + if [ -n "${debugging}" ]; then + echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" ++ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && ++ exit 0 ++ else ++ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ ++ >/dev/null 2>&1 && exit 0 + fi -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && exit 0 +fi + +# fallback to direct invocation |