Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

18 files changed, 220 insertions, 141 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 43121bd21a09..553b6210ba23 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index 54ca92afb782..1c53333d61c8 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1 +1 @@
-MD5 (gnome2/at-spi-1.2.1.tar.bz2) = 562620310d9150e4803a275311f0088d
+MD5 (gnome2/at-spi-1.3.7.tar.bz2) = c5ee8c9ae592c547ac557fa58003b021
diff --git a/accessibility/at-spi/files/patch-atk-bridge_Makefile.in b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
new file mode 100644
index 000000000000..9c50885971b2
--- /dev/null
+++ b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
@@ -0,0 +1,11 @@
+--- atk-bridge/Makefile.in.orig	Sat Apr 12 01:06:28 2003
++++ atk-bridge/Makefile.in	Sat Apr 12 01:06:48 2003
+@@ -147,7 +147,7 @@
+ 
+ LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version
+ 
+-libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) $(top_builddir)/libspi/libspi.la
++libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la
+ 
+ CFLAGS = @CFLAGS@ $(ATK_BRIDGE_CFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/accessibility/at-spi/files/patch-libspi_Makefile.in b/accessibility/at-spi/files/patch-libspi_Makefile.in
new file mode 100644
index 000000000000..cfb55a212a86
--- /dev/null
+++ b/accessibility/at-spi/files/patch-libspi_Makefile.in
@@ -0,0 +1,11 @@
+--- libspi/Makefile.in.orig	Fri May  2 13:36:07 2003
++++ libspi/Makefile.in	Fri May  2 13:36:37 2003
+@@ -539,7 +539,7 @@
+ mostlyclean distclean maintainer-clean
+ 
+ 
+-$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h
++accessible.c base.h keystrokelistener.h libspi.h listener.h remoteobject.h : Accessibility.h
+ 
+ $(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL)
+ 	$(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl
diff --git a/accessibility/at-spi/files/patch-registryd_Makefile.in b/accessibility/at-spi/files/patch-registryd_Makefile.in
new file mode 100644
index 000000000000..7729e9da1400
--- /dev/null
+++ b/accessibility/at-spi/files/patch-registryd_Makefile.in
@@ -0,0 +1,11 @@
+--- registryd/Makefile.in.orig	Fri Aug  8 12:15:34 2003
++++ registryd/Makefile.in	Fri Aug  8 12:20:05 2003
+@@ -150,7 +150,7 @@
+ at_spi_registryd_SOURCES =  	desktop.c			desktop.h			deviceeventcontroller.c		deviceeventcontroller.h		registry-main.c			registry.c			registry.h
+ 
+ 
+-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
++LDADD = -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
+ 
+ serverinfodir = $(prefix)/libdata/bonobo/servers
+ serverinfo_DATA = Accessibility_Registry.server
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 54c07250ed45..fe058837b88e 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -23,42 +23,41 @@ include/at-spi-1.0/libspi/relation.h
 include/at-spi-1.0/libspi/remoteobject.h
 include/at-spi-1.0/libspi/selection.h
 include/at-spi-1.0/libspi/stateset.h
+include/at-spi-1.0/libspi/streamablecontent.h
 include/at-spi-1.0/libspi/table.h
 include/at-spi-1.0/libspi/text.h
 include/at-spi-1.0/libspi/value.h
 lib/libcspi.a
 lib/libcspi.so
-lib/libcspi.so.0
+lib/libcspi.so.9
 lib/libspi.a
 lib/libspi.so
-lib/libspi.so.0
+lib/libspi.so.9
 lib/gtk-2.0/modules/libatk-bridge.so
 lib/orbit-2.0/Accessibility_module.so
 libdata/bonobo/servers/Accessibility_Registry.server
 libdata/pkgconfig/cspi-1.0.pc
 libdata/pkgconfig/libspi-1.0.pc
 libexec/at-spi-registryd
-share/doc/at-spi-cspi/at-spi-cspi-accessible-objects.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleaction-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleapplication-api.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblecomponent-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleeditabletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehyperlink-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehypertext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleimage-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblerelations-and-relationsets.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleselection-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletable-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblevalue-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-event-listener-support.html
-share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html
-share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html
-share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html
-share/doc/at-spi-cspi/book1.html
-share/doc/at-spi-cspi/c5968.html
-share/doc/at-spi-cspi/c7152.html
-share/doc/at-spi-cspi/index.sgml
+share/doc/at-spi-cspi/at-spi-cspi-Accessible-Objects.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleAction-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleApplication-API.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleComponent-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleEditableText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHyperlink-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHypertext-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleImage-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleRelations-and-RelationSets.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleSelection-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleTable-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleValue-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-Event-Listener-Support.html
+share/doc/at-spi-cspi/at-spi-cspi-Registry-queries.html
+share/doc/at-spi-cspi/at-spi-cspi-SPI-main-loop-and-initialization.html
+share/doc/at-spi-cspi/at-spi-cspi-State-and-StateSets.html
+share/doc/at-spi-cspi/ch05.html
+share/doc/at-spi-cspi/index.html
 share/doc/at-spi-cspi/spi-accessible.html
 share/doc/at-spi-cspi/spi-application.html
 share/doc/at-spi-cspi/spi-component.html
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index c1e90ae997ae..cdb15a965be0 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -6,16 +6,11 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.2.4
+PORTVERSION=	1.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
-#MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-#		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-#		http://www.ameth.org/gimp/%SUBDIR%/ \
-#		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-#MASTER_SITE_SUBDIR=	gtk/v1.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index dba292c1ff10..dd36e926e35d 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-1.2.4.tar.bz2) = 2d6d50df31abe0e8892b5d3e7676a02d
+MD5 (gnome2/atk-1.4.0.tar.bz2) = e501dde880fb2bbe77e428cfa2ee25f6
diff --git a/accessibility/atk/pkg-descr b/accessibility/atk/pkg-descr
index c962374e2a31..b28d3e537b26 100644
--- a/accessibility/atk/pkg-descr
+++ b/accessibility/atk/pkg-descr
@@ -1,3 +1,12 @@
-GNOME accessibility toolkit (ATK).
+Accessibility means helping people with disabilities to participate in
+substantial life activities. That includes work, and the use of services,
+products, and information. GNOME includes libraries and a support framework
+that allow people with disabilities to utilize all of the functionality of the
+GNOME user environment.
+
+The GNOME Accessibility Toolkit (ATK) describes a set of interfaces that need
+to be implemented by GUI components to make them accessible. The interfaces are
+toolkit-independent-- implementations could be written for any widget set, such
+as GTK, Motif or Qt.
 
 WWW: http://developer.gnome.org/projects/gap/
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index dc154a81a2b3..85189b700f6f 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -26,38 +26,39 @@ include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk-1.0.a
 lib/libatk-1.0.so
-lib/libatk-1.0.so.200
+lib/libatk-1.0.so.400
 libdata/pkgconfig/atk.pc
-share/doc/atk/atk-atkstate.html
-share/doc/atk/atk.html
-share/doc/atk/atkaction.html
-share/doc/atk/atkcomponent.html
-share/doc/atk/atkdocument.html
-share/doc/atk/atkeditabletext.html
-share/doc/atk/atkgobjectaccessible.html
-share/doc/atk/atkhyperlink.html
-share/doc/atk/atkhypertext.html
-share/doc/atk/atkimage.html
-share/doc/atk/atknoopobject.html
-share/doc/atk/atknoopobjectfactory.html
-share/doc/atk/atkobject.html
-share/doc/atk/atkobjectfactory.html
-share/doc/atk/atkregistry.html
-share/doc/atk/atkrelation.html
-share/doc/atk/atkrelationset.html
-share/doc/atk/atkselection.html
-share/doc/atk/atkstateset.html
-share/doc/atk/atkstreamablecontent.html
-share/doc/atk/atktable.html
-share/doc/atk/atktext.html
-share/doc/atk/atkutil.html
-share/doc/atk/atkvalue.html
-share/doc/atk/book1.html
-share/doc/atk/home.png
-share/doc/atk/index.sgml
-share/doc/atk/left.png
-share/doc/atk/right.png
-share/doc/atk/up.png
+%%DOCSDIR%%/AtkAction.html
+%%DOCSDIR%%/AtkComponent.html
+%%DOCSDIR%%/AtkDocument.html
+%%DOCSDIR%%/AtkEditableText.html
+%%DOCSDIR%%/AtkGObjectAccessible.html
+%%DOCSDIR%%/AtkHyperlink.html
+%%DOCSDIR%%/AtkHypertext.html
+%%DOCSDIR%%/AtkImage.html
+%%DOCSDIR%%/AtkNoOpObject.html
+%%DOCSDIR%%/AtkNoOpObjectFactory.html
+%%DOCSDIR%%/AtkObject.html
+%%DOCSDIR%%/AtkObjectFactory.html
+%%DOCSDIR%%/AtkRegistry.html
+%%DOCSDIR%%/AtkRelation.html
+%%DOCSDIR%%/AtkRelationSet.html
+%%DOCSDIR%%/AtkSelection.html
+%%DOCSDIR%%/AtkStateSet.html
+%%DOCSDIR%%/AtkStreamableContent.html
+%%DOCSDIR%%/AtkTable.html
+%%DOCSDIR%%/AtkText.html
+%%DOCSDIR%%/AtkUtil.html
+%%DOCSDIR%%/AtkValue.html
+%%DOCSDIR%%/atk-AtkState.html
+%%DOCSDIR%%/atk.devhelp
+%%DOCSDIR%%/atk.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/up.png
 share/locale/am/LC_MESSAGES/atk10.mo
 share/locale/az/LC_MESSAGES/atk10.mo
 share/locale/be/LC_MESSAGES/atk10.mo
@@ -65,6 +66,7 @@ share/locale/bg/LC_MESSAGES/atk10.mo
 share/locale/bn/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/el/LC_MESSAGES/atk10.mo
@@ -74,6 +76,7 @@ share/locale/es/LC_MESSAGES/atk10.mo
 share/locale/fa/LC_MESSAGES/atk10.mo
 share/locale/fi/LC_MESSAGES/atk10.mo
 share/locale/fr/LC_MESSAGES/atk10.mo
+share/locale/ga/LC_MESSAGES/atk10.mo
 share/locale/he/LC_MESSAGES/atk10.mo
 share/locale/hi/LC_MESSAGES/atk10.mo
 share/locale/hu/LC_MESSAGES/atk10.mo
@@ -83,11 +86,13 @@ share/locale/it/LC_MESSAGES/atk10.mo
 share/locale/ja/LC_MESSAGES/atk10.mo
 share/locale/kn/LC_MESSAGES/atk10.mo
 share/locale/ko/LC_MESSAGES/atk10.mo
+share/locale/li/LC_MESSAGES/atk10.mo
 share/locale/lv/LC_MESSAGES/atk10.mo
 share/locale/mk/LC_MESSAGES/atk10.mo
 share/locale/ml/LC_MESSAGES/atk10.mo
 share/locale/mn/LC_MESSAGES/atk10.mo
 share/locale/ms/LC_MESSAGES/atk10.mo
+share/locale/ne/LC_MESSAGES/atk10.mo
 share/locale/nl/LC_MESSAGES/atk10.mo
 share/locale/no/LC_MESSAGES/atk10.mo
 share/locale/pl/LC_MESSAGES/atk10.mo
@@ -108,6 +113,6 @@ share/locale/vi/LC_MESSAGES/atk10.mo
 share/locale/yi/LC_MESSAGES/atk10.mo
 share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
-@dirrm share/doc/atk
+@dirrm %%DOCSDIR%%
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 2f81cac2a9a8..9a66364bd004 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	1.2.2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 7b01394f42b0..1c8abbab58fe 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-1.2.2.tar.bz2) = cace76d052501c10f57c145618205509
+MD5 (gnome2/gail-1.4.0.tar.bz2) = 6eba35f812cf007da332a9fef4865e71
diff --git a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in
new file mode 100644
index 000000000000..c61bc365ad8f
--- /dev/null
+++ b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/libgail-util/Makefile.in.orig	Thu May 15 14:45:49 2003
++++ docs/reference/libgail-util/Makefile.in	Thu May 15 14:47:43 2003
+@@ -299,8 +299,6 @@
+ 	echo '-- Installing '$$i ; \
+ 	$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+ 	fi)
+ 
+ #
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index a947bd3a9d5d..a45c4b6a4380 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -8,9 +8,11 @@ lib/libgailutil.so
 lib/libgailutil.so.17
 libdata/pkgconfig/gail.pc
 share/doc/gail-libgail-util/book1.html
+share/doc/gail-libgail-util/gail-libgail-util-GailMisc.html
+share/doc/gail-libgail-util/gail-libgail-util-GailTextUtil.html
 share/doc/gail-libgail-util/gail-libgail-util-gailmisc.html
 share/doc/gail-libgail-util/gail-libgail-util-gailtextutil.html
-share/doc/gail-libgail-util/index.sgml
+share/doc/gail-libgail-util/index.html
 share/doc/gail-libgail-util/libgail-util-main.html
 @dirrm share/doc/gail-libgail-util
 @dirrm lib/gtk-2.0/modules
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 020a95a5f68e..405fba06569d 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	gok
-PORTVERSION=	0.7.5
-CATEGORIES=	sysutils gnome
+PORTVERSION=	0.8.2
+CATEGORIES=	sysutils gnome accessibility
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME On-Screen Keyboard (GOK)
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
 USE_REINPLACE=	yes
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 243d98493042..76fde0ba0bf1 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gok-0.7.5.tar.gz) = 8ae32031b253371eb76be5f59c26bafd
+MD5 (gnome2/gok-0.8.2.tar.bz2) = 3b495c7b8f8e10e370246c95d75f58eb
diff --git a/accessibility/gok/files/patch-gok_gok-data.c b/accessibility/gok/files/patch-gok_gok-data.c
index 901b763b08ab..e69de29bb2d1 100644
--- a/accessibility/gok/files/patch-gok_gok-data.c
+++ b/accessibility/gok/files/patch-gok_gok-data.c
@@ -1,12 +0,0 @@
---- gok/gok-data.c.orig	Mon Jun  2 21:49:16 2003
-+++ gok/gok-data.c	Mon Jun  2 21:49:26 2003
-@@ -707,8 +707,8 @@
-  */
- void gok_data_set_is_dock (GokDockType val)
- {
--	m_eDockType = val;
- 	gchar *typestring;
-+	m_eDockType = val;
- 	switch (val) {
- 	case GOK_DOCK_TOP:
- 	  typestring = "top";
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 35335cb46f8b..bdcaccbfbc81 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -19,6 +19,7 @@ etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gok/spy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell/%gconf.xml
@@ -39,65 +40,77 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy/%gconf.xml
 etc/gconf/schemas/gok.schemas
 libdata/pkgconfig/gok-1.0.pc
-share/doc/gok/c4.html
-share/doc/gok/gok-arraylist.html
-share/doc/gok/gok-callbacks.html
-share/doc/gok/gok-command-common.html
-share/doc/gok/gok-command-edge-data.html
-share/doc/gok/gok-command-edge.html
-share/doc/gok/gok-command-graph.html
-share/doc/gok/gok-command-predictor.html
-share/doc/gok/gok-command-vertex-data.html
-share/doc/gok/gok-command-vertex.html
-share/doc/gok/gok-global.html
-share/doc/gok/gok-gok-action.html
-share/doc/gok/gok-gok-branchback-stack.html
-share/doc/gok/gok-gok-chunker.html
-share/doc/gok/gok-gok-control.html
-share/doc/gok/gok-gok-data.html
-share/doc/gok/gok-gok-editor.html
-share/doc/gok/gok-gok-feedback.html
-share/doc/gok/gok-gok-file-util.html
-share/doc/gok/gok-gok-gconf-keys.html
-share/doc/gok/gok-gok-gconf.html
-share/doc/gok/gok-gok-key.html
-share/doc/gok/gok-gok-keyboard.html
-share/doc/gok/gok-gok-keyslotter.html
-share/doc/gok/gok-gok-log-priv.html
-share/doc/gok/gok-gok-log-reader.html
-share/doc/gok/gok-gok-log.html
-share/doc/gok/gok-gok-modifier.html
-share/doc/gok/gok-gok-output.html
-share/doc/gok/gok-gok-page-accessmethod.html
-share/doc/gok/gok-gok-page-actions.html
-share/doc/gok/gok-gok-page-feedbacks.html
-share/doc/gok/gok-gok-page-keysizespace.html
-share/doc/gok/gok-gok-page-wordcomplete.html
-share/doc/gok/gok-gok-predictor.html
-share/doc/gok/gok-gok-scanner.html
-share/doc/gok/gok-gok-settings-dialog.html
-share/doc/gok/gok-gok-sound.html
-share/doc/gok/gok-gok-spy-priv.html
-share/doc/gok/gok-gok-spy.html
-share/doc/gok/gok-gok-word-complete.html
-share/doc/gok/gok-gok.html
-share/doc/gok/gok-gokbutton.html
-share/doc/gok/gok-gtkjoyswitch.html
-share/doc/gok/gok-interface.html
-share/doc/gok/gok-main.html
-share/doc/gok/gok-support.html
-share/doc/gok/gok-switchapi.html
-share/doc/gok/gok-word-complete.html
-share/doc/gok/index.html
-share/doc/gok/index.sgml
+%%DOCSDIR%%/c4.html
+%%DOCSDIR%%/gok-arraylist.html
+%%DOCSDIR%%/gok-callbacks.html
+%%DOCSDIR%%/gok-command-common.html
+%%DOCSDIR%%/gok-command-edge-data.html
+%%DOCSDIR%%/gok-command-edge.html
+%%DOCSDIR%%/gok-command-graph.html
+%%DOCSDIR%%/gok-command-predictor.html
+%%DOCSDIR%%/gok-command-vertex-data.html
+%%DOCSDIR%%/gok-command-vertex.html
+%%DOCSDIR%%/gok-global.html
+%%DOCSDIR%%/gok-gok-action.html
+%%DOCSDIR%%/gok-gok-branchback-stack.html
+%%DOCSDIR%%/gok-gok-chunker.html
+%%DOCSDIR%%/gok-gok-control.html
+%%DOCSDIR%%/gok-gok-data.html
+%%DOCSDIR%%/gok-gok-editor.html
+%%DOCSDIR%%/gok-gok-feedback.html
+%%DOCSDIR%%/gok-gok-file-util.html
+%%DOCSDIR%%/gok-gok-gconf-keys.html
+%%DOCSDIR%%/gok-gok-gconf.html
+%%DOCSDIR%%/gok-gok-key.html
+%%DOCSDIR%%/gok-gok-keyboard.html
+%%DOCSDIR%%/gok-gok-keyslotter.html
+%%DOCSDIR%%/gok-gok-log-priv.html
+%%DOCSDIR%%/gok-gok-log-reader.html
+%%DOCSDIR%%/gok-gok-log.html
+%%DOCSDIR%%/gok-gok-modifier.html
+%%DOCSDIR%%/gok-gok-output.html
+%%DOCSDIR%%/gok-gok-page-accessmethod.html
+%%DOCSDIR%%/gok-gok-page-actions.html
+%%DOCSDIR%%/gok-gok-page-feedbacks.html
+%%DOCSDIR%%/gok-gok-page-keysizespace.html
+%%DOCSDIR%%/gok-gok-page-wordcomplete.html
+%%DOCSDIR%%/gok-gok-predictor.html
+%%DOCSDIR%%/gok-gok-scanner.html
+%%DOCSDIR%%/gok-gok-settings-dialog.html
+%%DOCSDIR%%/gok-gok-sound.html
+%%DOCSDIR%%/gok-gok-spy-priv.html
+%%DOCSDIR%%/gok-gok-spy.html
+%%DOCSDIR%%/gok-gok-word-complete.html
+%%DOCSDIR%%/gok-gok.html
+%%DOCSDIR%%/gok-gokbutton.html
+%%DOCSDIR%%/gok-gtkjoyswitch.html
+%%DOCSDIR%%/gok-interface.html
+%%DOCSDIR%%/gok-main.html
+%%DOCSDIR%%/gok-support.html
+%%DOCSDIR%%/gok-switchapi.html
+%%DOCSDIR%%/gok-word-complete.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+share/gnome/applications/gok.desktop
+share/gnome/gok/East.png
 share/gnome/gok/Keyboard.kbd
+share/gnome/gok/NE.png
+share/gnome/gok/NW.png
+share/gnome/gok/North.png
+share/gnome/gok/SE.png
+share/gnome/gok/SW.png
+share/gnome/gok/South.png
+share/gnome/gok/West.png
 share/gnome/gok/alphabet.kbd
 share/gnome/gok/automatic-scanning.xam
 share/gnome/gok/dictionary.txt
 share/gnome/gok/direct-selection.xam
 share/gnome/gok/dwell-selection.xam
+share/gnome/gok/empty.png
+share/gnome/gok/gok.png
 share/gnome/gok/gok.rc
 share/gnome/gok/gok-controls.kbd
 share/gnome/gok/goklogo.png
@@ -105,38 +118,60 @@ share/gnome/gok/goksound1.wav
 share/gnome/gok/goksound2.wav
 share/gnome/gok/inverse-scanning.xam
 share/gnome/gok/hide.kbd
+share/gnome/gok/latched.png
 share/gnome/gok/launcher.kbd
+share/gnome/gok/locked.png
 share/gnome/gok/main.kbd
 share/gnome/gok/manage.kbd
+share/gnome/gok/mouse.kbd
 share/gnome/gok/move-resize.kbd
+share/gnome/gok/quit.kbd
 share/gnome/gok/qwerty.kbd
+share/gnome/gok/small-empty.png
+share/gnome/gok/text-operations.kbd
 share/gnome/help/gok/C/gok.xml
 share/gnome/omf/gok/gok-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true
+share/gnome/pixmaps/gok.png
 share/locale/am/LC_MESSAGES/gok.mo
+share/locale/az/LC_MESSAGES/gok.mo
+share/locale/be/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
 share/locale/da/LC_MESSAGES/gok.mo
 share/locale/de/LC_MESSAGES/gok.mo
+share/locale/el/LC_MESSAGES/gok.mo
 share/locale/es/LC_MESSAGES/gok.mo
 share/locale/fr/LC_MESSAGES/gok.mo
+share/locale/hi/LC_MESSAGES/gok.mo
 share/locale/it/LC_MESSAGES/gok.mo
 share/locale/ja/LC_MESSAGES/gok.mo
+share/locale/ko/LC_MESSAGES/gok.mo
+share/locale/mk/LC_MESSAGES/gok.mo
+share/locale/ml/LC_MESSAGES/gok.mo
+share/locale/ms/LC_MESSAGES/gok.mo
 share/locale/nl/LC_MESSAGES/gok.mo
 share/locale/no/LC_MESSAGES/gok.mo
+share/locale/pl/LC_MESSAGES/gok.mo
 share/locale/pt/LC_MESSAGES/gok.mo
 share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/sl/LC_MESSAGES/gok.mo
+share/locale/sq/LC_MESSAGES/gok.mo
 share/locale/sr/LC_MESSAGES/gok.mo
 share/locale/sr@Latn/LC_MESSAGES/gok.mo
 share/locale/sv/LC_MESSAGES/gok.mo
 share/locale/uk/LC_MESSAGES/gok.mo
 share/locale/vi/LC_MESSAGES/gok.mo
+share/locale/zh_CN/LC_MESSAGES/gok.mo
+share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrm share/gnome/omf/gok
 @dirrm share/gnome/help/gok/C/figures
 @dirrm share/gnome/help/gok/C
 @dirrm share/gnome/help/gok
 @dirrm share/gnome/gok
-@dirrm share/doc/gok
+@dirrm %%DOCSDIR%%
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing
@@ -157,6 +192,7 @@ share/locale/vi/LC_MESSAGES/gok.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok
+@dirrm etc/gconf/gconf.xml.defaults/apps/gok/spy
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/layout
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing
@@ -177,4 +213,4 @@ share/locale/vi/LC_MESSAGES/gok.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true