update to 2.20.1

This switches to the new gnome-2.20 branch.

4 files changed, 60 insertions, 35 deletions

diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index 029f1f3de79..b14e8057474 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/11/05 20:02:39 drochner Exp $
 #
 
-DISTNAME=	orca-2.18.1
-PKGREVISION=	1
+DISTNAME=	orca-2.20.1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/orca/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/orca/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -29,4 +28,5 @@ PY_PATCHPLIST=	yes
 .include "../../net/py-ORBit/buildlink3.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/orca/PLIST b/misc/orca/PLIST
index 5fa85b58e2a..80eda2062d9 100644
--- a/misc/orca/PLIST
+++ b/misc/orca/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/17 19:03:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/11/05 20:02:39 drochner Exp $
 bin/orca
 ${PYSITELIB}/orca/Gecko.py
 ${PYSITELIB}/orca/Gecko.pyc
@@ -12,9 +12,15 @@ ${PYSITELIB}/orca/__init__.pyo
 ${PYSITELIB}/orca/acss.py
 ${PYSITELIB}/orca/acss.pyc
 ${PYSITELIB}/orca/acss.pyo
+${PYSITELIB}/orca/app_gui_prefs.py
+${PYSITELIB}/orca/app_gui_prefs.pyc
+${PYSITELIB}/orca/app_gui_prefs.pyo
 ${PYSITELIB}/orca/atspi.py
 ${PYSITELIB}/orca/atspi.pyc
 ${PYSITELIB}/orca/atspi.pyo
+${PYSITELIB}/orca/bookmarks.py
+${PYSITELIB}/orca/bookmarks.pyc
+${PYSITELIB}/orca/bookmarks.pyo
 ${PYSITELIB}/orca/braille.py
 ${PYSITELIB}/orca/braille.pyc
 ${PYSITELIB}/orca/braille.pyo
@@ -55,9 +61,6 @@ ${PYSITELIB}/orca/focus_tracking_presenter.pyo
 ${PYSITELIB}/orca/gnomespeechfactory.py
 ${PYSITELIB}/orca/gnomespeechfactory.pyc
 ${PYSITELIB}/orca/gnomespeechfactory.pyo
-${PYSITELIB}/orca/hierarchical_presenter.py
-${PYSITELIB}/orca/hierarchical_presenter.pyc
-${PYSITELIB}/orca/hierarchical_presenter.pyo
 ${PYSITELIB}/orca/httpserver.py
 ${PYSITELIB}/orca/httpserver.pyc
 ${PYSITELIB}/orca/httpserver.pyo
@@ -160,12 +163,18 @@ ${PYSITELIB}/orca/scripts/gedit.pyo
 ${PYSITELIB}/orca/scripts/gnome-keyring-ask.py
 ${PYSITELIB}/orca/scripts/gnome-keyring-ask.pyc
 ${PYSITELIB}/orca/scripts/gnome-keyring-ask.pyo
-${PYSITELIB}/orca/scripts/gnome-power-manager.py
-${PYSITELIB}/orca/scripts/gnome-power-manager.pyc
-${PYSITELIB}/orca/scripts/gnome-power-manager.pyo
+${PYSITELIB}/orca/scripts/gnome-mud.py
+${PYSITELIB}/orca/scripts/gnome-mud.pyc
+${PYSITELIB}/orca/scripts/gnome-mud.pyo
+${PYSITELIB}/orca/scripts/gnome-panel.py
+${PYSITELIB}/orca/scripts/gnome-panel.pyc
+${PYSITELIB}/orca/scripts/gnome-panel.pyo
 ${PYSITELIB}/orca/scripts/gnome-search-tool.py
 ${PYSITELIB}/orca/scripts/gnome-search-tool.pyc
 ${PYSITELIB}/orca/scripts/gnome-search-tool.pyo
+${PYSITELIB}/orca/scripts/gnome-system-monitor.py
+${PYSITELIB}/orca/scripts/gnome-system-monitor.pyc
+${PYSITELIB}/orca/scripts/gnome-system-monitor.pyo
 ${PYSITELIB}/orca/scripts/gnome-terminal.py
 ${PYSITELIB}/orca/scripts/gnome-terminal.pyc
 ${PYSITELIB}/orca/scripts/gnome-terminal.pyo
@@ -181,36 +190,44 @@ ${PYSITELIB}/orca/scripts/liferea.pyo
 ${PYSITELIB}/orca/scripts/metacity.py
 ${PYSITELIB}/orca/scripts/metacity.pyc
 ${PYSITELIB}/orca/scripts/metacity.pyo
+${PYSITELIB}/orca/scripts/nautilus.py
+${PYSITELIB}/orca/scripts/nautilus.pyc
+${PYSITELIB}/orca/scripts/nautilus.pyo
+${PYSITELIB}/orca/scripts/notification-daemon.py
+${PYSITELIB}/orca/scripts/notification-daemon.pyc
+${PYSITELIB}/orca/scripts/notification-daemon.pyo
 ${PYSITELIB}/orca/scripts/planner.py
 ${PYSITELIB}/orca/scripts/planner.pyc
 ${PYSITELIB}/orca/scripts/planner.pyo
 ${PYSITELIB}/orca/scripts/self_voicing.py
 ${PYSITELIB}/orca/scripts/self_voicing.pyc
 ${PYSITELIB}/orca/scripts/self_voicing.pyo
-${PYSITELIB}/orca/scripts/users-admin.py
-${PYSITELIB}/orca/scripts/users-admin.pyc
-${PYSITELIB}/orca/scripts/users-admin.pyo
 ${PYSITELIB}/orca/settings.py
 ${PYSITELIB}/orca/settings.pyc
 ${PYSITELIB}/orca/settings.pyo
 ${PYSITELIB}/orca/speech.py
 ${PYSITELIB}/orca/speech.pyc
 ${PYSITELIB}/orca/speech.pyo
+${PYSITELIB}/orca/speechdispatcherfactory.py
+${PYSITELIB}/orca/speechdispatcherfactory.pyc
+${PYSITELIB}/orca/speechdispatcherfactory.pyo
 ${PYSITELIB}/orca/speechgenerator.py
 ${PYSITELIB}/orca/speechgenerator.pyc
 ${PYSITELIB}/orca/speechgenerator.pyo
 ${PYSITELIB}/orca/speechserver.py
 ${PYSITELIB}/orca/speechserver.pyc
 ${PYSITELIB}/orca/speechserver.pyo
-${PYSITELIB}/orca/util.py
-${PYSITELIB}/orca/util.pyc
-${PYSITELIB}/orca/util.pyo
 ${PYSITELIB}/orca/where_am_I.py
 ${PYSITELIB}/orca/where_am_I.pyc
 ${PYSITELIB}/orca/where_am_I.pyo
 man/man1/orca.1
 share/applications/orca.desktop
+share/icons/hicolor/16x16/apps/orca.png
+share/icons/hicolor/22x22/apps/orca.png
+share/icons/hicolor/24x24/apps/orca.png
+share/icons/hicolor/32x32/apps/orca.png
 share/icons/hicolor/48x48/apps/orca.png
+share/icons/hicolor/scalable/apps/orca.svg
 share/locale/ar/LC_MESSAGES/orca.mo
 share/locale/bg/LC_MESSAGES/orca.mo
 share/locale/bn/LC_MESSAGES/orca.mo
@@ -244,6 +261,7 @@ share/locale/mr/LC_MESSAGES/orca.mo
 share/locale/nb/LC_MESSAGES/orca.mo
 share/locale/ne/LC_MESSAGES/orca.mo
 share/locale/nl/LC_MESSAGES/orca.mo
+share/locale/oc/LC_MESSAGES/orca.mo
 share/locale/or/LC_MESSAGES/orca.mo
 share/locale/pa/LC_MESSAGES/orca.mo
 share/locale/pl/LC_MESSAGES/orca.mo
@@ -251,7 +269,9 @@ share/locale/pt/LC_MESSAGES/orca.mo
 share/locale/pt_BR/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
 share/locale/sl/LC_MESSAGES/orca.mo
+share/locale/sq/LC_MESSAGES/orca.mo
 share/locale/sr/LC_MESSAGES/orca.mo
 share/locale/sr@Latn/LC_MESSAGES/orca.mo
 share/locale/sv/LC_MESSAGES/orca.mo
@@ -269,7 +289,12 @@ share/orca/glade/orca-quit.glade
 share/orca/glade/orca-setup.glade
 @dirrm share/orca/glade
 @dirrm share/orca
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm ${PYSITELIB}/orca/scripts
diff --git a/misc/orca/distinfo b/misc/orca/distinfo
index acea730b0d6..cf11adbbd69 100644
--- a/misc/orca/distinfo
+++ b/misc/orca/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/07/17 19:03:16 drochner Exp $
+$NetBSD: distinfo,v 1.2 2007/11/05 20:02:39 drochner Exp $
 
-SHA1 (orca-2.18.1.tar.bz2) = c49aa21a15f40198b91edec3582cc8f690928134
-RMD160 (orca-2.18.1.tar.bz2) = 0465cce59e21d117edbe4f2dab93a5f965e65bbb
-Size (orca-2.18.1.tar.bz2) = 934098 bytes
+SHA1 (orca-2.20.1.tar.bz2) = f045d6253ebbdeaea3f13b1ca1e20aeb63ec1582
+RMD160 (orca-2.20.1.tar.bz2) = 2f03283b620cfe0e816ba960542ec06c32cb0862
+Size (orca-2.20.1.tar.bz2) = 1412477 bytes
 SHA1 (patch-aa) = 14ff9298e52545297afab921257c5bfa82e7f3f7
-SHA1 (patch-ab) = 54d6ecd3f80333ce84303451ba91824f45f87b4a
+SHA1 (patch-ab) = d5235d783f6fdaa45ffb3882bcac342e10ea1866
diff --git a/misc/orca/patches/patch-ab b/misc/orca/patches/patch-ab
index 5a7b9cd7278..b78893a5d0f 100644
--- a/misc/orca/patches/patch-ab
+++ b/misc/orca/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/07/17 19:03:16 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2007/11/05 20:02:39 drochner Exp $
 
---- src/orca/orca_gui_prefs.py.orig	2007-07-13 21:39:48.000000000 +0200
+--- src/orca/orca_gui_prefs.py.orig	2007-10-13 02:42:18.000000000 +0200
 +++ src/orca/orca_gui_prefs.py
-@@ -1956,14 +1956,15 @@ class orcaSetupGUI(orca_glade.GladeWrapp
+@@ -2952,14 +2952,15 @@ class orcaSetupGUI(orca_glade.GladeWrapp
  
          enable = self.speechSupportCheckbutton.get_active()
          self.prefsDict["enableSpeech"] = enable
@@ -15,14 +15,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/07/17 19:03:16 drochner Exp $
 -            settings.HYPERLINK_VOICE : acss.ACSS(self.hyperlinkVoice)
 -        }
 +	if enable:
-+                self.prefsDict["speechServerFactory"] = \
-+                    self.speechSystemsChoice.__name__
-+                self.prefsDict["speechServerInfo"] = self.speechServersChoice.getInfo()
-+                self.prefsDict["voices"] = {
-+                    settings.DEFAULT_VOICE   : acss.ACSS(self.defaultVoice),
-+                    settings.UPPERCASE_VOICE : acss.ACSS(self.uppercaseVoice),
-+                    settings.HYPERLINK_VOICE : acss.ACSS(self.hyperlinkVoice)
-+                }
++            self.prefsDict["speechServerFactory"] = \
++                self.speechSystemsChoice.__name__
++            self.prefsDict["speechServerInfo"] = self.speechServersChoice.getInfo()
++            self.prefsDict["voices"] = {
++                settings.DEFAULT_VOICE   : acss.ACSS(self.defaultVoice),
++                settings.UPPERCASE_VOICE : acss.ACSS(self.uppercaseVoice),
++                settings.HYPERLINK_VOICE : acss.ACSS(self.hyperlinkVoice)
++            }
+ 
+         settings.setGKSUGrabDisabled(self.disableKeyGrabPref)
  
-         if self.disableKeyGrabPref:
-             keyGrabState = "true"