diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-22 04:40:31 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-22 04:40:31 +0800 |
| commit | 1526d4d87ab98d77846119e82f73acc3b4ad729d (patch) | |
| tree | 19d96976d8b5603de651e94b2c987b003a2b8bbd /accessibility/orca | |
| parent | 12865c6b294f9ac5d666607b8dcc9ace6d010b78 (diff) | |
| download | marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.gz marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.bz2 marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.lz marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.xz marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.zst marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.zip | |
Sync w/ FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11363 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'accessibility/orca')
| -rw-r--r-- | accessibility/orca/Makefile | 6 | ||||
| -rw-r--r-- | accessibility/orca/files/patch-src_orca_orca.in | 40 |
2 files changed, 38 insertions, 8 deletions
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index f2057b665..8a4c44092 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/orca/Makefile,v 1.51 2008/08/05 19:00:01 marcus Exp $ +# $MCom: ports/accessibility/orca/Makefile,v 1.52 2008/08/19 02:12:19 kwm Exp $ # PORTNAME= orca PORTVERSION= 2.23.90 +PORTREVISION= 1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,8 +18,7 @@ COMMENT= Scriptable screen reader BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ - ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus LATEST_LINK= gnome-orca diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in index 1aa834d5d..ec31af2bc 100644 --- a/accessibility/orca/files/patch-src_orca_orca.in +++ b/accessibility/orca/files/patch-src_orca_orca.in @@ -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-26 16:22:08.000000000 -0500 ++++ src/orca/orca.in 2008-05-26 16:25:53.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,24 @@ 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,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 |