Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

24 files changed, 245 insertions, 129 deletions

diff --git a/accessibility/Makefile b/accessibility/Makefile
index 90c715b4510a..c937b4301792 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -11,6 +11,7 @@
     SUBDIR += atk-reference
     SUBDIR += dasher
     SUBDIR += eflite
+    SUBDIR += gir-repository-atk
     SUBDIR += gnome-mag
     SUBDIR += gnome-speech
     SUBDIR += gnopernicus
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index a1b8a757847d..525e019fb118 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/accessibility/accerciser/Makefile,v 1.1 2009/04/15 09:45:46 kwm Exp $
+#   $MCom: ports/accessibility/accerciser/Makefile,v 1.33 2009/09/22 05:13:26 avl Exp $
 #
 
 PORTNAME=	accerciser
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo
index 121515aa8a2f..edee6d31dd74 100644
--- a/accessibility/accerciser/distinfo
+++ b/accessibility/accerciser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/accerciser-1.6.1.tar.bz2) = 9dd36435858f6eaf63694eb16584e777
-SHA256 (gnome2/accerciser-1.6.1.tar.bz2) = 22c362a04025c876d5b454b7016edc888b737098d93b23e18f9f7cd59ba7ecf0
-SIZE (gnome2/accerciser-1.6.1.tar.bz2) = 1345128
+MD5 (gnome2/accerciser-1.8.0.tar.bz2) = ede1d36e9820fa441bcc24cb634d59cc
+SHA256 (gnome2/accerciser-1.8.0.tar.bz2) = 27fcd0e8c5d40f70e00b38bb8f2223b5fb7ef3708075f96d0d051991c259832a
+SIZE (gnome2/accerciser-1.8.0.tar.bz2) = 1508187
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index 2d604d0600fc..44a4a663520f 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -139,16 +139,16 @@ bin/accerciser
 %%DATADIR%%/plugindata/validate/basic.py
 %%DATADIR%%/plugins/api_view.py
 %%DATADIR%%/plugins/console.py
-%%DATADIR%%/plugins/event_monitor.glade
 %%DATADIR%%/plugins/event_monitor.py
-%%DATADIR%%/plugins/interface_view.glade
+%%DATADIR%%/plugins/event_monitor.ui
 %%DATADIR%%/plugins/interface_view.py
+%%DATADIR%%/plugins/interface_view.ui
 %%DATADIR%%/plugins/ipython_view.py
 %%DATADIR%%/plugins/quick_select.py
-%%DATADIR%%/plugins/script_recorder.glade
 %%DATADIR%%/plugins/script_recorder.py
-%%DATADIR%%/plugins/validate.glade
+%%DATADIR%%/plugins/script_recorder.ui
 %%DATADIR%%/plugins/validate.py
+%%DATADIR%%/plugins/validate.ui
 share/applications/accerciser.desktop
 share/gnome/help/accerciser/C/accerciser.xml
 share/gnome/help/accerciser/C/figures/accerciser.png
@@ -199,6 +199,12 @@ share/gnome/help/accerciser/fr/figures/api_browser.png
 share/gnome/help/accerciser/fr/figures/event_monitor.png
 share/gnome/help/accerciser/fr/figures/interface_viewer.png
 share/gnome/help/accerciser/fr/figures/script_recorder.png
+share/gnome/help/accerciser/it/accerciser.xml
+share/gnome/help/accerciser/it/figures/accerciser.png
+share/gnome/help/accerciser/it/figures/api_browser.png
+share/gnome/help/accerciser/it/figures/event_monitor.png
+share/gnome/help/accerciser/it/figures/interface_viewer.png
+share/gnome/help/accerciser/it/figures/script_recorder.png
 share/gnome/help/accerciser/oc/accerciser.xml
 share/gnome/help/accerciser/oc/figures/accerciser.png
 share/gnome/help/accerciser/oc/figures/api_browser.png
@@ -217,6 +223,12 @@ share/gnome/help/accerciser/sv/figures/api_browser.png
 share/gnome/help/accerciser/sv/figures/event_monitor.png
 share/gnome/help/accerciser/sv/figures/interface_viewer.png
 share/gnome/help/accerciser/sv/figures/script_recorder.png
+share/gnome/help/accerciser/uk/accerciser.xml
+share/gnome/help/accerciser/uk/figures/accerciser.png
+share/gnome/help/accerciser/uk/figures/api_browser.png
+share/gnome/help/accerciser/uk/figures/event_monitor.png
+share/gnome/help/accerciser/uk/figures/interface_viewer.png
+share/gnome/help/accerciser/uk/figures/script_recorder.png
 share/icons/hicolor/16x16/apps/accerciser.png
 share/icons/hicolor/22x22/apps/accerciser.png
 share/icons/hicolor/32x32/apps/accerciser.png
@@ -227,6 +239,7 @@ share/locale/bg/LC_MESSAGES/accerciser.mo
 share/locale/bn/LC_MESSAGES/accerciser.mo
 share/locale/bn_IN/LC_MESSAGES/accerciser.mo
 share/locale/ca/LC_MESSAGES/accerciser.mo
+share/locale/ca@valencia/LC_MESSAGES/accerciser.mo
 share/locale/cs/LC_MESSAGES/accerciser.mo
 share/locale/da/LC_MESSAGES/accerciser.mo
 share/locale/de/LC_MESSAGES/accerciser.mo
@@ -235,6 +248,7 @@ share/locale/el/LC_MESSAGES/accerciser.mo
 share/locale/en_CA/LC_MESSAGES/accerciser.mo
 share/locale/en_GB/LC_MESSAGES/accerciser.mo
 share/locale/es/LC_MESSAGES/accerciser.mo
+share/locale/et/LC_MESSAGES/accerciser.mo
 share/locale/eu/LC_MESSAGES/accerciser.mo
 share/locale/fi/LC_MESSAGES/accerciser.mo
 share/locale/fr/LC_MESSAGES/accerciser.mo
@@ -248,6 +262,7 @@ share/locale/ja/LC_MESSAGES/accerciser.mo
 share/locale/kn/LC_MESSAGES/accerciser.mo
 share/locale/lt/LC_MESSAGES/accerciser.mo
 share/locale/lv/LC_MESSAGES/accerciser.mo
+share/locale/mai/LC_MESSAGES/accerciser.mo
 share/locale/mk/LC_MESSAGES/accerciser.mo
 share/locale/ml/LC_MESSAGES/accerciser.mo
 share/locale/mr/LC_MESSAGES/accerciser.mo
@@ -259,6 +274,7 @@ share/locale/pa/LC_MESSAGES/accerciser.mo
 share/locale/pl/LC_MESSAGES/accerciser.mo
 share/locale/pt/LC_MESSAGES/accerciser.mo
 share/locale/pt_BR/LC_MESSAGES/accerciser.mo
+share/locale/ro/LC_MESSAGES/accerciser.mo
 share/locale/ru/LC_MESSAGES/accerciser.mo
 share/locale/si/LC_MESSAGES/accerciser.mo
 share/locale/sl/LC_MESSAGES/accerciser.mo
@@ -280,16 +296,22 @@ share/omf/accerciser/accerciser-en_GB.omf
 share/omf/accerciser/accerciser-el.omf
 share/omf/accerciser/accerciser-es.omf
 share/omf/accerciser/accerciser-fr.omf
+share/omf/accerciser/accerciser-it.omf
 share/omf/accerciser/accerciser-oc.omf
 share/omf/accerciser/accerciser-pt_BR.omf
 share/omf/accerciser/accerciser-sv.omf
+share/omf/accerciser/accerciser-uk.omf
 @dirrm share/omf/accerciser
+@dirrm share/gnome/help/accerciser/uk/figures
+@dirrm share/gnome/help/accerciser/uk
 @dirrm share/gnome/help/accerciser/sv/figures
 @dirrm share/gnome/help/accerciser/sv
 @dirrm share/gnome/help/accerciser/pt_BR/figures
 @dirrm share/gnome/help/accerciser/pt_BR
 @dirrm share/gnome/help/accerciser/oc/figures
 @dirrm share/gnome/help/accerciser/oc
+@dirrm share/gnome/help/accerciser/it/figures
+@dirrm share/gnome/help/accerciser/it
 @dirrm share/gnome/help/accerciser/fr/figures
 @dirrm share/gnome/help/accerciser/fr
 @dirrm share/gnome/help/accerciser/es/figures
@@ -325,9 +347,13 @@ share/omf/accerciser/accerciser-sv.omf
 @dirrmtry share/locale/si
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 30cf22024a57..ab549e0c2714 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi/Makefile,v 1.85 2009/03/17 13:55:06 kwm Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.89 2009/10/19 07:50:44 avl Exp $
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.26.0
-PORTREVISION?=	1
+PORTVERSION=	1.28.1
+PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index a30a7568e93a..eea948f939b3 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.26.0.tar.bz2) = 3f2f7d29b45eff08adf56af0d31d3984
-SHA256 (gnome2/at-spi-1.26.0.tar.bz2) = bb8c9473a277fa75f172fa16fb6ada85f4a919219818fd9c792f1a137bb2644d
-SIZE (gnome2/at-spi-1.26.0.tar.bz2) = 829621
+MD5 (gnome2/at-spi-1.28.1.tar.bz2) = ff29958339cbff5a0e0f34e4761e7633
+SHA256 (gnome2/at-spi-1.28.1.tar.bz2) = b776a85290dcfd485f0307c8fcc71a74a07874e5edbf7bba31d599e6dab3d2be
+SIZE (gnome2/at-spi-1.28.1.tar.bz2) = 843057
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 82d8b98515ec..fba0e27320c7 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -1,3 +1,4 @@
+etc/xdg/autostart/at-spi-registryd.desktop
 include/at-spi-1.0/cspi/spi-impl.h
 include/at-spi-1.0/cspi/spi-listener.h
 include/at-spi-1.0/cspi/spi-roletypes.h
@@ -112,6 +113,7 @@ share/locale/bn/LC_MESSAGES/at-spi.mo
 share/locale/bn_IN/LC_MESSAGES/at-spi.mo
 share/locale/bs/LC_MESSAGES/at-spi.mo
 share/locale/ca/LC_MESSAGES/at-spi.mo
+share/locale/ca@valencia/LC_MESSAGES/at-spi.mo
 share/locale/crh/LC_MESSAGES/at-spi.mo
 share/locale/cs/LC_MESSAGES/at-spi.mo
 share/locale/cy/LC_MESSAGES/at-spi.mo
@@ -140,17 +142,19 @@ share/locale/is/LC_MESSAGES/at-spi.mo
 share/locale/it/LC_MESSAGES/at-spi.mo
 share/locale/ja/LC_MESSAGES/at-spi.mo
 share/locale/ka/LC_MESSAGES/at-spi.mo
+share/locale/kn/LC_MESSAGES/at-spi.mo
 share/locale/ko/LC_MESSAGES/at-spi.mo
 share/locale/ku/LC_MESSAGES/at-spi.mo
 share/locale/lt/LC_MESSAGES/at-spi.mo
 share/locale/lv/LC_MESSAGES/at-spi.mo
+share/locale/mai/LC_MESSAGES/at-spi.mo
 share/locale/mk/LC_MESSAGES/at-spi.mo
 share/locale/ml/LC_MESSAGES/at-spi.mo
 share/locale/mn/LC_MESSAGES/at-spi.mo
 share/locale/mr/LC_MESSAGES/at-spi.mo
 share/locale/ms/LC_MESSAGES/at-spi.mo
 share/locale/nb/LC_MESSAGES/at-spi.mo
-share/locale/nds_DE/LC_MESSAGES/at-spi.mo
+share/locale/nds/LC_MESSAGES/at-spi.mo
 share/locale/ne/LC_MESSAGES/at-spi.mo
 share/locale/nl/LC_MESSAGES/at-spi.mo
 share/locale/nn/LC_MESSAGES/at-spi.mo
@@ -208,8 +212,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrmtry share/locale/nds_DE/LC_MESSAGES
-@dirrmtry share/locale/nds_DE
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -218,6 +222,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/crh/LC_MESSAGES
 @dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 1ddee5de38bd..a7ffb928f8ab 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.95 2009/03/17 14:03:48 kwm Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.98 2009/09/22 10:49:14 kwm Exp $
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.26.0
+PORTVERSION=	1.28.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 73c5f03a5c57..24d0842d72b9 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.26.0.tar.bz2) = 719229408019c548855673840679f156
-SHA256 (gnome2/atk-1.26.0.tar.bz2) = f7993d26c3606a9b0e32d1eebe716f2294ac37fac014c47744e986fc0ff5e6d1
-SIZE (gnome2/atk-1.26.0.tar.bz2) = 719807
+MD5 (gnome2/atk-1.28.0.tar.bz2) = 010a85478adc053c016a0a5c9bb52004
+SHA256 (gnome2/atk-1.28.0.tar.bz2) = e4da9fe580d2d55f4e77a138c553b4b32654dfb06bf0715592cc9dbd6355fe87
+SIZE (gnome2/atk-1.28.0.tar.bz2) = 715100
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 28df9d79230e..650d450dd8db 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -43,6 +43,7 @@ share/locale/bn/LC_MESSAGES/atk10.mo
 share/locale/bn_IN/LC_MESSAGES/atk10.mo
 share/locale/bs/LC_MESSAGES/atk10.mo
 share/locale/ca/LC_MESSAGES/atk10.mo
+share/locale/ca@valencia/LC_MESSAGES/atk10.mo
 share/locale/cs/LC_MESSAGES/atk10.mo
 share/locale/cy/LC_MESSAGES/atk10.mo
 share/locale/da/LC_MESSAGES/atk10.mo
@@ -153,6 +154,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/accessibility/gir-repository-atk/Makefile b/accessibility/gir-repository-atk/Makefile
new file mode 100644
index 000000000000..b9bc8ffccba4
--- /dev/null
+++ b/accessibility/gir-repository-atk/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	gir-repository-atk
+# Date created:				07 September 2009
+# Whom:					Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/accessibility/gir-repository-atk/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $
+#
+
+CATEGORIES=	accessibility
+
+MASTERDIR=	${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX=	-atk
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 98345e7a5714..f50f084f07bb 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.44 2008/09/23 20:13:54 mezz Exp $
+#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.47 2009/09/26 12:48:44 marcus Exp $
 #
 
 PORTNAME=	gnome-mag
-PORTVERSION=	0.15.8
+PORTVERSION=	0.15.9
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index f8373da3e74c..9fa4321bc36f 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.15.8.tar.bz2) = 654232f153051e2052d96007b8bdd273
-SHA256 (gnome2/gnome-mag-0.15.8.tar.bz2) = c9ed20c85f9be37e5b90eb326e7093e46e34962ec67528f93dbd22033bd0dee2
-SIZE (gnome2/gnome-mag-0.15.8.tar.bz2) = 504849
+MD5 (gnome2/gnome-mag-0.15.9.tar.bz2) = db651bbd63f4ae3cfeb344c42f80d206
+SHA256 (gnome2/gnome-mag-0.15.9.tar.bz2) = 6f921419143088587dce201afd972a60317ade269e47b0d67a38872a7615a025
+SIZE (gnome2/gnome-mag-0.15.9.tar.bz2) = 532685
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index ffacd9c6bd12..d641626add8e 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -77,6 +77,7 @@ share/locale/ku/LC_MESSAGES/gnome-mag.mo
 share/locale/ky/LC_MESSAGES/gnome-mag.mo
 share/locale/lt/LC_MESSAGES/gnome-mag.mo
 share/locale/lv/LC_MESSAGES/gnome-mag.mo
+share/locale/mai/LC_MESSAGES/gnome-mag.mo
 share/locale/mg/LC_MESSAGES/gnome-mag.mo
 share/locale/mi/LC_MESSAGES/gnome-mag.mo
 share/locale/mk/LC_MESSAGES/gnome-mag.mo
@@ -147,6 +148,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index f313b9134bee..5a60d280ca85 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Adam Weinberger <adamw@freebsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/accessibility/gok/Makefile,v 1.92 2009/03/17 14:42:44 kwm Exp $
+#    $MCom: ports/accessibility/gok/Makefile,v 1.106 2009/10/19 19:03:32 kwm Exp $
 #
 
 PORTNAME=	gok
-PORTVERSION=	2.26.0
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	GNOME
@@ -17,6 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME On-Screen Keyboard (GOK)
 
+LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@@ -30,8 +31,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	gok.schemas
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
-		${WRKSRC}/gok/word-complete.c
-
 .include <bsd.port.mk>
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 92a89a3787bf..52f56cb2e9ad 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-2.26.0.tar.bz2) = 8cc28ad6010a977c9ccbe8d5b690f636
-SHA256 (gnome2/gok-2.26.0.tar.bz2) = 787b24c7fe81bc22a3f425bc632a6712e27c616e5d4b8a1cfba9d0fbf721674a
-SIZE (gnome2/gok-2.26.0.tar.bz2) = 1341889
+MD5 (gnome2/gok-2.28.1.tar.bz2) = d7305f12c703e13eeaed796f996dbc86
+SHA256 (gnome2/gok-2.28.1.tar.bz2) = 121ab98605b0981c131cdc49bf190ba81e9a9d5c720fa94ed2fb3193f121e904
+SIZE (gnome2/gok-2.28.1.tar.bz2) = 1588038
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index e0f421756741..a80237b5f3f6 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -7,6 +7,7 @@ share/applications/gok.desktop
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/ch03.html
 %%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/gok-GokButton.html
 %%DOCSDIR%%/gok-arraylist.html
 %%DOCSDIR%%/gok-callbacks.html
 %%DOCSDIR%%/gok-command-common.html
@@ -24,6 +25,7 @@ share/applications/gok.desktop
 %%DOCSDIR%%/gok-gok-data.html
 %%DOCSDIR%%/gok-gok-editor.html
 %%DOCSDIR%%/gok-gok-feedback.html
+%%DOCSDIR%%/gok-gok-gconf-keys.html
 %%DOCSDIR%%/gok-gok-gconf.html
 %%DOCSDIR%%/gok-gok-key.html
 %%DOCSDIR%%/gok-gok-keyboard.html
@@ -183,6 +185,16 @@ share/gnome/help/gok/C/legal.xml
 %%DATADIR%%/ca/quit.kbd
 %%DATADIR%%/ca/text-operations.kbd
 %%DATADIR%%/ca/valuator.kbd
+%%DATADIR%%/ca@valencia/gok-controls.kbd
+%%DATADIR%%/ca@valencia/hide.kbd
+%%DATADIR%%/ca@valencia/launcher.kbd
+%%DATADIR%%/ca@valencia/main.kbd
+%%DATADIR%%/ca@valencia/mouse.kbd
+%%DATADIR%%/ca@valencia/move-resize.kbd
+%%DATADIR%%/ca@valencia/numberpad.kbd
+%%DATADIR%%/ca@valencia/quit.kbd
+%%DATADIR%%/ca@valencia/text-operations.kbd
+%%DATADIR%%/ca@valencia/valuator.kbd
 %%DATADIR%%/cs/gok-controls.kbd
 %%DATADIR%%/cs/hide.kbd
 %%DATADIR%%/cs/launcher.kbd
@@ -351,8 +363,6 @@ share/gnome/help/gok/C/legal.xml
 %%DATADIR%%/glade/gok.glade2
 %%DATADIR%%/gok.rc
 %%DATADIR%%/goklogo.png
-%%DATADIR%%/goksound1.wav
-%%DATADIR%%/goksound2.wav
 %%DATADIR%%/gu/gok-controls.kbd
 %%DATADIR%%/gu/hide.kbd
 %%DATADIR%%/gu/launcher.kbd
@@ -868,6 +878,7 @@ share/locale/bg/LC_MESSAGES/gok.mo
 share/locale/bn/LC_MESSAGES/gok.mo
 share/locale/bn_IN/LC_MESSAGES/gok.mo
 share/locale/ca/LC_MESSAGES/gok.mo
+share/locale/ca@valencia/LC_MESSAGES/gok.mo
 share/locale/cs/LC_MESSAGES/gok.mo
 share/locale/cy/LC_MESSAGES/gok.mo
 share/locale/da/LC_MESSAGES/gok.mo
@@ -935,6 +946,10 @@ share/locale/zh_HK/LC_MESSAGES/gok.mo
 share/locale/zh_TW/LC_MESSAGES/gok.mo
 share/omf/gok/gok-C.omf
 share/pixmaps/gok.png
+share/sounds/freedesktop/stereo/goksound1.wav
+share/sounds/freedesktop/stereo/goksound2.wav
+@dirrmtry share/sounds/freedesktop/stereo
+@dirrmtry share/sounds/freedesktop
 @dirrm share/omf/gok
 @dirrm %%DATADIR%%/zh_TW
 @dirrm %%DATADIR%%/zh_HK
@@ -1002,6 +1017,7 @@ share/pixmaps/gok.png
 @dirrm %%DATADIR%%/da
 @dirrm %%DATADIR%%/cy
 @dirrm %%DATADIR%%/cs
+@dirrm %%DATADIR%%/ca@valencia
 @dirrm %%DATADIR%%/ca
 @dirrm %%DATADIR%%/bn_IN
 @dirrm %%DATADIR%%/bn
@@ -1014,9 +1030,9 @@ share/pixmaps/gok.png
 @dirrm %%DATADIR%%/am
 @dirrm %%DATADIR%%/C
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
 @dirrm share/gnome/help/gok/C
 @dirrm share/gnome/help/gok
-@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -1038,6 +1054,8 @@ share/pixmaps/gok.png
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/as/LC_MESSAGES
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index e77e35d45be0..564f1c841d90 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.26 2009/03/17 16:17:01 kwm Exp $
+#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.37 2009/10/19 18:20:53 kwm Exp $
 #
 
 PORTNAME=	mousetweaks
-PORTVERSION=	2.26.3
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 CATEGORIES=	accessibility
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
index 1b013c0b848c..e55e4e0f202c 100644
--- a/accessibility/mousetweaks/distinfo
+++ b/accessibility/mousetweaks/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/mousetweaks-2.26.3.tar.bz2) = e4d5941b555de97c8880ea8b01310776
-SHA256 (gnome2/mousetweaks-2.26.3.tar.bz2) = 16a490d155643fbe71b78e7d9b0044acb080e3bb14a39aa7ad5eb296d24d3277
-SIZE (gnome2/mousetweaks-2.26.3.tar.bz2) = 1172768
+MD5 (gnome2/mousetweaks-2.28.1.tar.bz2) = a6d786f4df2be96202d76c4c0e6ba43c
+SHA256 (gnome2/mousetweaks-2.28.1.tar.bz2) = 8e99c8af3676ae913edd168aaca612401c7cf8dc22f0ba7cc21d5f1ca87c5874
+SIZE (gnome2/mousetweaks-2.28.1.tar.bz2) = 2013922
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
index a99f67432030..36ddc5ae8ed2 100644
--- a/accessibility/mousetweaks/pkg-plist
+++ b/accessibility/mousetweaks/pkg-plist
@@ -19,6 +19,36 @@ share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-delay-slider.png
 share/gnome/help/mousetweaks/C/figures/mouse-a11y-tab.png
 share/gnome/help/mousetweaks/C/legal.xml
 share/gnome/help/mousetweaks/C/mousetweaks.xml
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/ca/mousetweaks.xml
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/cs/mousetweaks.xml
 share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-checkbox.png
 share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-applet.png
 share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-window.png
@@ -142,8 +172,10 @@ share/gnome/help/mousetweaks/sv/mousetweaks.xml
 share/locale/ar/LC_MESSAGES/mousetweaks.mo
 share/locale/as/LC_MESSAGES/mousetweaks.mo
 share/locale/bg/LC_MESSAGES/mousetweaks.mo
+share/locale/bn/LC_MESSAGES/mousetweaks.mo
 share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
 share/locale/ca/LC_MESSAGES/mousetweaks.mo
+share/locale/ca@valencia/LC_MESSAGES/mousetweaks.mo
 share/locale/cs/LC_MESSAGES/mousetweaks.mo
 share/locale/da/LC_MESSAGES/mousetweaks.mo
 share/locale/de/LC_MESSAGES/mousetweaks.mo
@@ -164,6 +196,7 @@ share/locale/ja/LC_MESSAGES/mousetweaks.mo
 share/locale/kn/LC_MESSAGES/mousetweaks.mo
 share/locale/ko/LC_MESSAGES/mousetweaks.mo
 share/locale/lt/LC_MESSAGES/mousetweaks.mo
+share/locale/mai/LC_MESSAGES/mousetweaks.mo
 share/locale/mk/LC_MESSAGES/mousetweaks.mo
 share/locale/ml/LC_MESSAGES/mousetweaks.mo
 share/locale/mr/LC_MESSAGES/mousetweaks.mo
@@ -180,6 +213,8 @@ share/locale/ro/LC_MESSAGES/mousetweaks.mo
 share/locale/ru/LC_MESSAGES/mousetweaks.mo
 share/locale/sl/LC_MESSAGES/mousetweaks.mo
 share/locale/sq/LC_MESSAGES/mousetweaks.mo
+share/locale/sr/LC_MESSAGES/mousetweaks.mo
+share/locale/sr@latin/LC_MESSAGES/mousetweaks.mo
 share/locale/sv/LC_MESSAGES/mousetweaks.mo
 share/locale/ta/LC_MESSAGES/mousetweaks.mo
 share/locale/te/LC_MESSAGES/mousetweaks.mo
@@ -200,6 +235,8 @@ share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
 %%DATADIR%%/right-click.png
 %%DATADIR%%/single-click.png
 share/omf/mousetweaks/mousetweaks-C.omf
+share/omf/mousetweaks/mousetweaks-ca.omf
+share/omf/mousetweaks/mousetweaks-cs.omf
 share/omf/mousetweaks/mousetweaks-de.omf
 share/omf/mousetweaks/mousetweaks-el.omf
 share/omf/mousetweaks/mousetweaks-en_GB.omf
@@ -224,6 +261,10 @@ share/omf/mousetweaks/mousetweaks-sv.omf
 @dirrm share/gnome/help/mousetweaks/en_GB
 @dirrm share/gnome/help/mousetweaks/el/figures
 @dirrm share/gnome/help/mousetweaks/el
+@dirrm share/gnome/help/mousetweaks/cs/figures
+@dirrm share/gnome/help/mousetweaks/cs
+@dirrm share/gnome/help/mousetweaks/ca/figures
+@dirrm share/gnome/help/mousetweaks/ca
 @dirrm share/gnome/help/mousetweaks/de/figures
 @dirrm share/gnome/help/mousetweaks/de
 @dirrm share/gnome/help/mousetweaks/C/figures
@@ -233,12 +274,16 @@ share/omf/mousetweaks/mousetweaks-sv.omf
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/kn/LC_MESSAGES
-@dirrmtry share/locale/kn
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/as/LC_MESSAGES
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 4e43ff008dd6..b7d9457c2223 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/accessibility/orca/Makefile,v 1.3 2009/04/15 09:42:54 kwm Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.73 2009/10/19 20:01:51 kwm Exp $
 #
 
 PORTNAME=	orca
-PORTVERSION=	2.26.3
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index ab063f748d2d..54a70a5566ee 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.26.3.tar.bz2) = 72dbf273bedd214e9023725690fb61b7
-SHA256 (gnome2/orca-2.26.3.tar.bz2) = 27a51f210cc18c9ebe1741bb87c8da5abd9b2fc8664a7accd241ed07f024b7d8
-SIZE (gnome2/orca-2.26.3.tar.bz2) = 2250070
+MD5 (gnome2/orca-2.28.1.tar.bz2) = f1f8682b66fc0c122d344ddd9a4787ad
+SHA256 (gnome2/orca-2.28.1.tar.bz2) = dace4d689b4fbae507d0fa0a9c485cc51e72844048c50ea77bb0c9161b246fcd
+SIZE (gnome2/orca-2.28.1.tar.bz2) = 2176412
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index aa41825f9680..be06e2fd4a31 100644
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@@ -1,21 +1,15 @@
---- src/orca/orca.in.orig	2009-01-23 22:39:27.000000000 +0100
-+++ src/orca/orca.in	2009-02-21 22:50:38.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Orca
- #
+--- src/orca/orca.in.orig	2009-07-17 10:44:34.000000000 +1000
++++ src/orca/orca.in	2009-07-17 10:46:14.000000000 +1000
 @@ -30,7 +30,7 @@
  
  # 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/bin:/usr/sbin:/bin:/usr/local/bin"
+-PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
++PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin"
+ export PATH
  
  # Save the arguments away.
- #
-@@ -83,7 +83,7 @@
+@@ -84,7 +84,7 @@ restoreXmodmap()
  cleanup()
  {
      USERID=`id | cut -f2 -d= | cut -f1 -d\(`
@@ -24,21 +18,3 @@
  	egrep "orca[.]orca|OAFIID[:]GNOME_Speech|OAFIID[:]GNOME_Magnifier|festival [-][-]server"|\
  	grep -v grep | awk '{ print $1 }'`
      IFS='
-@@ -137,7 +137,7 @@
-     fi
- fi
- 
--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
--        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 73fa5f45a32a..d25909de608e 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -17,11 +17,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/braille.py
 %%PYTHON_SITELIBDIR%%/orca/braille.pyc
 %%PYTHON_SITELIBDIR%%/orca/braille.pyo
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.py
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyo
-%%PYTHON_SITELIBDIR%%/orca/brlmodule.la
-%%PYTHON_SITELIBDIR%%/orca/brlmodule.so
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/brlmon.py
 %%PYTHON_SITELIBDIR%%/orca/brlmon.pyc
 %%PYTHON_SITELIBDIR%%/orca/brlmon.pyo
@@ -55,6 +53,12 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.py
 %%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyc
 %%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyo
+%%PYTHON_SITELIBDIR%%/orca/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/formatting.pyo
+%%PYTHON_SITELIBDIR%%/orca/generator.py
+%%PYTHON_SITELIBDIR%%/orca/generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
@@ -85,9 +89,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.py
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyo
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.py
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyc
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.pyo
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_find.py
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyo
@@ -160,21 +164,24 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyo
@@ -184,9 +191,6 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyo
@@ -220,12 +224,12 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyo
@@ -247,6 +251,21 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyo
@@ -259,9 +278,6 @@ bin/orca
 %%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
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyo
@@ -280,6 +296,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyo
@@ -292,6 +311,9 @@ 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/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.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
@@ -301,9 +323,9 @@ bin/orca
 %%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
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyo
@@ -322,6 +344,9 @@ 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/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.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
@@ -334,24 +359,18 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyo
@@ -361,15 +380,18 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/settings.py
 %%PYTHON_SITELIBDIR%%/orca/settings.pyc
 %%PYTHON_SITELIBDIR%%/orca/settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/sound.py
+%%PYTHON_SITELIBDIR%%/orca/sound.pyc
+%%PYTHON_SITELIBDIR%%/orca/sound.pyo
 %%PYTHON_SITELIBDIR%%/orca/speech.py
 %%PYTHON_SITELIBDIR%%/orca/speech.pyc
 %%PYTHON_SITELIBDIR%%/orca/speech.pyo
+%%PYTHON_SITELIBDIR%%/orca/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.py
 %%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyo
-%%PYTHON_SITELIBDIR%%/orca/speechgenerator.py
-%%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechserver.py
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyo
@@ -397,6 +419,7 @@ share/locale/bg/LC_MESSAGES/orca.mo
 share/locale/bn/LC_MESSAGES/orca.mo
 share/locale/bn_IN/LC_MESSAGES/orca.mo
 share/locale/ca/LC_MESSAGES/orca.mo
+share/locale/ca@valencia/LC_MESSAGES/orca.mo
 share/locale/cs/LC_MESSAGES/orca.mo
 share/locale/cy/LC_MESSAGES/orca.mo
 share/locale/da/LC_MESSAGES/orca.mo
@@ -410,6 +433,7 @@ share/locale/et/LC_MESSAGES/orca.mo
 share/locale/eu/LC_MESSAGES/orca.mo
 share/locale/fi/LC_MESSAGES/orca.mo
 share/locale/fr/LC_MESSAGES/orca.mo
+share/locale/ga/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
@@ -453,11 +477,13 @@ share/locale/vi/LC_MESSAGES/orca.mo
 share/locale/zh_CN/LC_MESSAGES/orca.mo
 share/locale/zh_HK/LC_MESSAGES/orca.mo
 share/locale/zh_TW/LC_MESSAGES/orca.mo
-%%DATADIR%%/glade/orca-find.glade
-%%DATADIR%%/glade/orca-mainwin.glade
-%%DATADIR%%/glade/orca-quit.glade
-%%DATADIR%%/glade/orca-setup.glade
-@dirrm %%DATADIR%%/glade
+%%DATADIR%%/ui/orca-advanced-magnification.ui
+%%DATADIR%%/ui/orca-find.ui
+%%DATADIR%%/ui/orca-mainwin.ui
+%%DATADIR%%/ui/orca-preferences-warning.ui
+%%DATADIR%%/ui/orca-quit.ui
+%%DATADIR%%/ui/orca-setup.ui
+@dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge
@@ -467,6 +493,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool
@@ -493,5 +520,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN