diff options
author | marcus <marcus@FreeBSD.org> | 2009-01-10 13:22:13 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2009-01-10 13:22:13 +0800 |
commit | 6d8ed8f7c7511223163de715a97ffc04bf6fada9 (patch) | |
tree | 40dc015efe383243b0880df377f73ee250da7de7 /accessibility/orca/files | |
parent | c7f342a8d7b82e85b9625c4403600fc20ce41da6 (diff) | |
download | freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.gz freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.zst freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.zip |
Presenting GNOME 2.24 for FreeBSD.
See http://library.gnome.org/misc/release-notes/2.24/ for the general
release notes. On the FreeBSD front, this release introduces Fuse support
in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some
long-standing seahorse and gnome-keyring bugs. The documentation updates
to the website are forthcoming.
This release features commits by adamw, ahze, kwm, mezz, and myself. It would
not have been possible without are contributors and testers:
Alexander Loginov
Craig Butler [1]
Dmitry Marakasov [6]
Eric L. Chen
Joseph S. Atkinson
Kris Moore
Lapo Luchini [7]
Nikos Ntarmos
Pawel Worach
Romain Tartiere
TAOKA Fumiyoshi [3]
Yasuda Keisuke
Zyl
aZ [4]
bf [2] [5]
Florent Thoumie
Peter Wemm
pluknet
PR: 125857 [1]
126993 [2]
130031 [3]
127399 [4]
127661 [5]
124302 [6]
129570 [7]
129936
123790
Diffstat (limited to 'accessibility/orca/files')
-rw-r--r-- | accessibility/orca/files/patch-src_orca_orca.in | 60 |
1 files changed, 24 insertions, 36 deletions
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in index ec31af2bc8c3..484b6de03461 100644 --- a/accessibility/orca/files/patch-src_orca_orca.in +++ b/accessibility/orca/files/patch-src_orca_orca.in @@ -1,5 +1,5 @@ ---- src/orca/orca.in.orig 2008-05-26 16:22:08.000000000 -0500 -+++ src/orca/orca.in 2008-05-26 16:25:53.000000000 -0500 +--- src/orca/orca.in.orig 2008-10-16 14:56:18.000000000 -0500 ++++ src/orca/orca.in 2008-10-16 15:04:04.000000000 -0500 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -13,44 +13,32 @@ -export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin" +export PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin" - # If you set RUNONCE to "true", then this will just run Orca once and quit. + # Save the arguments away. # -@@ -74,7 +74,7 @@ +@@ -83,7 +83,7 @@ cleanup() { USERID=`id | cut -f2 -d= | cut -f1 -d\(` -- PIDS=`ps -eo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'` -+ PIDS=`ps -exo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'` - +- PIDS=`ps -eo pid,ruid,args | grep $USERID | \ ++ PIDS=`ps -exo pid,ruid,args | grep $USERID | \ + egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | \ + grep -v grep | awk '{ print $1 }'` IFS=' - ' -@@ -145,7 +145,7 @@ - do - sleep 5 - USERID=`id | cut -f2 -d= | cut -f1 -d\(` -- PID=`ps -eo pid,ruid,args | grep $USERID | egrep "orca[.]orca" | grep -v grep | awk '{ print $1 }'` -+ PID=`ps -exo pid,ruid,args | grep $USERID | egrep "orca[.]orca" | grep -v grep | awk '{ print $1 }'` +@@ -137,7 +137,7 @@ + fi + fi - if [ "x$PID" = "x" ] - then -@@ -258,7 +258,7 @@ - then - main - else -- if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] -+ if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] - then - cleanup +-if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then ++if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] ; then + # If the user has done -q or --quit, that means to tell any + # existing orca process to quit. So, we just do a cleanup. + # +@@ -154,7 +154,7 @@ + if [ "x$ARGS" = "x" ] ; then + CLEANUP=1 else -@@ -270,9 +270,9 @@ - # erroneously types an illegal command line argument, the - # help text is emitted and the other orca is not killed. - # -- if [ `egrep -c "\-s|\-g|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ] -+ if [ `echo $ARGS | egrep -c "\-s|\-g|\-n|\-u|\-e|\-d"` -eq 0 ] - then -- if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ] -+ if [ `echo $ARGS | egrep -c "\-t"` -eq 0 ] - then - runOrca "NO_CLEANUP" - else +- CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` ++ CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"` + fi + + # Clean up before running orca to get anything that might |