Update orca to 2.26.0.

    * Many bug fixes and performance improvements across the board (over 160
      bugs)
    * A couple very serious hangs were eliminated.
    * Speech pitch, rate, and volume now change on the fly when adjusting
      them in the preferences UI.
    * Vastly improved support for ARIA in Firefox.
    * Improved performance and reliability for flat review.
    * New feature to speak MultiCaseStrings as individual words.
    * New feature to automatically speak shortcuts (mnemonics).
    * Known Problems:
          o See the open bugs in the Orca bug database. We not only track
            Orca bugs in the Orca bug database, we also track bugs in other
            components that affect Orca's ability to provide good access to
            them.
          o Compiz is still not fully accessibility friendly at this point
            in time. We recommend you stick with Metacity until the Compiz
            kinks are worked out. If you're using Compiz and want to switch
            to Metacity, you can run the following command:
            metacity --replace.

4 files changed, 39 insertions, 8 deletions

diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index 2ac8a1209a7..c9a94baca00 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2009/02/24 12:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/03/16 09:12:25 jmcneill Exp $
 #
 
-DISTNAME=	orca-2.24.4
+DISTNAME=	orca-2.26.0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/orca/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/orca/2.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,6 +21,14 @@ PYTHON_VERSIONS_ACCEPTED= 25 24
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=	yes
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 BUILDLINK_API_DEPENDS.gnome-speech+=	gnome-speech>=0.3.10
 .include "../../audio/gnome-speech/buildlink3.mk"
 #BUILDLINK_API_DEPENDS.at-spi+=	at-spi>=1.7.6
diff --git a/misc/orca/PLIST b/misc/orca/PLIST
index 8a43d3c8c84..a9bcf1d6395 100644
--- a/misc/orca/PLIST
+++ b/misc/orca/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/10/27 00:33:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/03/16 09:12:25 jmcneill Exp $
 bin/orca
 ${PYSITELIB}/orca/__init__.py
 ${PYSITELIB}/orca/__init__.pyc
@@ -238,6 +238,9 @@ ${PYSITELIB}/orca/scripts/apps/nautilus.pyo
 ${PYSITELIB}/orca/scripts/apps/notification-daemon.py
 ${PYSITELIB}/orca/scripts/apps/notification-daemon.pyc
 ${PYSITELIB}/orca/scripts/apps/notification-daemon.pyo
+${PYSITELIB}/orca/scripts/apps/notify-osd.py
+${PYSITELIB}/orca/scripts/apps/notify-osd.pyc
+${PYSITELIB}/orca/scripts/apps/notify-osd.pyo
 ${PYSITELIB}/orca/scripts/apps/pidgin/__init__.py
 ${PYSITELIB}/orca/scripts/apps/pidgin/__init__.pyc
 ${PYSITELIB}/orca/scripts/apps/pidgin/__init__.pyo
@@ -404,6 +407,7 @@ share/locale/fi/LC_MESSAGES/orca.mo
 share/locale/fr/LC_MESSAGES/orca.mo
 share/locale/gl/LC_MESSAGES/orca.mo
 share/locale/gu/LC_MESSAGES/orca.mo
+share/locale/he/LC_MESSAGES/orca.mo
 share/locale/hi/LC_MESSAGES/orca.mo
 share/locale/hu/LC_MESSAGES/orca.mo
 share/locale/it/LC_MESSAGES/orca.mo
@@ -426,6 +430,7 @@ share/locale/pa/LC_MESSAGES/orca.mo
 share/locale/pl/LC_MESSAGES/orca.mo
 share/locale/pt/LC_MESSAGES/orca.mo
 share/locale/pt_BR/LC_MESSAGES/orca.mo
+share/locale/ro/LC_MESSAGES/orca.mo
 share/locale/ru/LC_MESSAGES/orca.mo
 share/locale/rw/LC_MESSAGES/orca.mo
 share/locale/si/LC_MESSAGES/orca.mo
diff --git a/misc/orca/distinfo b/misc/orca/distinfo
index 21ada71dec9..c84029be2be 100644
--- a/misc/orca/distinfo
+++ b/misc/orca/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/02/24 12:13:14 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/03/16 09:12:25 jmcneill Exp $
 
-SHA1 (orca-2.24.4.tar.bz2) = 4f111364339f1618baaa5a9ac4ee8691023eba30
-RMD160 (orca-2.24.4.tar.bz2) = 1dae151be2eb828da66c2068555d4efe3b4eed3a
-Size (orca-2.24.4.tar.bz2) = 2125363 bytes
+SHA1 (orca-2.26.0.tar.bz2) = 8e6ee4e7021f5f68f888fd39aaa84cfdbdda3bd7
+RMD160 (orca-2.26.0.tar.bz2) = 41273cc7ddeb69191746a728a0176364ff41ec7a
+Size (orca-2.26.0.tar.bz2) = 2234371 bytes
 SHA1 (patch-aa) = 26b665c54ccff55b258b27349ea12207b51c898b
diff --git a/misc/orca/files/msgfmtstrip b/misc/orca/files/msgfmtstrip
new file mode 100644
index 00000000000..3b195214387
--- /dev/null
+++ b/misc/orca/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/16 09:12:25 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}