Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers.

On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE.  This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed.  The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily.  We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.

Back to GNOME 2.16.  This release brings a huge amount of new functionality
to FreeBSD.  The standard release notes can be read at
http://www.gnome.org/start/2.16/ .  But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD.  This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.

But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:

Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>

Enjoy!

Approved by:	portmgr (implicit, kris)

31 files changed, 760 insertions, 299 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index a8570acc45e..9eee74bad0b 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.43 2006/04/13 07:52:28 bland Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.50 2006/10/02 00:50:26 ahze Exp $
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.7.7
-PORTREVISION?=	1
+PORTVERSION=	1.7.12
+PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,7 +25,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo \
 		intlhack
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index 8faba577880..3eb907c9ae1 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.7.7.tar.bz2) = 2988cd21d9f292fd404a8c532fe2723d
-SHA256 (gnome2/at-spi-1.7.7.tar.bz2) = 8e5a5a9be3e3c26068b98fbcd37e44a6c377b1d8f97735339e8dd1215b506ad6
-SIZE (gnome2/at-spi-1.7.7.tar.bz2) = 696704
+MD5 (gnome2/at-spi-1.7.12.tar.bz2) = ca4e69bb28c409e25bbc10293fa34941
+SHA256 (gnome2/at-spi-1.7.12.tar.bz2) = e4527b98874526b9ff8300f84879a154884ae9d8278d0ab6f926ab03209613e4
+SIZE (gnome2/at-spi-1.7.12.tar.bz2) = 787767
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index b49d6437b46..4e55eb59226 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -10,6 +10,7 @@ include/at-spi-1.0/libspi/application.h
 include/at-spi-1.0/libspi/base.h
 include/at-spi-1.0/libspi/component.h
 include/at-spi-1.0/libspi/devicelistener.h
+include/at-spi-1.0/libspi/document.h
 include/at-spi-1.0/libspi/editabletext.h
 include/at-spi-1.0/libspi/eventlistener.h
 include/at-spi-1.0/libspi/hyperlink.h
@@ -61,6 +62,7 @@ share/gnome/idl/at-spi-1.0/Accessibility_Action.idl
 share/gnome/idl/at-spi-1.0/Accessibility_Application.idl
 share/gnome/idl/at-spi-1.0/Accessibility_Component.idl
 share/gnome/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Document.idl
 share/gnome/idl/at-spi-1.0/Accessibility_EditableText.idl
 share/gnome/idl/at-spi-1.0/Accessibility_Event.idl
 share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl
@@ -119,7 +121,6 @@ share/locale/nb/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
-share/locale/no/LC_MESSAGES/at-spi.mo
 share/locale/or/LC_MESSAGES/at-spi.mo
 share/locale/pa/LC_MESSAGES/at-spi.mo
 share/locale/pl/LC_MESSAGES/at-spi.mo
@@ -144,23 +145,59 @@ share/locale/xh/LC_MESSAGES/at-spi.mo
 share/locale/zh_CN/LC_MESSAGES/at-spi.mo
 share/locale/zh_HK/LC_MESSAGES/at-spi.mo
 share/locale/zh_TW/LC_MESSAGES/at-spi.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
 @dirrm share/gnome/idl/at-spi-1.0
 @dirrm lib/orbit-2.0
 @dirrm include/at-spi-1.0/login-helper
 @dirrm include/at-spi-1.0/libspi
 @dirrm include/at-spi-1.0/cspi
 @dirrm include/at-spi-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 66fe20e6d1a..cf166a8e2d2 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.68 2006/04/13 07:52:28 bland Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.73 2006/10/02 00:43:11 ahze Exp $
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.11.4
-PORTREVISION?=	1
+PORTVERSION=	1.12.3
+PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,14 +22,15 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 8be97790ae6..fc2af3325fd 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.11.4.tar.bz2) = 2f7132e46a62a2586545bca40eeeef39
-SHA256 (gnome2/atk-1.11.4.tar.bz2) = f288657de2f7413c35626dcc43fb66ca837c8232b7d0c00bc602430706dd2ed7
-SIZE (gnome2/atk-1.11.4.tar.bz2) = 621041
+MD5 (gnome2/atk-1.12.3.tar.bz2) = 7f648f4808b5f8273e1d63b0b543bf9b
+SHA256 (gnome2/atk-1.12.3.tar.bz2) = 70ab4689c0f9e0127b53ae532115d5f4422b825e6742aacdeb4849c4e08b69d7
+SIZE (gnome2/atk-1.12.3.tar.bz2) = 661453
diff --git a/accessibility/atk/files/patch-docs_Makefile.in b/accessibility/atk/files/patch-docs_Makefile.in
deleted file mode 100644
index b40046ee22c..00000000000
--- a/accessibility/atk/files/patch-docs_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- docs/Makefile.in.orig	Fri Jan 24 16:45:09 2003
-+++ docs/Makefile.in	Fri Jan 24 16:45:09 2003
-@@ -274,6 +274,7 @@
- dist-hook-local: all-local
- 
- @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
-+@ENABLE_GTK_DOC_FALSE@all-local:
- 
- #### scan ####
- 
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 1734cb73e53..b4b98d2d61c 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -6,6 +6,7 @@ include/atk-1.0/atk/atkdocument.h
 include/atk-1.0/atk/atkeditabletext.h
 include/atk-1.0/atk/atkgobjectaccessible.h
 include/atk-1.0/atk/atkhyperlink.h
+include/atk-1.0/atk/atkhyperlinkimpl.h
 include/atk-1.0/atk/atkhypertext.h
 include/atk-1.0/atk/atkimage.h
 include/atk-1.0/atk/atknoopobject.h
@@ -37,12 +38,14 @@ share/locale/az/LC_MESSAGES/atk10.mo
 share/locale/be/LC_MESSAGES/atk10.mo
 share/locale/bg/LC_MESSAGES/atk10.mo
 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/cs/LC_MESSAGES/atk10.mo
 share/locale/cy/LC_MESSAGES/atk10.mo
 share/locale/da/LC_MESSAGES/atk10.mo
 share/locale/de/LC_MESSAGES/atk10.mo
+share/locale/dz/LC_MESSAGES/atk10.mo
 share/locale/el/LC_MESSAGES/atk10.mo
 share/locale/en_CA/LC_MESSAGES/atk10.mo
 share/locale/en_GB/LC_MESSAGES/atk10.mo
@@ -67,6 +70,7 @@ share/locale/ja/LC_MESSAGES/atk10.mo
 share/locale/ka/LC_MESSAGES/atk10.mo
 share/locale/kn/LC_MESSAGES/atk10.mo
 share/locale/ko/LC_MESSAGES/atk10.mo
+share/locale/ku/LC_MESSAGES/atk10.mo
 share/locale/li/LC_MESSAGES/atk10.mo
 share/locale/lt/LC_MESSAGES/atk10.mo
 share/locale/lv/LC_MESSAGES/atk10.mo
@@ -79,7 +83,6 @@ share/locale/nb/LC_MESSAGES/atk10.mo
 share/locale/ne/LC_MESSAGES/atk10.mo
 share/locale/nl/LC_MESSAGES/atk10.mo
 share/locale/nn/LC_MESSAGES/atk10.mo
-share/locale/no/LC_MESSAGES/atk10.mo
 share/locale/or/LC_MESSAGES/atk10.mo
 share/locale/pa/LC_MESSAGES/atk10.mo
 share/locale/pl/LC_MESSAGES/atk10.mo
@@ -96,6 +99,7 @@ share/locale/sr@Latn/LC_MESSAGES/atk10.mo
 share/locale/sr@ije/LC_MESSAGES/atk10.mo
 share/locale/sv/LC_MESSAGES/atk10.mo
 share/locale/ta/LC_MESSAGES/atk10.mo
+share/locale/te/LC_MESSAGES/atk10.mo
 share/locale/th/LC_MESSAGES/atk10.mo
 share/locale/tk/LC_MESSAGES/atk10.mo
 share/locale/tr/LC_MESSAGES/atk10.mo
@@ -109,6 +113,8 @@ share/locale/yi/LC_MESSAGES/atk10.mo
 share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_HK/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
+@dirrm include/atk-1.0/atk
+@dirrm include/atk-1.0
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -127,6 +133,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/tk/LC_MESSAGES
 @dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
 @dirrmtry share/locale/sr/LC_MESSAGES
@@ -143,8 +151,6 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/pt
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
 @dirrmtry share/locale/nn/LC_MESSAGES
 @dirrmtry share/locale/nn
 @dirrmtry share/locale/ne/LC_MESSAGES
@@ -153,6 +159,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/li/LC_MESSAGES
 @dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/gl/LC_MESSAGES
@@ -161,13 +169,15 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm include/atk-1.0/atk
-@dirrm include/atk-1.0
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 54303b847da..da0fda1728a 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.34 2006/04/13 07:52:29 bland Exp $
+#   $MCom: ports/accessibility/dasher/Makefile,v 1.44 2006/09/03 21:33:52 marcus Exp $
 #
 
 PORTNAME=	dasher
-PORTVERSION=	4.0.4
+PORTVERSION=	4.2.0
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -22,14 +22,14 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
-		libwnck
+		libwnck gnomedocutils
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
+INSTALLS_OMF=	yes
 USE_GCC=	3.4+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index aefbdf60e7a..86d91ceee59 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.0.4.tar.bz2) = 6ab865403d29d9d3714e85840ed89dc7
-SHA256 (gnome2/dasher-4.0.4.tar.bz2) = 0862cc25e3f3e19d07d5f39b95abbb19abd99eff5220e1b23d92d3a05f1ca875
-SIZE (gnome2/dasher-4.0.4.tar.bz2) = 5707882
+MD5 (gnome2/dasher-4.2.0.tar.bz2) = 9db6f0ac46041300e7126a073a40530e
+SHA256 (gnome2/dasher-4.2.0.tar.bz2) = 1664de06b3090b762ae5292a6ccf01681e857a8f8e320fb552aad810256e76ca
+SIZE (gnome2/dasher-4.2.0.tar.bz2) = 5632602
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
index da5a022d06c..6b5fdba4a5a 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
@@ -1,36 +1,20 @@
---- Src/DasherCore/FileLogger.cpp.orig	Tue Jan 17 01:41:44 2006
-+++ Src/DasherCore/FileLogger.cpp	Tue Jan 17 01:51:33 2006
-@@ -17,7 +17,7 @@ static char THIS_FILE[] = __FILE__;
- #include <windows.h>
- #endif
- 
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- CFileLogger::CFileLogger(const std::string& strFilenamePath, eLogLevel iLogLevel, int iOptionsMask)
- {
-@@ -492,12 +492,12 @@ std::string CFileLogger::GetTimeDateStam
- 
-   if ((m_bTimeStamp) || (m_bDateStamp))
-   {
--    struct timeb sTimeBuffer;
-+    struct timeval sTimeBuffer;
-     char* szTimeLine = NULL;
- 
--    ftime(&sTimeBuffer);
-+    gettimeofday(&sTimeBuffer, NULL);
- 
--    szTimeLine = ctime(&(sTimeBuffer.time));
+--- Src/DasherCore/FileLogger.cpp.orig	Fri Apr 21 17:41:01 2006
++++ Src/DasherCore/FileLogger.cpp	Sun Jun 11 07:33:19 2006
+@@ -511,7 +511,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
 +    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- 
+ #endif
+  
      // Format is:
-     // Wed Jun 22 10:22:00 2005
-@@ -520,7 +520,7 @@ std::string CFileLogger::GetTimeDateStam
-           strTimeStamp += szTimeLine[i];
-         strTimeStamp += ".";
-         char strMs[16];
--        sprintf(strMs, "%d", sTimeBuffer.millitm);
+@@ -538,7 +538,7 @@
+ #ifdef _WIN32
+         sprintf(strMs, "%d", sTimeBuffer.millitm);
+ #else
+-        sprintf(strMs, "%d", sTimeBuffer.tv_usec / 1000);
 +        sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ #endif
          if (strlen(strMs) == 1)
            strTimeStamp += "00";
-         else if (strlen(strMs) == 2)
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
index d8679afaed3..745c41f85a5 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
@@ -1,44 +1,24 @@
---- Src/DasherCore/SimpleTimer.cpp.orig	Tue Jan 17 01:43:17 2006
-+++ Src/DasherCore/SimpleTimer.cpp	Tue Jan 17 01:46:24 2006
-@@ -1,6 +1,6 @@
- #include "SimpleTimer.h"
+--- Src/DasherCore/SimpleTimer.cpp.orig	Wed May 31 00:14:12 2006
++++ Src/DasherCore/SimpleTimer.cpp	Wed May 31 00:14:23 2006
+@@ -34,8 +34,8 @@ CSimpleTimer::CSimpleTimer()
+     m_iStartSecond   = sTimeBuffer.time;
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    m_iStartMs       = sTimeBuffer.tv_usec / 1000;
+-    m_iStartSecond   = sTimeBuffer.tv_sec;
++    m_iStartMs       = (int) sTimeBuffer.tv_usec / 1000;
++    m_iStartSecond   = (int) sTimeBuffer.tv_sec;
+ #endif
  
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- // Track memory leaks on Windows to the line that new'd the memory
- #ifdef _WIN32
-@@ -14,12 +14,12 @@ static char THIS_FILE[] = __FILE__;
- 
- CSimpleTimer::CSimpleTimer()
- {
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  m_iStartMs       = sTimeBuffer.millitm;
--  m_iStartSecond   = sTimeBuffer.time;
-+  m_iStartMs       = (int) (sTimeBuffer.tv_usec / 1000);
-+  m_iStartSecond   = (int) sTimeBuffer.tv_sec;
  }
- 
- CSimpleTimer::~CSimpleTimer()
-@@ -28,12 +28,12 @@ CSimpleTimer::~CSimpleTimer()
- 
- double CSimpleTimer::GetElapsed()
- {
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  int     iEndMs       = sTimeBuffer.millitm;
--  int     iEndSecond   = sTimeBuffer.time;
-+  int     iEndMs       = (int) (sTimeBuffer.tv_usec / 1000);
+@@ -59,8 +59,8 @@ double CSimpleTimer::GetElapsed()
+   int     iEndSecond   = sTimeBuffer.time;
+ #else
+   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-  int     iEndMs       = sTimeBuffer.tv_usec / 1000;
+-  int     iEndSecond   = sTimeBuffer.tv_sec;
++  int     iEndMs       = (int) sTimeBuffer.tv_usec / 1000;
 +  int     iEndSecond   = (int) sTimeBuffer.tv_sec;
+ #endif
+ 
  
-   return  ((double) iEndMs     / 1000.0 + (double) iEndSecond) - 
-           ((double) m_iStartMs / 1000.0 + (double) m_iStartSecond);
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
index d5bf37daf0d..d41cf9bed26 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
@@ -1,51 +1,29 @@
---- Src/DasherCore/TimeSpan.cpp.orig	Tue Jan 17 01:47:12 2006
-+++ Src/DasherCore/TimeSpan.cpp	Tue Jan 17 01:48:47 2006
-@@ -1,6 +1,6 @@
- 
- #include "TimeSpan.h"
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- #ifdef _WIN32
- // In order to track leaks to line number, we need this at the top of every file
-@@ -102,12 +102,12 @@ string CTimeSpan::GetXML(const string& s
- string CTimeSpan::GetTimeStamp()
- {
-   string strTimeStamp = "";
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
-   char* szTimeLine = NULL;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  szTimeLine = ctime(&(sTimeBuffer.time));
-+  szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- 
+--- Src/DasherCore/TimeSpan.cpp.orig	Fri Apr 21 17:41:02 2006
++++ Src/DasherCore/TimeSpan.cpp	Sun Jun 11 09:21:30 2006
+@@ -122,7 +122,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+   
    if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-   {
-@@ -115,7 +115,7 @@ string CTimeSpan::GetTimeStamp()
-       strTimeStamp += szTimeLine[i];
-     strTimeStamp += ".";
-     char szMs[16];
--    sprintf(szMs, "%d", sTimeBuffer.millitm);
+@@ -134,7 +134,7 @@
+ #ifdef _WIN32
+     sprintf(szMs, "%d", sTimeBuffer.millitm);
+ #else
+-    sprintf(szMs, "%d", sTimeBuffer.tv_usec / 1000);
 +    sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ #endif
      if (strlen(szMs) == 1)
        strTimeStamp += "00";
-     else if (strlen(szMs) == 2)
-@@ -163,12 +163,12 @@ string CTimeSpan::GetDateStamp()
- {
-   std::string strDateStamp = "";
- 
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
-   char* szTimeLine = NULL;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  szTimeLine = ctime(&(sTimeBuffer.time));
-+  szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- 
-   // Format is:
-   // Wed Jun 22 10:22:00 2005
+@@ -196,7 +196,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+ 
+  
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
index 2ba6fec10ff..663e5426ef3 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
@@ -1,41 +1,20 @@
---- Src/DasherCore/UserLog.cpp.orig	Tue Jan 17 01:49:12 2006
-+++ Src/DasherCore/UserLog.cpp	Tue Jan 17 01:50:11 2006
-@@ -1,7 +1,7 @@
- 
- #include "UserLog.h"
- #include <fstream>
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- // Track memory leaks on Windows to the line that new'd the memory
- #ifdef _WIN32
-@@ -624,12 +624,12 @@ void CUserLog::SetOuputFilename(const st
-   {
-     m_strFilename = USER_LOG_DETAILED_PREFIX;
- 
--    struct timeb sTimeBuffer;
-+    struct timeval sTimeBuffer;
-     char* szTimeLine = NULL;
- 
--    ftime(&sTimeBuffer);
-+    gettimeofday(&sTimeBuffer, NULL);
- 
--    szTimeLine = ctime(&(sTimeBuffer.time));
+--- Src/DasherCore/UserLog.cpp.orig	Fri Apr 21 17:41:02 2006
++++ Src/DasherCore/UserLog.cpp	Sun Jun 11 10:43:33 2006
+@@ -668,7 +668,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
 +    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
  
      if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-     {
-@@ -829,10 +829,10 @@ bool CUserLog::UpdateMouseLocation()
- {
-   //CFunctionLogger f1("CUserLog::UpdateMouseLocation", g_pLogger);
- 
--  struct timeb sTimeBuffer;
--  ftime(&sTimeBuffer);
-+  struct timeval sTimeBuffer;
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
+@@ -881,7 +881,7 @@
+   double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
+ #else
+   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-  double dTime = (sTimeBuffer.tv_sec * 1000.0) + sTimeBuffer.tv_usec / 1000;
 +  double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000);
+ #endif
  
-   if ((dTime - m_dLastMouseUpdate) > LOG_MOUSE_EVERY_MS)
-   {
+   
diff --git a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
deleted file mode 100644
index 9817b2f11bb..00000000000
--- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- Src/Gtk2/speech.cc.orig	Thu Jan 12 15:52:50 2006
-+++ Src/Gtk2/speech.cc	Tue Jan 17 01:29:35 2006
-@@ -74,6 +74,7 @@ void setup_speech() {
- void teardown_speech() {
- 
-   bonobo_object_release_unref(speaker, NULL);
-+  if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0)
-   CORBA_free(voices);
-   GNOME_Speech_SynthesisDriver_unref(rv, &ev);
-   CORBA_exception_free(&ev);
diff --git a/accessibility/dasher/files/patch-configure b/accessibility/dasher/files/patch-configure
index 982daaac666..7ade63c80ea 100644
--- a/accessibility/dasher/files/patch-configure
+++ b/accessibility/dasher/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Tue Jan 31 01:13:42 2006
-+++ configure	Tue Jan 31 01:14:07 2006
-@@ -24818,7 +24818,7 @@
- 
- 
- GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $glade_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS"
--GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS  -Wl,--export-dynamic,"
-+GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS  -Wl,--export-dynamic"
- 
+--- configure.orig	Wed May 17 00:00:16 2006
++++ configure	Wed May 17 00:01:21 2006
+@@ -24000,7 +24000,7 @@ GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS
+ if [ x"$WITHDARWIN" = xtrue ]; then
+       GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+ else
+-      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic,"
++      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic"
+ fi
  
  
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 90e5f81a82e..27fbfaa616b 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -7,7 +7,6 @@ share/gnome/dasher/alphabet.Austen.xml
 share/gnome/dasher/alphabet.Azerbaijani.xml
 share/gnome/dasher/alphabet.Belarusian.xml
 share/gnome/dasher/alphabet.Bulgarian.xml
-share/gnome/dasher/alphabet.C.xml
 share/gnome/dasher/alphabet.Esperanto.xml
 share/gnome/dasher/alphabet.Estonian.xml
 share/gnome/dasher/alphabet.Filipino.xml
@@ -42,6 +41,7 @@ share/gnome/dasher/alphabet.Tajik.xml
 share/gnome/dasher/alphabet.Tamil.xml
 share/gnome/dasher/alphabet.Telugu.xml
 share/gnome/dasher/alphabet.Thai.xml
+share/gnome/dasher/alphabet.Thai2.xml
 share/gnome/dasher/alphabet.Tsonga.xml
 share/gnome/dasher/alphabet.Tswana.xml
 share/gnome/dasher/alphabet.Turkish.xml
@@ -70,12 +70,10 @@ share/gnome/dasher/alphabet.corsican.xml
 share/gnome/dasher/alphabet.croatian.xml
 share/gnome/dasher/alphabet.czech.xml
 share/gnome/dasher/alphabet.danish.xml
-share/gnome/dasher/alphabet.danish2.xml
 share/gnome/dasher/alphabet.dtd
 share/gnome/dasher/alphabet.dutch.xml
 share/gnome/dasher/alphabet.english.xml
 share/gnome/dasher/alphabet.englishC.xml
-share/gnome/dasher/alphabet.englishLC.xml
 share/gnome/dasher/alphabet.ethiopic.xml
 share/gnome/dasher/alphabet.ewe.xml
 share/gnome/dasher/alphabet.faroese.xml
@@ -143,13 +141,13 @@ share/gnome/dasher/colour.euroasian.xml
 share/gnome/dasher/colour.euroasian2.xml
 share/gnome/dasher/colour.jamie.xml
 share/gnome/dasher/colour.rainbow.xml
+share/gnome/dasher/colour.thai.xml
 share/gnome/dasher/colour.vowels.xml
 share/gnome/dasher/colour.vowels2.xml
 share/gnome/dasher/colour.xml
 share/gnome/dasher/controllabels.dtd
 share/gnome/dasher/controllabels.xml
 share/gnome/dasher/dasher.glade
-share/gnome/dasher/dashermaemo.glade
 share/gnome/dasher/training_albanian_SQ.txt
 share/gnome/dasher/training_basque_EU.txt
 share/gnome/dasher/training_bengali_BD.txt
@@ -179,25 +177,22 @@ share/gnome/dasher/training_swedish_SE.txt
 share/gnome/dasher/training_turkish_TR.txt
 share/gnome/dasher/training_welsh_GB.txt
 share/gnome/help/dasher/C/dasher.xml
+share/gnome/help/dasher/C/figures/a-z.gif
+share/gnome/help/dasher/C/figures/aa-az.gif
+share/gnome/help/dasher/C/figures/ala-alz.gif
+share/gnome/help/dasher/C/figures/exampleHad2.png
+share/gnome/help/dasher/C/figures/exampleHad2a.png
+share/gnome/help/dasher/C/figures/exampleHad3a.png
+share/gnome/help/dasher/C/figures/exampleHad4.png
 share/gnome/help/dasher/C/figures/figure2.png
 share/gnome/help/dasher/C/figures/main.png
+share/gnome/help/dasher/C/figures/object.gif
 share/gnome/help/dasher/C/figures/prefs1.png
 share/gnome/help/dasher/C/figures/prefs2.png
 share/gnome/help/dasher/C/figures/prefs3.png
 share/gnome/help/dasher/C/figures/prefs4.png
 share/gnome/help/dasher/C/figures/prefs5.png
-share/gnome/help/dasher/C/version.xml
-share/gnome/help/dasher/eu/dasher.xml
-share/gnome/help/dasher/eu/figures/figure2.png
-share/gnome/help/dasher/eu/figures/main.png
-share/gnome/help/dasher/eu/figures/prefs1.png
-share/gnome/help/dasher/eu/figures/prefs2.png
-share/gnome/help/dasher/eu/figures/prefs3.png
-share/gnome/help/dasher/eu/figures/prefs4.png
-share/gnome/help/dasher/eu/figures/prefs5.png
-share/gnome/help/dasher/eu/version.xml
 share/gnome/omf/dasher/dasher-C.omf
-share/gnome/omf/dasher/dasher-eu.omf
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
@@ -205,7 +200,7 @@ share/locale/az/LC_MESSAGES/dasher.mo
 share/locale/be/LC_MESSAGES/dasher.mo
 share/locale/bg/LC_MESSAGES/dasher.mo
 share/locale/bn/LC_MESSAGES/dasher.mo
-share/locale/br/LC_MESSAGES/dasher.mo
+share/locale/bn_IN/LC_MESSAGES/dasher.mo
 share/locale/bs/LC_MESSAGES/dasher.mo
 share/locale/ca/LC_MESSAGES/dasher.mo
 share/locale/cs/LC_MESSAGES/dasher.mo
@@ -234,17 +229,21 @@ share/locale/it/LC_MESSAGES/dasher.mo
 share/locale/ja/LC_MESSAGES/dasher.mo
 share/locale/ka/LC_MESSAGES/dasher.mo
 share/locale/ko/LC_MESSAGES/dasher.mo
+share/locale/ku/LC_MESSAGES/dasher.mo
 share/locale/ky/LC_MESSAGES/dasher.mo
 share/locale/lt/LC_MESSAGES/dasher.mo
 share/locale/lv/LC_MESSAGES/dasher.mo
+share/locale/mg/LC_MESSAGES/dasher.mo
 share/locale/mk/LC_MESSAGES/dasher.mo
+share/locale/ml/LC_MESSAGES/dasher.mo
 share/locale/mn/LC_MESSAGES/dasher.mo
+share/locale/mr/LC_MESSAGES/dasher.mo
 share/locale/ms/LC_MESSAGES/dasher.mo
 share/locale/nb/LC_MESSAGES/dasher.mo
 share/locale/ne/LC_MESSAGES/dasher.mo
 share/locale/nl/LC_MESSAGES/dasher.mo
-share/locale/no/LC_MESSAGES/dasher.mo
 share/locale/nn/LC_MESSAGES/dasher.mo
+share/locale/or/LC_MESSAGES/dasher.mo
 share/locale/pa/LC_MESSAGES/dasher.mo
 share/locale/pl/LC_MESSAGES/dasher.mo
 share/locale/pt/LC_MESSAGES/dasher.mo
@@ -253,6 +252,7 @@ share/locale/ro/LC_MESSAGES/dasher.mo
 share/locale/ru/LC_MESSAGES/dasher.mo
 share/locale/rw/LC_MESSAGES/dasher.mo
 share/locale/sk/LC_MESSAGES/dasher.mo
+share/locale/sl/LC_MESSAGES/dasher.mo
 share/locale/sq/LC_MESSAGES/dasher.mo
 share/locale/sr/LC_MESSAGES/dasher.mo
 share/locale/sr@Latn/LC_MESSAGES/dasher.mo
@@ -267,22 +267,64 @@ share/locale/vi/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
 share/locale/zh_TW/LC_MESSAGES/dasher.mo
+@dirrm share/gnome/omf/dasher
+@dirrm share/gnome/help/dasher/C/figures
+@dirrm share/gnome/help/dasher/C
+@dirrm share/gnome/help/dasher
+@dirrm share/gnome/dasher
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/omf/dasher
-@dirrm share/gnome/help/dasher/eu/figures
-@dirrm share/gnome/help/dasher/eu
-@dirrm share/gnome/help/dasher/C/figures
-@dirrm share/gnome/help/dasher/C
-@dirrm share/gnome/help/dasher
-@dirrm share/gnome/dasher
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index a74be697697..fbc2215ea2e 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gail/Makefile,v 1.44 2006/04/23 22:21:28 mezz Exp $
+#   $MCom: ports/accessibility/gail/Makefile,v 1.52 2006/10/02 00:47:13 ahze Exp $
 #
 
 PORTNAME=	gail
-PORTVERSION=	1.8.11
-PORTREVISION?=	1
+PORTVERSION=	1.9.3
+PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,11 +22,11 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack libgnomecanvas lthack referencehack
+USE_AUTOTOOLS=	libtool:15
+USE_GNOME=	gnomehack ltverhack libgnomecanvas lthack referencehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 5ae5efb34fd..0bd8c267445 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gail-1.8.11.tar.bz2) = ff79df7dd0cf7a5109c089b9b5fbe17f
-SHA256 (gnome2/gail-1.8.11.tar.bz2) = b1520968851727881e5ae070ec5d43c466322fab51607d96df531609f4abe6cf
-SIZE (gnome2/gail-1.8.11.tar.bz2) = 584492
+MD5 (gnome2/gail-1.9.3.tar.bz2) = 1e8825da60fd19833dfc6b2068f05ec9
+SHA256 (gnome2/gail-1.9.3.tar.bz2) = 165be69deb636b658374c2cfe5df452ab198de6d6ca8ebe0ee8469a229225c3c
+SIZE (gnome2/gail-1.9.3.tar.bz2) = 622648
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 0bd2bf5a42c..6c919bb1ac3 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -1,11 +1,13 @@
 include/gail-1.0/libgail-util/gail-util.h
 include/gail-1.0/libgail-util/gailmisc.h
 include/gail-1.0/libgail-util/gailtextutil.h
+lib/gtk-2.0/modules/libgail.a
 lib/gtk-2.0/modules/libgail.la
 lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
 lib/libgailutil.la
 lib/libgailutil.so
-lib/libgailutil.so.17
+lib/libgailutil.so.18
 libdata/pkgconfig/gail.pc
 share/locale/ar/LC_MESSAGES/gail.mo
 share/locale/as/LC_MESSAGES/gail.mo
@@ -13,12 +15,14 @@ share/locale/az/LC_MESSAGES/gail.mo
 share/locale/be/LC_MESSAGES/gail.mo
 share/locale/bg/LC_MESSAGES/gail.mo
 share/locale/bn/LC_MESSAGES/gail.mo
+share/locale/bn_IN/LC_MESSAGES/gail.mo
 share/locale/bs/LC_MESSAGES/gail.mo
 share/locale/ca/LC_MESSAGES/gail.mo
 share/locale/cs/LC_MESSAGES/gail.mo
 share/locale/cy/LC_MESSAGES/gail.mo
 share/locale/da/LC_MESSAGES/gail.mo
 share/locale/de/LC_MESSAGES/gail.mo
+share/locale/dz/LC_MESSAGES/gail.mo
 share/locale/el/LC_MESSAGES/gail.mo
 share/locale/en_CA/LC_MESSAGES/gail.mo
 share/locale/en_GB/LC_MESSAGES/gail.mo
@@ -39,18 +43,20 @@ share/locale/id/LC_MESSAGES/gail.mo
 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/ko/LC_MESSAGES/gail.mo
 share/locale/ku/LC_MESSAGES/gail.mo
 share/locale/lt/LC_MESSAGES/gail.mo
+share/locale/lv/LC_MESSAGES/gail.mo
 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/ms/LC_MESSAGES/gail.mo
 share/locale/nb/LC_MESSAGES/gail.mo
 share/locale/ne/LC_MESSAGES/gail.mo
 share/locale/nl/LC_MESSAGES/gail.mo
 share/locale/nn/LC_MESSAGES/gail.mo
-share/locale/no/LC_MESSAGES/gail.mo
 share/locale/or/LC_MESSAGES/gail.mo
 share/locale/pa/LC_MESSAGES/gail.mo
 share/locale/pl/LC_MESSAGES/gail.mo
@@ -60,6 +66,7 @@ share/locale/ro/LC_MESSAGES/gail.mo
 share/locale/ru/LC_MESSAGES/gail.mo
 share/locale/rw/LC_MESSAGES/gail.mo
 share/locale/sk/LC_MESSAGES/gail.mo
+share/locale/sl/LC_MESSAGES/gail.mo
 share/locale/sq/LC_MESSAGES/gail.mo
 share/locale/sr/LC_MESSAGES/gail.mo
 share/locale/sr@Latn/LC_MESSAGES/gail.mo
@@ -74,17 +81,59 @@ share/locale/xh/LC_MESSAGES/gail.mo
 share/locale/zh_CN/LC_MESSAGES/gail.mo
 share/locale/zh_HK/LC_MESSAGES/gail.mo
 share/locale/zh_TW/LC_MESSAGES/gail.mo
+@dirrm include/gail-1.0/libgail-util
+@dirrm include/gail-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm include/gail-1.0/libgail-util
-@dirrm include/gail-1.0
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 94781a3f0cc..b58b6018fbb 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -3,13 +3,14 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/accessibility/gnome-speech/Makefile,v 1.21 2006/08/22 00:55:57 ahze Exp $
 #
 
 PORTNAME=	gnome-speech
-PORTVERSION=	0.3.10
+PORTVERSION=	0.4.4
 CATEGORIES=	accessibility audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-speech/0.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libbonobo
 GNU_CONFIGURE=  yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnome-speech/distinfo b/accessibility/gnome-speech/distinfo
index e94f410d394..d428ef39b05 100644
--- a/accessibility/gnome-speech/distinfo
+++ b/accessibility/gnome-speech/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-speech-0.3.10.tar.bz2) = 5454e2b727d505459654cbaf5f893d3a
-SHA256 (gnome2/gnome-speech-0.3.10.tar.bz2) = 1740bbabdcccac7b365b73aa06bd5c8f400cfc1f8ec4d922435b38c5b42e1bcc
-SIZE (gnome2/gnome-speech-0.3.10.tar.bz2) = 272260
+MD5 (gnome2/gnome-speech-0.4.4.tar.bz2) = c26dde244c969d7a00b229f256e77546
+SHA256 (gnome2/gnome-speech-0.4.4.tar.bz2) = 318ebf3a3f4bd05d534202839ce779f1c823f26305b625703b9615c803d74e6c
+SIZE (gnome2/gnome-speech-0.4.4.tar.bz2) = 309806
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 8face7430f9..46b0c18e793 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gnopernicus/Makefile,v 1.76 2006/04/14 14:42:45 mezz Exp $
+#   $MCom: ports/accessibility/gnopernicus/Makefile,v 1.83 2006/08/22 02:55:02 marcus Exp $
 #
 
 PORTNAME=	gnopernicus
-PORTVERSION=	1.0.6
+PORTVERSION=	1.1.2
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,17 +20,18 @@ LIB_DEPENDS=	gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	SED="${SED}"
 
 GCONF_SCHEMAS=	brlmonitor.schemas gnopernicus.schemas remote.schemas
-SHLIB_VERSION=	6
+SHLIB_VERSION=	2
 PLIST_SUB=	SHLIB_VERSION=${SHLIB_VERSION}
 
 post-patch:
diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo
index 68f9b3da03d..15898651b00 100644
--- a/accessibility/gnopernicus/distinfo
+++ b/accessibility/gnopernicus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnopernicus-1.0.6.tar.bz2) = 48b4fb06920053048418036f91069763
-SHA256 (gnome2/gnopernicus-1.0.6.tar.bz2) = 48a6ef80d814af2042b12c9a794eff2a6ce8f1353cd5bcc1dba29afa68f6a5d0
-SIZE (gnome2/gnopernicus-1.0.6.tar.bz2) = 1521529
+MD5 (gnome2/gnopernicus-1.1.2.tar.bz2) = 64677df8961a68a73003393166f710bd
+SHA256 (gnome2/gnopernicus-1.1.2.tar.bz2) = 88a750ead047e52ee3c655bd4d5947d9131619ecbf56bc1977c8a3bf6e4f5214
+SIZE (gnome2/gnopernicus-1.1.2.tar.bz2) = 1578754
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index c405c690fc8..f82bef28fe1 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -4,6 +4,7 @@ bin/srcore
 etc/gnopernicus-1.0/translation_tables/de.a2b
 etc/gnopernicus-1.0/translation_tables/en_US.a2b
 etc/gnopernicus-1.0/translation_tables/es.a2b
+etc/gnopernicus-1.0/translation_tables/fr.a2b
 etc/gnopernicus-1.0/translation_tables/sv.a2b
 include/gnopernicus-1.0/libbrl/brlxmlapi.h
 include/gnopernicus-1.0/libke/libke.h
@@ -17,6 +18,9 @@ include/gnopernicus-1.0/libsrutil/SREvent.h
 include/gnopernicus-1.0/libsrutil/SRMessages.h
 include/gnopernicus-1.0/libsrutil/srintl.h
 include/gnopernicus-1.0/libsrutil/sru-debug.h
+include/gnopernicus-1.0/libsrutil/sru-glib.h
+include/gnopernicus-1.0/libsrutil/sru-module.h
+include/gnopernicus-1.0/libsrutil/sru-test.h
 include/gnopernicus-1.0/libsrutil/util.h
 lib/gnopernicus-1.0/libbrl.la
 lib/gnopernicus-1.0/libbrl.so
@@ -63,7 +67,6 @@ share/gnome/gnopernicus/glade/gnopi_files/Presentation/presentation.glade2
 share/gnome/gnopernicus/glade/gnopi_files/Screen_Review/screen_review.glade2
 share/gnome/gnopernicus/glade/gnopi_files/Speech_Settings/speech_settings.glade2
 share/gnome/gnopernicus/glade/gnopi_files/User_Properties/user_properties.glade2
-share/gnome/gnopernicus/glade/gnopi_files/about.glade2
 share/gnome/gnopernicus/glade/gnopi_files/braille.xpm
 share/gnome/gnopernicus/glade/gnopi_files/gnopi.glade2
 share/gnome/gnopernicus/glade/gnopi_files/keyboard.xpm
@@ -86,12 +89,13 @@ share/gnome/omf/gnopernicus/brlmonitor-C.omf
 share/gnome/omf/gnopernicus/brlmonitor-es.omf
 share/gnome/omf/gnopernicus/gnopernicus-C.omf
 share/gnome/omf/gnopernicus/gnopernicus-es.omf
-share/gnome/pixmaps/gnopernicus.png
+share/icons/hicolor/48x48/apps/gnopernicus.png
 share/locale/ar/LC_MESSAGES/gnopernicus.mo
 share/locale/az/LC_MESSAGES/gnopernicus.mo
 share/locale/be/LC_MESSAGES/gnopernicus.mo
 share/locale/bg/LC_MESSAGES/gnopernicus.mo
 share/locale/bn/LC_MESSAGES/gnopernicus.mo
+share/locale/bn_IN/LC_MESSAGES/gnopernicus.mo
 share/locale/ca/LC_MESSAGES/gnopernicus.mo
 share/locale/cs/LC_MESSAGES/gnopernicus.mo
 share/locale/cy/LC_MESSAGES/gnopernicus.mo
@@ -119,12 +123,14 @@ share/locale/ja/LC_MESSAGES/gnopernicus.mo
 share/locale/ka/LC_MESSAGES/gnopernicus.mo
 share/locale/ko/LC_MESSAGES/gnopernicus.mo
 share/locale/lt/LC_MESSAGES/gnopernicus.mo
+share/locale/lv/LC_MESSAGES/gnopernicus.mo
 share/locale/mn/LC_MESSAGES/gnopernicus.mo
+share/locale/mr/LC_MESSAGES/gnopernicus.mo
 share/locale/ms/LC_MESSAGES/gnopernicus.mo
 share/locale/nb/LC_MESSAGES/gnopernicus.mo
 share/locale/ne/LC_MESSAGES/gnopernicus.mo
 share/locale/nl/LC_MESSAGES/gnopernicus.mo
-share/locale/no/LC_MESSAGES/gnopernicus.mo
+share/locale/or/LC_MESSAGES/gnopernicus.mo
 share/locale/pa/LC_MESSAGES/gnopernicus.mo
 share/locale/pl/LC_MESSAGES/gnopernicus.mo
 share/locale/pt/LC_MESSAGES/gnopernicus.mo
@@ -144,9 +150,8 @@ share/locale/tr/LC_MESSAGES/gnopernicus.mo
 share/locale/uk/LC_MESSAGES/gnopernicus.mo
 share/locale/vi/LC_MESSAGES/gnopernicus.mo
 share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
+share/locale/zh_HK/LC_MESSAGES/gnopernicus.mo
 share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrm share/gnome/omf/gnopernicus
 @dirrm share/gnome/help/gnopernicus/pt_BR/figures
 @dirrm share/gnome/help/gnopernicus/pt_BR
@@ -183,3 +188,47 @@ share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
 @dirrm include/gnopernicus-1.0
 @dirrm etc/gnopernicus-1.0/translation_tables
 @dirrm etc/gnopernicus-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 05522f92be3..e882c7e340d 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,10 +3,11 @@
 # Whom:				Adam Weinberger <adamw@freebsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/accessibility/gok/Makefile,v 1.65 2006/04/27 22:59:43 marcus Exp $
+#    $MCom: ports/accessibility/gok/Makefile,v 1.72 2006/08/26 03:50:50 marcus Exp $
 
 PORTNAME=	gok
-PORTVERSION=	1.0.10
+PORTVERSION=	1.2.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -18,7 +19,7 @@ COMMENT=	GNOME On-Screen Keyboard (GOK)
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
 		gnomespeech
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 79cd77b5ce9..c5d51050c61 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-1.0.10.tar.bz2) = de6cceaca780e7ad0702c4b3c0fd8d1f
-SHA256 (gnome2/gok-1.0.10.tar.bz2) = 35a4e380fd85660567ad54401ae0e52ebbb6f47947ce6a585aad078ef630b824
-SIZE (gnome2/gok-1.0.10.tar.bz2) = 1149823
+MD5 (gnome2/gok-1.2.0.tar.bz2) = a5b022cf0b83800a38bb1f6d402ffa57
+SHA256 (gnome2/gok-1.2.0.tar.bz2) = f6a3fc5081c8dafbdadf05b86b13beb05d1329fda074d217b62f4a1daaedc544
+SIZE (gnome2/gok-1.2.0.tar.bz2) = 1177907
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 2eac98f1075..7853b5415a7 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -3,7 +3,9 @@ bin/gok
 libdata/bonobo/servers/GNOME_Gok.server
 libdata/pkgconfig/gok-1.0.pc
 %%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/gok-GokButton.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
 %%DOCSDIR%%/gok-arraylist.html
 %%DOCSDIR%%/gok-callbacks.html
 %%DOCSDIR%%/gok-command-common.html
@@ -129,6 +131,16 @@ share/gnome/gok/bn/numberpad.kbd
 share/gnome/gok/bn/quit.kbd
 share/gnome/gok/bn/text-operations.kbd
 share/gnome/gok/bn/valuator.kbd
+share/gnome/gok/bn_IN/gok-controls.kbd
+share/gnome/gok/bn_IN/hide.kbd
+share/gnome/gok/bn_IN/launcher.kbd
+share/gnome/gok/bn_IN/main.kbd
+share/gnome/gok/bn_IN/mouse.kbd
+share/gnome/gok/bn_IN/move-resize.kbd
+share/gnome/gok/bn_IN/numberpad.kbd
+share/gnome/gok/bn_IN/quit.kbd
+share/gnome/gok/bn_IN/text-operations.kbd
+share/gnome/gok/bn_IN/valuator.kbd
 share/gnome/gok/ca/gok-controls.kbd
 share/gnome/gok/ca/hide.kbd
 share/gnome/gok/ca/launcher.kbd
@@ -426,6 +438,16 @@ share/gnome/gok/lt/numberpad.kbd
 share/gnome/gok/lt/quit.kbd
 share/gnome/gok/lt/text-operations.kbd
 share/gnome/gok/lt/valuator.kbd
+share/gnome/gok/lv/gok-controls.kbd
+share/gnome/gok/lv/hide.kbd
+share/gnome/gok/lv/launcher.kbd
+share/gnome/gok/lv/main.kbd
+share/gnome/gok/lv/mouse.kbd
+share/gnome/gok/lv/move-resize.kbd
+share/gnome/gok/lv/numberpad.kbd
+share/gnome/gok/lv/quit.kbd
+share/gnome/gok/lv/text-operations.kbd
+share/gnome/gok/lv/valuator.kbd
 share/gnome/gok/main.kbd
 share/gnome/gok/manage.kbd
 share/gnome/gok/mk/gok-controls.kbd
@@ -460,6 +482,16 @@ share/gnome/gok/mn/text-operations.kbd
 share/gnome/gok/mn/valuator.kbd
 share/gnome/gok/mouse.kbd
 share/gnome/gok/move-resize.kbd
+share/gnome/gok/mr/gok-controls.kbd
+share/gnome/gok/mr/hide.kbd
+share/gnome/gok/mr/launcher.kbd
+share/gnome/gok/mr/main.kbd
+share/gnome/gok/mr/mouse.kbd
+share/gnome/gok/mr/move-resize.kbd
+share/gnome/gok/mr/numberpad.kbd
+share/gnome/gok/mr/quit.kbd
+share/gnome/gok/mr/text-operations.kbd
+share/gnome/gok/mr/valuator.kbd
 share/gnome/gok/ms/gok-controls.kbd
 share/gnome/gok/ms/hide.kbd
 share/gnome/gok/ms/launcher.kbd
@@ -501,6 +533,16 @@ share/gnome/gok/nl/quit.kbd
 share/gnome/gok/nl/text-operations.kbd
 share/gnome/gok/nl/valuator.kbd
 share/gnome/gok/numberpad.kbd
+share/gnome/gok/or/gok-controls.kbd
+share/gnome/gok/or/hide.kbd
+share/gnome/gok/or/launcher.kbd
+share/gnome/gok/or/main.kbd
+share/gnome/gok/or/mouse.kbd
+share/gnome/gok/or/move-resize.kbd
+share/gnome/gok/or/numberpad.kbd
+share/gnome/gok/or/quit.kbd
+share/gnome/gok/or/text-operations.kbd
+share/gnome/gok/or/valuator.kbd
 share/gnome/gok/pa/gok-controls.kbd
 share/gnome/gok/pa/hide.kbd
 share/gnome/gok/pa/launcher.kbd
@@ -704,6 +746,7 @@ share/locale/az/LC_MESSAGES/gok.mo
 share/locale/be/LC_MESSAGES/gok.mo
 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/cs/LC_MESSAGES/gok.mo
 share/locale/cy/LC_MESSAGES/gok.mo
@@ -732,13 +775,16 @@ share/locale/ka/LC_MESSAGES/gok.mo
 share/locale/ko/LC_MESSAGES/gok.mo
 share/locale/ku/LC_MESSAGES/gok.mo
 share/locale/lt/LC_MESSAGES/gok.mo
+share/locale/lv/LC_MESSAGES/gok.mo
 share/locale/mk/LC_MESSAGES/gok.mo
 share/locale/ml/LC_MESSAGES/gok.mo
 share/locale/mn/LC_MESSAGES/gok.mo
+share/locale/mr/LC_MESSAGES/gok.mo
 share/locale/ms/LC_MESSAGES/gok.mo
 share/locale/nb/LC_MESSAGES/gok.mo
 share/locale/ne/LC_MESSAGES/gok.mo
 share/locale/nl/LC_MESSAGES/gok.mo
+share/locale/or/LC_MESSAGES/gok.mo
 share/locale/pa/LC_MESSAGES/gok.mo
 share/locale/pl/LC_MESSAGES/gok.mo
 share/locale/pt/LC_MESSAGES/gok.mo
@@ -757,14 +803,6 @@ share/locale/vi/LC_MESSAGES/gok.mo
 share/locale/zh_CN/LC_MESSAGES/gok.mo
 share/locale/zh_HK/LC_MESSAGES/gok.mo
 share/locale/zh_TW/LC_MESSAGES/gok.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrm share/gnome/omf/gok
 @dirrm share/gnome/help/gok/C
 @dirrm share/gnome/help/gok
@@ -786,13 +824,16 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrm share/gnome/gok/pt
 @dirrm share/gnome/gok/pl
 @dirrm share/gnome/gok/pa
+@dirrm share/gnome/gok/or
 @dirrm share/gnome/gok/nl
 @dirrm share/gnome/gok/ne
 @dirrm share/gnome/gok/nb
 @dirrm share/gnome/gok/ms
+@dirrm share/gnome/gok/mr
 @dirrm share/gnome/gok/mn
 @dirrm share/gnome/gok/ml
 @dirrm share/gnome/gok/mk
+@dirrm share/gnome/gok/lv
 @dirrm share/gnome/gok/lt
 @dirrm share/gnome/gok/ku
 @dirrm share/gnome/gok/ko
@@ -822,6 +863,7 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrm share/gnome/gok/cy
 @dirrm share/gnome/gok/cs
 @dirrm share/gnome/gok/ca
+@dirrm share/gnome/gok/bn_IN
 @dirrm share/gnome/gok/bn
 @dirrm share/gnome/gok/bg
 @dirrm share/gnome/gok/be
@@ -830,3 +872,47 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrm share/gnome/gok/am
 @dirrm share/gnome/gok
 @dirrm %%DOCSDIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
new file mode 100644
index 00000000000..e69c721de5d
--- /dev/null
+++ b/accessibility/orca/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	orca
+# Date created:				25 Jul 2006
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/accessibility/orca/Makefile,v 1.4 2006/09/04 02:19:06 marcus Exp $
+#
+
+PORTNAME=	orca
+PORTVERSION=	1.0.0
+CATEGORIES=	accessibility x11 gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Scriptable screen reader
+
+LIB_DEPENDS=	gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_XLIB=	yes
+USE_PYTHON=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2
+INSTALLS_ICONS=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
new file mode 100644
index 00000000000..3332dddbb1e
--- /dev/null
+++ b/accessibility/orca/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/orca-1.0.0.tar.bz2) = b1db09138f1c99b6b0fd468cab35deb2
+SHA256 (gnome2/orca-1.0.0.tar.bz2) = 823c5dcc4d58f53100b7addcf02842451e58ff00064793018a392fa55d530cbd
+SIZE (gnome2/orca-1.0.0.tar.bz2) = 707077
diff --git a/accessibility/orca/pkg-descr b/accessibility/orca/pkg-descr
new file mode 100644
index 00000000000..30cfd432ca0
--- /dev/null
+++ b/accessibility/orca/pkg-descr
@@ -0,0 +1,7 @@
+Orca a scriptable screen reader that is currently under development.
+As such it is highly unstable and undergoes frequent changes.  To
+read more about Orca, please refer to the Orca documentation series
+available in the ./docs/doc-set directory and also the Orca WIKI at
+http://live.gnome.org/Orca.
+
+WWW: http://live.gnome.org/Orca
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
new file mode 100644
index 00000000000..bfe284fd0c9
--- /dev/null
+++ b/accessibility/orca/pkg-plist
@@ -0,0 +1,241 @@
+bin/orca
+%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.py
+%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyc
+%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyo
+%%PYTHON_SITELIBDIR%%/orca/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/acss.py
+%%PYTHON_SITELIBDIR%%/orca/acss.pyc
+%%PYTHON_SITELIBDIR%%/orca/acss.pyo
+%%PYTHON_SITELIBDIR%%/orca/atspi.py
+%%PYTHON_SITELIBDIR%%/orca/atspi.pyc
+%%PYTHON_SITELIBDIR%%/orca/atspi.pyo
+%%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/brlmon.py
+%%PYTHON_SITELIBDIR%%/orca/brlmon.pyc
+%%PYTHON_SITELIBDIR%%/orca/brlmon.pyo
+%%PYTHON_SITELIBDIR%%/orca/chnames.py
+%%PYTHON_SITELIBDIR%%/orca/chnames.pyc
+%%PYTHON_SITELIBDIR%%/orca/chnames.pyo
+%%PYTHON_SITELIBDIR%%/orca/debug.py
+%%PYTHON_SITELIBDIR%%/orca/debug.pyc
+%%PYTHON_SITELIBDIR%%/orca/debug.pyo
+%%PYTHON_SITELIBDIR%%/orca/dectalk.py
+%%PYTHON_SITELIBDIR%%/orca/dectalk.pyc
+%%PYTHON_SITELIBDIR%%/orca/dectalk.pyo
+%%PYTHON_SITELIBDIR%%/orca/default.py
+%%PYTHON_SITELIBDIR%%/orca/default.pyc
+%%PYTHON_SITELIBDIR%%/orca/default.pyo
+%%PYTHON_SITELIBDIR%%/orca/espeechfactory.py
+%%PYTHON_SITELIBDIR%%/orca/espeechfactory.pyc
+%%PYTHON_SITELIBDIR%%/orca/espeechfactory.pyo
+%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.py
+%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyc
+%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyo
+%%PYTHON_SITELIBDIR%%/orca/flat_review.py
+%%PYTHON_SITELIBDIR%%/orca/flat_review.pyc
+%%PYTHON_SITELIBDIR%%/orca/flat_review.pyo
+%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.py
+%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyc
+%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyo
+%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
+%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
+%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
+%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.py
+%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyc
+%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyo
+%%PYTHON_SITELIBDIR%%/orca/httpserver.py
+%%PYTHON_SITELIBDIR%%/orca/httpserver.pyc
+%%PYTHON_SITELIBDIR%%/orca/httpserver.pyo
+%%PYTHON_SITELIBDIR%%/orca/input_event.py
+%%PYTHON_SITELIBDIR%%/orca/input_event.pyc
+%%PYTHON_SITELIBDIR%%/orca/input_event.pyo
+%%PYTHON_SITELIBDIR%%/orca/keybindings.py
+%%PYTHON_SITELIBDIR%%/orca/keybindings.pyc
+%%PYTHON_SITELIBDIR%%/orca/keybindings.pyo
+%%PYTHON_SITELIBDIR%%/orca/keynames.py
+%%PYTHON_SITELIBDIR%%/orca/keynames.pyc
+%%PYTHON_SITELIBDIR%%/orca/keynames.pyo
+%%PYTHON_SITELIBDIR%%/orca/mag.py
+%%PYTHON_SITELIBDIR%%/orca/mag.pyc
+%%PYTHON_SITELIBDIR%%/orca/mag.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca.py
+%%PYTHON_SITELIBDIR%%/orca/orca.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca.pyo
+%%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_gui_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_i18n.py
+%%PYTHON_SITELIBDIR%%/orca/orca_i18n.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_i18n.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_state.py
+%%PYTHON_SITELIBDIR%%/orca/orca_state.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_state.pyo
+%%PYTHON_SITELIBDIR%%/orca/outloud.py
+%%PYTHON_SITELIBDIR%%/orca/outloud.pyc
+%%PYTHON_SITELIBDIR%%/orca/outloud.pyo
+%%PYTHON_SITELIBDIR%%/orca/platform.py
+%%PYTHON_SITELIBDIR%%/orca/platform.pyc
+%%PYTHON_SITELIBDIR%%/orca/platform.pyo
+%%PYTHON_SITELIBDIR%%/orca/presentation_manager.py
+%%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyc
+%%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyo
+%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.py
+%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/rolenames.py
+%%PYTHON_SITELIBDIR%%/orca/rolenames.pyc
+%%PYTHON_SITELIBDIR%%/orca/rolenames.pyo
+%%PYTHON_SITELIBDIR%%/orca/script.py
+%%PYTHON_SITELIBDIR%%/orca/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/planner.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
+%%PYTHON_SITELIBDIR%%/orca/settings.py
+%%PYTHON_SITELIBDIR%%/orca/settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/speech.py
+%%PYTHON_SITELIBDIR%%/orca/speech.pyc
+%%PYTHON_SITELIBDIR%%/orca/speech.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
+%%PYTHON_SITELIBDIR%%/orca/util.py
+%%PYTHON_SITELIBDIR%%/orca/util.pyc
+%%PYTHON_SITELIBDIR%%/orca/util.pyo
+share/gnome/applications/orca.desktop
+share/gnome/orca/glade/orca-setup.glade
+share/icons/hicolor/48x48/apps/orca.png
+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/cs/LC_MESSAGES/orca.mo
+share/locale/cy/LC_MESSAGES/orca.mo
+share/locale/de/LC_MESSAGES/orca.mo
+share/locale/dz/LC_MESSAGES/orca.mo
+share/locale/el/LC_MESSAGES/orca.mo
+share/locale/en_CA/LC_MESSAGES/orca.mo
+share/locale/en_GB/LC_MESSAGES/orca.mo
+share/locale/es/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/gu/LC_MESSAGES/orca.mo
+share/locale/hi/LC_MESSAGES/orca.mo
+share/locale/it/LC_MESSAGES/orca.mo
+share/locale/ja/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
+share/locale/mk/LC_MESSAGES/orca.mo
+share/locale/ml/LC_MESSAGES/orca.mo
+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/or/LC_MESSAGES/orca.mo
+share/locale/pa/LC_MESSAGES/orca.mo
+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/sr/LC_MESSAGES/orca.mo
+share/locale/sr@Latn/LC_MESSAGES/orca.mo
+share/locale/sv/LC_MESSAGES/orca.mo
+share/locale/ta/LC_MESSAGES/orca.mo
+share/locale/uk/LC_MESSAGES/orca.mo
+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
+@dirrm share/gnome/orca/glade
+@dirrm share/gnome/orca
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/orca
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN