kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

-De-bashism and remove bash dependency. [1]

Browse source 
-Clean up the PATH.
-Fix a missing of 'ps -eo' -> 'ps -exo'.
-Bump the PORTREVISION.

Obtained from:	pkgsrc [1]
This commit is contained in:
Jeremy Messenger 2008-05-05 19:22:06 +00:00
parent ed7aae3ee1
commit ad74f964cb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=212681
2 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
accessibility/orca/Makefile
View file

@ -8,6 +8,7 @@
PORTNAME= orca
PORTVERSION= 2.22.1
PORTREVISION= 1
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@ -16,7 +17,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Scriptable screen reader
LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
LATEST_LINK= gnome-orca

37
accessibility/orca/files/patch-src_orca_orca.in
View file

@ -1,8 +1,8 @@
--- src/orca/orca.in.orig 2007-11-08 11:02:26.000000000 -0500
+++ src/orca/orca.in 2007-11-15 15:43:24.000000000 -0500
--- src/orca/orca.in.orig 2008-05-01 16:52:27.000000000 -0500
+++ src/orca/orca.in 2008-05-01 16:57:15.000000000 -0500
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
+#!/bin/sh
#
# Orca
#
@ -11,11 +11,20 @@
# Set the user's $PATH for this script.
#
-export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
+export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/local/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.
#
@@ -145,7 +145,7 @@ watchdog()
@@ -74,7 +74,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 }'`
IFS='
'
@@ -145,7 +145,7 @@
do
sleep 5
USERID=`id | cut -f2 -d= | cut -f1 -d\(`
@ -24,3 +33,21 @@
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
else
@@ -270,7 +270,7 @@
# erroneously types an illegal command line argument, the
# help text is emitted and the other orca is not killed.
#
- if [ `egrep -c "\-s|\-g|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
+ if [ `echo $ARGS | egrep -c "\-s|\-g|\-t|\-n|\-u|\-e|\-d"` -eq 0 ]
then
runOrca "NO_CLEANUP"
else