Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

12 files changed, 106 insertions, 49 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 98d621350f0c..475f05818565 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index f147d65aeeea..6440a59679ae 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1 +1 @@
-MD5 (gnome2/at-spi-1.0.2.tar.bz2) = a242b806b58d924b7f58f769ff4e2298
+MD5 (gnome2/at-spi-1.1.8.tar.bz2) = 76e2df52a280a794bde0e6dd259c01f8
diff --git a/accessibility/at-spi/files/patch-registryd_deviceeventcontroller.c b/accessibility/at-spi/files/patch-registryd_deviceeventcontroller.c
new file mode 100644
index 000000000000..161b17116292
--- /dev/null
+++ b/accessibility/at-spi/files/patch-registryd_deviceeventcontroller.c
@@ -0,0 +1,10 @@
+--- registryd/deviceeventcontroller.c.orig	Wed Nov 27 16:36:12 2002
++++ registryd/deviceeventcontroller.c	Wed Nov 27 16:38:21 2002
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <stdio.h>
++#include <sys/time.h>
+ #include <bonobo/bonobo-exception.h>
+ 
+ #include <X11/Xlib.h>
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 4b89257f26e7..639018a75a67 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -9,6 +9,7 @@ include/at-spi-1.0/libspi/action.h
 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/editabletext.h
 include/at-spi-1.0/libspi/eventlistener.h
 include/at-spi-1.0/libspi/hyperlink.h
@@ -27,10 +28,10 @@ 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.1
+lib/libcspi.so.8
 lib/libspi.a
 lib/libspi.so
-lib/libspi.so.1
+lib/libspi.so.8
 lib/gtk-2.0/modules/libatk-bridge.so
 lib/orbit-2.0/Accessibility_module.so
 libdata/bonobo/servers/Accessibility_Registry.server
@@ -55,8 +56,7 @@ 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/c6121.html
-share/doc/at-spi-cspi/c6124.html
+share/doc/at-spi-cspi/c5968.html
 share/doc/at-spi-cspi/index.sgml
 share/doc/at-spi-cspi/spi-accessible.html
 share/doc/at-spi-cspi/spi-application.html
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 5b20ed3bce09..6ca7fa395a88 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.0.3
+PORTVERSION=	1.2.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.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%/ \
@@ -20,19 +20,19 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-static
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
+CONFIGURE_ARGS=	--enable-static \
+		--disable-gtk-doc \
+		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
 .include <bsd.port.mk>
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index e6cf774217f5..50cdc842bcf9 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-1.0.3.tar.bz2) = 9041396017f8207b8aa2bece27eb5ebb
+MD5 (gnome2/atk-1.2.2.tar.bz2) = 2c42e4322d1a199cdd7479fb1d09879c
diff --git a/accessibility/atk/files/patch-Makefile.in b/accessibility/atk/files/patch-Makefile.in
index be30e08fdddc..90d6da723065 100644
--- a/accessibility/atk/files/patch-Makefile.in
+++ b/accessibility/atk/files/patch-Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Wed Aug  1 20:32:06 2001
-+++ Makefile.in	Wed Aug  1 20:33:45 2001
-@@ -96,7 +96,7 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
+--- Makefile.in.orig	Fri Nov  8 17:09:46 2002
++++ Makefile.in	Fri Nov  8 17:10:22 2002
+@@ -116,7 +116,7 @@
+ atktargetlib = @atktargetlib@
+ ms_librarian = @ms_librarian@
  
--SUBDIRS = atk tests docs
-+SUBDIRS = atk
+-SUBDIRS = atk tests docs po
++SUBDIRS = atk docs po
  
- EXTRA_DIST =  	atk-uninstalled.pc.in		atk.pc.in
+ EXTRA_DIST =  	atk-uninstalled.pc.in		atk.pc.in			atk.spec.in			atk.spec			atk-zip.sh
  
diff --git a/accessibility/atk/files/patch-docs_Makefile.in b/accessibility/atk/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..b40046ee22c3
--- /dev/null
+++ b/accessibility/atk/files/patch-docs_Makefile.in
@@ -0,0 +1,10 @@
+--- 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 a657b8a6397a..43664cddbf4e 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -15,6 +15,7 @@ include/atk-1.0/atk/atkobjectfactory.h
 include/atk-1.0/atk/atkregistry.h
 include/atk-1.0/atk/atkrelation.h
 include/atk-1.0/atk/atkrelationset.h
+include/atk-1.0/atk/atkrelationtype.h
 include/atk-1.0/atk/atkselection.h
 include/atk-1.0/atk/atkstate.h
 include/atk-1.0/atk/atkstateset.h
@@ -25,7 +26,59 @@ 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.0
+lib/libatk-1.0.so.200
 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/atkhypertext.html
+share/doc/atk/atkimage.html
+share/doc/atk/atkgobjectaccessible.html
+share/doc/atk/atkhyperlink.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/index.sgml
+share/locale/bg/LC_MESSAGES/atk10.mo
+share/locale/ca/LC_MESSAGES/atk10.mo
+share/locale/cs/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
+share/locale/en_GB/LC_MESSAGES/atk10.mo
+share/locale/es/LC_MESSAGES/atk10.mo
+share/locale/fi/LC_MESSAGES/atk10.mo
+share/locale/fr/LC_MESSAGES/atk10.mo
+share/locale/he/LC_MESSAGES/atk10.mo
+share/locale/hu/LC_MESSAGES/atk10.mo
+share/locale/it/LC_MESSAGES/atk10.mo
+share/locale/ko/LC_MESSAGES/atk10.mo
+share/locale/lv/LC_MESSAGES/atk10.mo
+share/locale/ms/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
+share/locale/ru/LC_MESSAGES/atk10.mo
+share/locale/sq/LC_MESSAGES/atk10.mo
+share/locale/sv/LC_MESSAGES/atk10.mo
+share/locale/uk/LC_MESSAGES/atk10.mo
+share/locale/vi/LC_MESSAGES/atk10.mo
+share/locale/zh_CN/LC_MESSAGES/atk10.mo
+@dirrm share/doc/atk
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 48007940b9a7..c3515535376d 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -6,29 +6,27 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	0.17
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.17
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
+LIB_DEPENDS=	gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gtk-doc
+CONFIGURE_ARGS=	--disable-gtk-doc \
+		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
 .include <bsd.port.mk>
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 0f5e123e0b37..e0c656f9b85e 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.17.tar.bz2) = 23d73923bd0947d5c975afa13b2de3a3
+MD5 (gnome2/gail-1.2.0.tar.bz2) = 8b5b960eb4f71656ff798e63401d1bf0
diff --git a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in
index a112ecbdca64..e69de29bb2d1 100644
--- a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in
+++ b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in
@@ -1,11 +0,0 @@
---- docs/reference/libgail-util/Makefile.in.orig	Tue Jul 23 12:42:03 2002
-+++ docs/reference/libgail-util/Makefile.in	Tue Jul 23 12:42:30 2002
-@@ -103,7 +103,7 @@
- 
- INSTALLDIR = $(prefix)/share/gtk-doc
- 
--HTML_DIR = ${datadir}/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-