The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

22 files changed, 314 insertions, 51 deletions

diff --git a/accessibility/Makefile b/accessibility/Makefile
index a818b5e84b26..e6d190cc51f8 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -20,6 +20,7 @@
     SUBDIR += java-access-bridge
     SUBDIR += kdeaccessibility
     SUBDIR += linux-atk
+    SUBDIR += mousetweaks
     SUBDIR += orca
     SUBDIR += py-papi
     SUBDIR += qt4-accessible
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index abdccc38f52d..2a2eb2eefc22 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/accerciser/Makefile,v 1.4 2007/10/13 21:08:59 marcus Exp $
+#   $MCom: ports/accessibility/accerciser/Makefile,v 1.13 2008/03/10 21:21:07 mezz Exp $
 #
 
 PORTNAME=	accerciser
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,15 +16,17 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Interactive Python accessibility explorer for GNOME
 
 USE_BZIP2=	yes
-USE_GNOME=	atspi pygnomedesktop
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	pygnomedesktop atspi intlhack
 USE_PYTHON=	yes
-MAN1=		accerciser.1
-INSTALLS_OMF=	yes
 USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
 GCONF_SCHEMAS=	accerciser.schemas
+MAN1=		accerciser.1
 
 .include <bsd.port.mk>
diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo
index 681dc74bfba4..ea9a3a35e230 100644
--- a/accessibility/accerciser/distinfo
+++ b/accessibility/accerciser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/accerciser-1.0.1.tar.bz2) = 0bfcef80d75ab5772fca31e5021721c4
-SHA256 (gnome2/accerciser-1.0.1.tar.bz2) = f444711071b15075ddb2c7871b58db3df6c49db62650ee33441d97715e0fdbc9
-SIZE (gnome2/accerciser-1.0.1.tar.bz2) = 858043
+MD5 (gnome2/accerciser-1.2.0.tar.bz2) = e4dd607aea8c305ee930c5b09e44681b
+SHA256 (gnome2/accerciser-1.2.0.tar.bz2) = d3ddfb1429a2a14905dfb76620d273dde760d57cce0bcf19d859351501f94103
+SIZE (gnome2/accerciser-1.2.0.tar.bz2) = 1308737
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index 8f8a5cdba474..1c004d3c09f4 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -47,7 +47,6 @@ bin/accerciser
 %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.py
 %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.pyc
 %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/pyatspi.zip
 %%PYTHON_SITELIBDIR%%/accerciser/script_playback.py
 %%PYTHON_SITELIBDIR%%/accerciser/script_playback.pyc
 %%PYTHON_SITELIBDIR%%/accerciser/script_playback.pyo
@@ -137,6 +136,7 @@ bin/accerciser
 %%DATADIR%%/pixmaps/hicolor/22x22/tree.png
 %%DATADIR%%/pixmaps/hicolor/22x22/treetable.png
 %%DATADIR%%/pixmaps/hicolor/22x22/window.png
+%%DATADIR%%/plugindata/validate/basic.py
 %%DATADIR%%/plugins/api_view.py
 %%DATADIR%%/plugins/console.py
 %%DATADIR%%/plugins/event_monitor.glade
@@ -147,6 +147,8 @@ bin/accerciser
 %%DATADIR%%/plugins/quick_select.py
 %%DATADIR%%/plugins/script_recorder.glade
 %%DATADIR%%/plugins/script_recorder.py
+%%DATADIR%%/plugins/validate.glade
+%%DATADIR%%/plugins/validate.py
 share/applications/accerciser.desktop
 share/gnome/help/accerciser/C/accerciser.xml
 share/gnome/help/accerciser/C/figures/accerciser.png
@@ -173,6 +175,18 @@ share/gnome/help/accerciser/es/figures/api_browser.png
 share/gnome/help/accerciser/es/figures/event_monitor.png
 share/gnome/help/accerciser/es/figures/interface_viewer.png
 share/gnome/help/accerciser/es/figures/script_recorder.png
+share/gnome/help/accerciser/fr/accerciser.xml
+share/gnome/help/accerciser/fr/figures/accerciser.png
+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
@@ -195,6 +209,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/cs/LC_MESSAGES/accerciser.mo
 share/locale/da/LC_MESSAGES/accerciser.mo
 share/locale/de/LC_MESSAGES/accerciser.mo
 share/locale/dz/LC_MESSAGES/accerciser.mo
@@ -209,11 +224,14 @@ share/locale/gu/LC_MESSAGES/accerciser.mo
 share/locale/he/LC_MESSAGES/accerciser.mo
 share/locale/hi/LC_MESSAGES/accerciser.mo
 share/locale/hu/LC_MESSAGES/accerciser.mo
+share/locale/it/LC_MESSAGES/accerciser.mo
 share/locale/ja/LC_MESSAGES/accerciser.mo
 share/locale/lt/LC_MESSAGES/accerciser.mo
 share/locale/lv/LC_MESSAGES/accerciser.mo
 share/locale/mk/LC_MESSAGES/accerciser.mo
+share/locale/ml/LC_MESSAGES/accerciser.mo
 share/locale/nb/LC_MESSAGES/accerciser.mo
+share/locale/nl/LC_MESSAGES/accerciser.mo
 share/locale/oc/LC_MESSAGES/accerciser.mo
 share/locale/or/LC_MESSAGES/accerciser.mo
 share/locale/pa/LC_MESSAGES/accerciser.mo
@@ -230,10 +248,13 @@ share/locale/th/LC_MESSAGES/accerciser.mo
 share/locale/tr/LC_MESSAGES/accerciser.mo
 share/locale/uk/LC_MESSAGES/accerciser.mo
 share/locale/vi/LC_MESSAGES/accerciser.mo
+share/locale/zh_CN/LC_MESSAGES/accerciser.mo
 share/omf/accerciser/accerciser-C.omf
 share/omf/accerciser/accerciser-ca.omf
 share/omf/accerciser/accerciser-en_GB.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-sv.omf
 @dirrm share/omf/accerciser
@@ -241,6 +262,10 @@ share/omf/accerciser/accerciser-sv.omf
 @dirrm share/gnome/help/accerciser/sv
 @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
 @dirrm share/gnome/help/accerciser/es
 @dirrm share/gnome/help/accerciser/en_GB/figures
@@ -250,7 +275,10 @@ share/omf/accerciser/accerciser-sv.omf
 @dirrm share/gnome/help/accerciser/C/figures
 @dirrm share/gnome/help/accerciser/C
 @dirrm share/gnome/help/accerciser
+@dirrmtry share/applications
 @dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/plugindata/validate
+@dirrm %%DATADIR%%/plugindata
 @dirrm %%DATADIR%%/pixmaps/hicolor/22x22
 @dirrm %%DATADIR%%/pixmaps/hicolor
 @dirrm %%DATADIR%%/pixmaps
@@ -267,4 +295,3 @@ share/omf/accerciser/accerciser-sv.omf
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index c679cda4a1d7..279c7d1a0fb3 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi/Makefile,v 1.65 2007/10/15 17:22:02 mezz Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.71 2008/03/10 13:55:24 ahze Exp $
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.20.1
+PORTVERSION=	1.22.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index 373f19b3d3ff..bb23c476d486 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.20.1.tar.bz2) = 9dc4ce96c17452cd285d006d03574e93
-SHA256 (gnome2/at-spi-1.20.1.tar.bz2) = d592833339a347d6e4b33946b717b7bbe61f7730d714112cd99715c5a3a3714e
-SIZE (gnome2/at-spi-1.20.1.tar.bz2) = 842254
+MD5 (gnome2/at-spi-1.22.0.tar.bz2) = 85dc343588016ecf854830fab0cd6fdc
+SHA256 (gnome2/at-spi-1.22.0.tar.bz2) = 1e692d44fea3432872af63e757fc0502e5da585b4f77c818982d9ebc3871032e
+SIZE (gnome2/at-spi-1.22.0.tar.bz2) = 853631
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index e128f52c1c3c..6671bb54b8df 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.85 2007/09/17 12:52:17 ahze Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.90 2008/03/10 13:51:38 ahze Exp $
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.20.0
+PORTVERSION=	1.22.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 4008bfaea678..9f2a06386096 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.20.0.tar.bz2) = b1a9e28d9f54ea306bd85a4c84b25fb8
-SHA256 (gnome2/atk-1.20.0.tar.bz2) = 1f3b2f2cbb5b0d8da0924970c66c3ecbfe13c4e4360b0af1db7545401a3747c9
-SIZE (gnome2/atk-1.20.0.tar.bz2) = 705435
+MD5 (gnome2/atk-1.22.0.tar.bz2) = 06a2b39a22d5ca35c47435da6b9643ac
+SHA256 (gnome2/atk-1.22.0.tar.bz2) = 677d66e9a0fc919042c28d40bf9356f45953d218fe613a84137e9f3d8c225de9
+SIZE (gnome2/atk-1.22.0.tar.bz2) = 709221
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 23f7fdc45427..f4fbfad58320 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,11 +3,11 @@
 # Whom:					lewiz <purple@lewiz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/dasher/Makefile,v 1.59 2007/10/15 22:05:41 mezz Exp $
+#   $MCom: ports/accessibility/dasher/Makefile,v 1.61 2007/11/15 20:54:19 marcus Exp $
 #
 
 PORTNAME=	dasher
-PORTVERSION=	4.6.1
+PORTVERSION=	4.7.0
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 98ee68b55eb7..f79d6b533199 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.6.1.tar.bz2) = 1457df5075477d757f7df5693947464d
-SHA256 (gnome2/dasher-4.6.1.tar.bz2) = 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
-SIZE (gnome2/dasher-4.6.1.tar.bz2) = 6473483
+MD5 (gnome2/dasher-4.7.0.tar.bz2) = 83fe6b7d3327baadcf350da19bfe7ce4
+SHA256 (gnome2/dasher-4.7.0.tar.bz2) = 3c4a8fb69f5710be1ad52c2260d5af49857ca10c4dd66322c70c79c3b701a745
+SIZE (gnome2/dasher-4.7.0.tar.bz2) = 6483077
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 6e65094162d8..90b0fa82ce6b 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -152,6 +152,7 @@ share/applications/dasher.desktop
 %%DATADIR%%/dasher.compose.glade
 %%DATADIR%%/dasher.direct.glade
 %%DATADIR%%/dasher.fullscreen.glade
+%%DATADIR%%/dasher.gameWIP.glade
 %%DATADIR%%/dasher.traditional.glade
 %%DATADIR%%/dashermaemo.glade
 %%DATADIR%%/dashermaemofullscreen.glade
@@ -231,6 +232,22 @@ share/gnome/help/dasher/fr/figures/prefs2.png
 share/gnome/help/dasher/fr/figures/prefs3.png
 share/gnome/help/dasher/fr/figures/prefs4.png
 share/gnome/help/dasher/fr/figures/prefs5.png
+share/gnome/help/dasher/oc/dasher.xml
+share/gnome/help/dasher/oc/figures/a-z.gif
+share/gnome/help/dasher/oc/figures/aa-az.gif
+share/gnome/help/dasher/oc/figures/ala-alz.gif
+share/gnome/help/dasher/oc/figures/exampleHad2.png
+share/gnome/help/dasher/oc/figures/exampleHad2a.png
+share/gnome/help/dasher/oc/figures/exampleHad3a.png
+share/gnome/help/dasher/oc/figures/exampleHad4.png
+share/gnome/help/dasher/oc/figures/figure2.png
+share/gnome/help/dasher/oc/figures/main.png
+share/gnome/help/dasher/oc/figures/object.gif
+share/gnome/help/dasher/oc/figures/prefs1.png
+share/gnome/help/dasher/oc/figures/prefs2.png
+share/gnome/help/dasher/oc/figures/prefs3.png
+share/gnome/help/dasher/oc/figures/prefs4.png
+share/gnome/help/dasher/oc/figures/prefs5.png
 share/gnome/help/dasher/ru/dasher.xml
 share/gnome/help/dasher/ru/figures/a-z.gif
 share/gnome/help/dasher/ru/figures/aa-az.gif
@@ -344,6 +361,7 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 share/omf/dasher/dasher-C.omf
 share/omf/dasher/dasher-es.omf
 share/omf/dasher/dasher-fr.omf
+share/omf/dasher/dasher-oc.omf
 share/omf/dasher/dasher-ru.omf
 share/omf/dasher/dasher-sv.omf
 @dirrm share/omf/dasher
@@ -351,6 +369,8 @@ share/omf/dasher/dasher-sv.omf
 @dirrm share/gnome/help/dasher/sv
 @dirrm share/gnome/help/dasher/ru/figures
 @dirrm share/gnome/help/dasher/ru
+@dirrm share/gnome/help/dasher/oc/figures
+@dirrm share/gnome/help/dasher/oc
 @dirrm share/gnome/help/dasher/fr/figures
 @dirrm share/gnome/help/dasher/fr
 @dirrm share/gnome/help/dasher/es/figures
@@ -359,6 +379,7 @@ share/omf/dasher/dasher-sv.omf
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@@ -385,4 +406,3 @@ share/omf/dasher/dasher-sv.omf
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index c5223c7f3f41..479d2a047cd9 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/accessibility/gail/Makefile,v 1.1 2007/11/30 19:23:48 marcus Exp $
+#   $MCom: ports/accessibility/gail/Makefile,v 1.72 2008/03/10 13:58:50 ahze Exp $
 #
 
 PORTNAME=	gail
-PORTVERSION=	1.20.2
+PORTVERSION=	1.22.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 7795186fc58a..6dfc4e1bd035 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gail-1.20.2.tar.bz2) = e805806f897cf6040e1f3e9c0cd2151b
-SHA256 (gnome2/gail-1.20.2.tar.bz2) = 5025b13a4f3b960c8ab7c3e5c7d6d86082e2e1af6ee18e61e37fd4ce3dcc0153
-SIZE (gnome2/gail-1.20.2.tar.bz2) = 659556
+MD5 (gnome2/gail-1.22.0.tar.bz2) = ff500cc53d088bb7f13d35a4fcf81e80
+SHA256 (gnome2/gail-1.22.0.tar.bz2) = ecde5368eb46c26365ec264541cd93e2afa481338e56363fbdb8895998df9f05
+SIZE (gnome2/gail-1.22.0.tar.bz2) = 674630
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 6ae9531d56a8..4e53050d11e6 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -46,6 +46,7 @@ share/locale/is/LC_MESSAGES/gail.mo
 share/locale/it/LC_MESSAGES/gail.mo
 share/locale/ja/LC_MESSAGES/gail.mo
 share/locale/ka/LC_MESSAGES/gail.mo
+share/locale/kn/LC_MESSAGES/gail.mo
 share/locale/ko/LC_MESSAGES/gail.mo
 share/locale/ku/LC_MESSAGES/gail.mo
 share/locale/lt/LC_MESSAGES/gail.mo
@@ -55,6 +56,7 @@ share/locale/mi/LC_MESSAGES/gail.mo
 share/locale/mk/LC_MESSAGES/gail.mo
 share/locale/ml/LC_MESSAGES/gail.mo
 share/locale/mn/LC_MESSAGES/gail.mo
+share/locale/mr/LC_MESSAGES/gail.mo
 share/locale/ms/LC_MESSAGES/gail.mo
 share/locale/nb/LC_MESSAGES/gail.mo
 share/locale/ne/LC_MESSAGES/gail.mo
@@ -99,6 +101,8 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
new file mode 100644
index 000000000000..4fa6dcad09ae
--- /dev/null
+++ b/accessibility/mousetweaks/Makefile
@@ -0,0 +1,30 @@
+# Ports collection makefile for:	mousetweaks
+# Date created:			2008 01 10
+# Whom:				Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.7 2008/03/10 21:35:20 mezz Exp $
+#
+
+PORTNAME=	mousetweaks
+PORTVERSION=	2.22.0
+CATEGORIES=	accessibility
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Mouse accessibility enhancements for the GNOME desktop
+
+USE_XORG=	xfixes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack atspi
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	mousetweaks.schemas pointer-capture-applet.schemas
+MAN1=		dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1
+
+.include <bsd.port.mk>
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
new file mode 100644
index 000000000000..0eb2185c3c06
--- /dev/null
+++ b/accessibility/mousetweaks/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/mousetweaks-2.22.0.tar.bz2) = a7715512c7ffdec65ead7a251609d0f5
+SHA256 (gnome2/mousetweaks-2.22.0.tar.bz2) = faa084861a246288397c36f00f36d62b80a48ab141317e50102827d6dbe48f37
+SIZE (gnome2/mousetweaks-2.22.0.tar.bz2) = 762940
diff --git a/accessibility/mousetweaks/pkg-descr b/accessibility/mousetweaks/pkg-descr
new file mode 100644
index 000000000000..f5b3b2a9e816
--- /dev/null
+++ b/accessibility/mousetweaks/pkg-descr
@@ -0,0 +1,17 @@
+The Mousetweaks package provides mouse accessibility enhancements for the 
+GNOME desktop. 
+
+These enhancements are:
+	
+1. It offers a way to perform the various clicks without using any 
+hardware button.
+
+2. It allows users to perform a right click by doing a click&hold of the 
+left mousebutton. (For a left-handed mouse user, the termes left and right 
+have to be inverted.) 
+
+3. It provides an applet that the user can install on a panel. This applet 
+creates an area on the panel into which the pointer can be captured until 
+the user releases it with a predefined button and modifier combination.
+
+WWW: https://launchpad.net/mousetweaks/
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
new file mode 100644
index 000000000000..a527cc47fdac
--- /dev/null
+++ b/accessibility/mousetweaks/pkg-plist
@@ -0,0 +1,155 @@
+bin/dwell-click-applet
+bin/mousetweaks
+bin/pointer-capture-applet
+libdata/bonobo/servers/DwellClick_Factory.server
+libdata/bonobo/servers/PointerCapture_Factory.server
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-add-applet-to-panel-window.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-checkbox.png
+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/el/figures/mouse-a11y-add-applet-to-panel-window.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/el/legal.xml
+share/gnome/help/mousetweaks/el/mousetweaks.xml
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-add-applet-to-panel-window.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/es/legal.xml
+share/gnome/help/mousetweaks/es/mousetweaks.xml
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-add-applet-to-panel-window.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/oc/legal.xml
+share/gnome/help/mousetweaks/oc/mousetweaks.xml
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-add-applet-to-panel-window.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/sv/legal.xml
+share/gnome/help/mousetweaks/sv/mousetweaks.xml
+share/locale/ar/LC_MESSAGES/mousetweaks.mo
+share/locale/ca/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
+share/locale/el/LC_MESSAGES/mousetweaks.mo
+share/locale/en_GB/LC_MESSAGES/mousetweaks.mo
+share/locale/es/LC_MESSAGES/mousetweaks.mo
+share/locale/eu/LC_MESSAGES/mousetweaks.mo
+share/locale/fi/LC_MESSAGES/mousetweaks.mo
+share/locale/fr/LC_MESSAGES/mousetweaks.mo
+share/locale/gl/LC_MESSAGES/mousetweaks.mo
+share/locale/hi/LC_MESSAGES/mousetweaks.mo
+share/locale/hu/LC_MESSAGES/mousetweaks.mo
+share/locale/it/LC_MESSAGES/mousetweaks.mo
+share/locale/ja/LC_MESSAGES/mousetweaks.mo
+share/locale/ko/LC_MESSAGES/mousetweaks.mo
+share/locale/lt/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
+share/locale/nb/LC_MESSAGES/mousetweaks.mo
+share/locale/nl/LC_MESSAGES/mousetweaks.mo
+share/locale/oc/LC_MESSAGES/mousetweaks.mo
+share/locale/pa/LC_MESSAGES/mousetweaks.mo
+share/locale/pl/LC_MESSAGES/mousetweaks.mo
+share/locale/pt/LC_MESSAGES/mousetweaks.mo
+share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo
+share/locale/ru/LC_MESSAGES/mousetweaks.mo
+share/locale/sl/LC_MESSAGES/mousetweaks.mo
+share/locale/sv/LC_MESSAGES/mousetweaks.mo
+share/locale/ta/LC_MESSAGES/mousetweaks.mo
+share/locale/th/LC_MESSAGES/mousetweaks.mo
+share/locale/tr/LC_MESSAGES/mousetweaks.mo
+share/locale/uk/LC_MESSAGES/mousetweaks.mo
+share/locale/zh_CN/LC_MESSAGES/mousetweaks.mo
+share/locale/zh_HK/LC_MESSAGES/mousetweaks.mo
+share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
+%%DATADIR%%/DwellClick.xml
+%%DATADIR%%/PointerCapture.xml
+%%DATADIR%%/ctw.glade
+%%DATADIR%%/dwell-click-applet.glade
+%%DATADIR%%/human-double.png
+%%DATADIR%%/human-drag.png
+%%DATADIR%%/human-right.png
+%%DATADIR%%/human-single.png
+%%DATADIR%%/pointer-capture-applet.glade
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/mousetweaks/sv/figures
+@dirrm share/gnome/help/mousetweaks/sv
+@dirrm share/gnome/help/mousetweaks/oc/figures
+@dirrm share/gnome/help/mousetweaks/oc
+@dirrm share/gnome/help/mousetweaks/es/figures
+@dirrm share/gnome/help/mousetweaks/es
+@dirrm share/gnome/help/mousetweaks/el/figures
+@dirrm share/gnome/help/mousetweaks/el
+@dirrm share/gnome/help/mousetweaks/C/figures
+@dirrm share/gnome/help/mousetweaks/C
+@dirrm share/gnome/help/mousetweaks
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index ea947d98dcf1..9ba6466e9ace 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/accessibility/orca/Makefile,v 1.1 2007/12/01 05:37:44 marcus Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.42 2008/03/10 00:56:17 mezz Exp $
 #
 
 PORTNAME=	orca
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
 CATEGORIES=	accessibility gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +22,6 @@ LATEST_LINK=	gnome-orca
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 7484247d1ef2..6be199df6ad5 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.20.3.tar.bz2) = a270df4640493e0a96dc6d363ae800a6
-SHA256 (gnome2/orca-2.20.3.tar.bz2) = 17dd0c42552a1d12005faa7b1366b15a60c8d33563a370d8668c43317bd6667c
-SIZE (gnome2/orca-2.20.3.tar.bz2) = 1437345
+MD5 (gnome2/orca-2.22.0.tar.bz2) = a49e1c39261c916e8d9c7bc26740d085
+SHA256 (gnome2/orca-2.22.0.tar.bz2) = 72083afe8db20abd390e6ddbd34ec41e126ed7fd97c97963b1d4b1980fa70d37
+SIZE (gnome2/orca-2.22.0.tar.bz2) = 1730351
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index 80da5c7cb189..1aa834d5d041 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	Sun Mar 25 00:58:52 2007
-+++ src/orca/orca.in	Sun Mar 25 01:02:09 2007
+--- 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
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/usr/local/bin/bash
@@ -10,12 +10,12 @@
  
  # Set the user's $PATH for this script.
  #
--export PATH="/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
-+export 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/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"
  
  # If you set RUNONCE to "true", then this will just run Orca once and quit.
  #
-@@ -125,7 +125,7 @@ watchdog()
+@@ -145,7 +145,7 @@ watchdog()
          do
              sleep 5
              USERID=`id | cut -f2 -d= | cut -f1 -d\(`
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 56202a965b54..e1e62a87eaa3 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -14,9 +14,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.py
 %%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyc
 %%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyo
-%%PYTHON_SITELIBDIR%%/orca/atspi.py
-%%PYTHON_SITELIBDIR%%/orca/atspi.pyc
-%%PYTHON_SITELIBDIR%%/orca/atspi.pyo
+%%PYTHON_SITELIBDIR%%/orca/app_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/app_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/app_prefs.pyo
 %%PYTHON_SITELIBDIR%%/orca/bookmarks.py
 %%PYTHON_SITELIBDIR%%/orca/bookmarks.pyc
 %%PYTHON_SITELIBDIR%%/orca/bookmarks.pyo
@@ -73,6 +73,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/keynames.py
 %%PYTHON_SITELIBDIR%%/orca/keynames.pyc
 %%PYTHON_SITELIBDIR%%/orca/keynames.pyo
+%%PYTHON_SITELIBDIR%%/orca/liveregions.py
+%%PYTHON_SITELIBDIR%%/orca/liveregions.pyc
+%%PYTHON_SITELIBDIR%%/orca/liveregions.pyo
 %%PYTHON_SITELIBDIR%%/orca/mag.py
 %%PYTHON_SITELIBDIR%%/orca/mag.pyc
 %%PYTHON_SITELIBDIR%%/orca/mag.pyo
@@ -199,6 +202,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
@@ -251,6 +257,7 @@ share/locale/hi/LC_MESSAGES/orca.mo
 share/locale/hu/LC_MESSAGES/orca.mo
 share/locale/it/LC_MESSAGES/orca.mo
 share/locale/ja/LC_MESSAGES/orca.mo
+share/locale/kn/LC_MESSAGES/orca.mo
 share/locale/ko/LC_MESSAGES/orca.mo
 share/locale/lt/LC_MESSAGES/orca.mo
 share/locale/lv/LC_MESSAGES/orca.mo
@@ -288,6 +295,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
 %%DATADIR%%/glade/orca-setup.glade
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/orca
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -304,4 +312,3 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications