From 0ebc1fcf3859866df4b1722d6d8b3ed64010c998 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 16 Oct 2008 20:12:17 +0000 Subject: Update to 2.24.1. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11679 df743ca5-7f9a-e211-a948-0013205c9059 --- accessibility/orca/Makefile | 4 +- accessibility/orca/distinfo | 6 +-- accessibility/orca/files/patch-src_orca_orca.in | 60 ++++++++++--------------- accessibility/orca/pkg-plist | 18 ++++---- 4 files changed, 38 insertions(+), 50 deletions(-) (limited to 'accessibility') diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index 8e32a19d1..f542f39a6 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/accessibility/orca/Makefile,v 1.55 2008/09/08 21:47:25 kwm Exp $ +# $MCom: ports/accessibility/orca/Makefile,v 1.56 2008/09/23 05:16:40 marcus Exp $ # PORTNAME= orca -PORTVERSION= 2.24.0 +PORTVERSION= 2.24.1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo index 689656461..486e2422e 100644 --- a/accessibility/orca/distinfo +++ b/accessibility/orca/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/orca-2.24.0.tar.bz2) = ff13ffcfb2c829969f2e927e540eac46 -SHA256 (gnome2/orca-2.24.0.tar.bz2) = 3269e42af1b5807da406b180a63685f9629650d2f460761292a4e4790be2edbb -SIZE (gnome2/orca-2.24.0.tar.bz2) = 2143141 +MD5 (gnome2/orca-2.24.1.tar.bz2) = bbd3a5f9a5641075c11b60966ba4b1f4 +SHA256 (gnome2/orca-2.24.1.tar.bz2) = 094ec6a79139cc36388f27f1eb6e0e36a503a8dd314132d53a9d5ff70a96de09 +SIZE (gnome2/orca-2.24.1.tar.bz2) = 2102940 diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in index ec31af2bc..484b6de03 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 diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist index 570a86965..3483c5493 100644 --- a/accessibility/orca/pkg-plist +++ b/accessibility/orca/pkg-plist @@ -241,12 +241,12 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.py -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyo @@ -283,12 +283,12 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.py -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyo @@ -313,12 +313,12 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.py %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.py -%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.py %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyo -- cgit v1.2.3