diff options
author | alane <alane@FreeBSD.org> | 2002-12-18 05:02:34 +0000 |
---|---|---|
committer | alane <alane@FreeBSD.org> | 2002-12-18 05:02:34 +0000 |
commit | 2b8cc802aef4e1ad85dafa7f405464636dd948bf (patch) | |
tree | 68291da3b0cc8609844216eb01f325e36e8b3604 /www/flock/files | |
parent | a03670e35b7f333e8868e3b684fc6cb9a0317de6 (diff) | |
download | FreeBSD-ports-2b8cc802aef4e1ad85dafa7f405464636dd948bf.zip FreeBSD-ports-2b8cc802aef4e1ad85dafa7f405464636dd948bf.tar.gz |
Patch by Greg Rumple & JMC to hopefully fix end-of-download crash. I'll
submit this fix back to the Mozilla team, since it will affect Mozilla 1.3a
as well.
Approved by: kris before departure (one of these days this update will end)
Diffstat (limited to 'www/flock/files')
-rw-r--r-- | www/flock/files/patch-nsprpub-pr-src-misc-prtime.c | 18 | ||||
-rw-r--r-- | www/flock/files/phoenix.rb | 95 |
2 files changed, 113 insertions, 0 deletions
diff --git a/www/flock/files/patch-nsprpub-pr-src-misc-prtime.c b/www/flock/files/patch-nsprpub-pr-src-misc-prtime.c new file mode 100644 index 0000000..6b65ef1 --- /dev/null +++ b/www/flock/files/patch-nsprpub-pr-src-misc-prtime.c @@ -0,0 +1,18 @@ +--- nsprpub/pr/src/misc/prtime.c.orig Sun Mar 31 12:17:46 2002 ++++ nsprpub/pr/src/misc/prtime.c Tue Dec 17 21:30:30 2002 +@@ -1666,12 +1666,13 @@ + * values for these two fields. + */ + +-#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) ++#if defined(__FreeBSD__)|| defined(SUNOS4) \ ++ || (__GLIBC__ >= 2) || defined(XP_BEOS) + if (mktime(&a) == -1) { + PR_snprintf(buf, buflen, "can't get timezone"); + return 0; + } +-#endif ++#endif /* check for __FreeBSD__, too <alane@freebsd.org> */ + + return strftime(buf, buflen, fmt, &a); + } diff --git a/www/flock/files/phoenix.rb b/www/flock/files/phoenix.rb new file mode 100644 index 0000000..fdbe4c5 --- /dev/null +++ b/www/flock/files/phoenix.rb @@ -0,0 +1,95 @@ +#!/usr/bin/env ruby +=begin -*-mode: ruby-*- + + MoZiLLa.in + + Copyright (c) 2002, Alan Eldridge + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the copyright owner nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + $Id: MoZiLLa.in,v 1.18 2002/12/18 02:40:58 alane Exp $ + + 2002-12-16 Alan Eldridge <alane@geeksrus.net> + +=end + +X11BIN = "/usr/X11R6/bin" +NAME = File::basename($0, ".rb") +APP_PATH = File::join(X11BIN, NAME) + +if !File::executable?(APP_PATH) + raise "File '#{APP_PATH}' not found. Giving up." +elsif ($display = ENV["DISPLAY"]) == nil + raise "Environment variable DISPLAY not found. Giving up." +end + +if ARGV.size > 0 + if ARGV[0] == "--debug" + ARGV.shift + else + $stdin.reopen(File::open("/dev/null", "r")) + $stdout.reopen(File::open("/dev/null", "w")) + $stderr.reopen(File::open("/dev/null", "w")) + end +end + +if ARGV.size < 1 + $url = nil +else + $url = ARGV.pop + $url.sub!(/^ghelp:/, "file:") +end + +IO::popen("xwininfo -display #{$display} -root -tree") { + |io| + if NAME != "phoenix" + $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) + else + $windows = io.grep(%r<Phoenix.*"Mozilla"\s+"navigator:\s*browser">) + end +} + +if $windows.size > 0 + $id = $windows.map { + |s| s.strip.split.first + }.sort.first + $args = [ "-id", $id, "-raise", "-remote" ] + $args.push($url ? "\"openURL(#{$url},new-window)\"" : + "\"xfeDoCommand(openBrowser)\"") +else + $args = ARGV + $args.push("\"#{$url}\"") if $url +end + +fork { + exec(([APP_PATH] + $args).join(" ")) +} +exit! + +#EOF |