Update to GNOME 2.2.

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

6 files changed, 56 insertions, 33 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 4c083e30cdb5..02af321003bc 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.0.6
+PORTVERSION=	2.2.0.1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 191f34d1164f..edd59de38133 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-2.0.6.tar.bz2) = 97a8c8f85f8b56174afc638321bfd641
+MD5 (gnome2/libgnome-2.2.0.1.tar.bz2) = 8735919b4ff0a6588f8da9d49220228d
diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure
index c444fc7c7117..d5a0a23fd4fa 100644
--- a/x11/libgnome/files/patch-configure
+++ b/x11/libgnome/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon May 13 13:03:40 2002
-+++ configure	Sun May 26 03:43:23 2002
-@@ -7186,6 +7186,7 @@
+--- configure.orig	Fri Nov  1 06:34:11 2002
++++ configure	Sat Nov  9 02:15:02 2002
+@@ -7964,6 +7964,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7471,7 +7472,7 @@
- LIBGNOME_AGE=0
+@@ -8335,7 +8336,7 @@
+ 
  
    case $host in
 -  *-linux-gnu | *-irix6*)
 +  *-linux-gnu | *-irix6* | *-freebsd*)
- cat >>confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
  #define HAVE_MAN_WHEREIS 1
- EOF
+ _ACEOF
diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
index d2267d824fcf..d8569e65c2db 100644
--- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
+++ b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
@@ -1,11 +1,15 @@
---- help-converters/gnome-vfs-module/Makefile.in.orig	Wed Aug  7 01:46:48 2002
-+++ help-converters/gnome-vfs-module/Makefile.in	Wed Aug  7 01:49:21 2002
-@@ -138,12 +138,12 @@
+--- help-converters/gnome-vfs-module/Makefile.in.orig	Tue Nov  5 00:53:20 2002
++++ help-converters/gnome-vfs-module/Makefile.in	Tue Nov  5 00:56:05 2002
+@@ -138,15 +138,15 @@
  cxxflags_set = @cxxflags_set@
  gnomelocaledir = @gnomelocaledir@
  
--INCLUDES =  	-I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
-+INCLUDES =  	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
+-INCLUDES = \
+-	-I$(top_srcdir)					\
++INCLUDES =	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" \
++	-DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) \
+ 	$(HELP_VFS_MODULE_CFLAGS)		\
+     -DSERVERDIR=\"$(libexecdir)\"
  
  
  modules_LTLIBRARIES = libvfs-help.la
@@ -14,4 +18,4 @@
 +module_flags = -export_dynamic -avoid-version -module
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
  
- libvfs_help_la_SOURCES =  	help-method.c		help-method.h		
+ libvfs_help_la_SOURCES = \
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 6b3a3178efba..21a31faff5fe 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- libgnome/Makefile.in.orig	Fri Apr 26 13:14:03 2002
-+++ libgnome/Makefile.in	Fri Apr 26 13:14:03 2002
-@@ -149,7 +149,7 @@
- 
+--- libgnome/Makefile.in.orig	Tue Nov  5 00:56:43 2002
++++ libgnome/Makefile.in	Tue Nov  5 00:58:40 2002
+@@ -149,6 +149,8 @@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
  
--INCLUDES =  	-I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
-+INCLUDES =  	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
- 
- 
- libgnome_2_la_SOURCES =  	libgnometypebuiltins.h		libgnometypebuiltins.c		gnome-config.c			gnome-sound.c			gnome-triggers.c		gnome-triggersP.h		gnome-program.c			gnome-help.c			gnome-exec.c			gnome-gconf.c			gnome-gconfP.h			gnome-i18n.c			gnome-i18nP.h			gnome-url.c			gnome-util.c			gnome-score.c			gnome-init.c
+ INCLUDES = \
++	-DPREFIX="\"$(PREFIX)"\" -DLOCALBASE="\"$(LOCALBASE)\"" \
++	-DX11BASE="\"$(X11BASE)"\"				\
+ 	-I..							\
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 826b9f698918..df26639e8376 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,3 +1,4 @@
+etc/gconf/gconf.xml.defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
@@ -14,6 +15,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
@@ -25,6 +27,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/start-here/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/system-settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
@@ -41,6 +44,7 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
@@ -63,6 +67,7 @@ etc/gconf/schemas/desktop_gnome_interface.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
 etc/gconf/schemas/desktop_gnome_sound.schemas
+etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
 etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/gnome-vfs-2.0/modules/help-methods.conf
 etc/sound/events/gnome-2.soundlist
@@ -86,14 +91,16 @@ lib/bonobo/monikers/libmoniker_extra_2.so
 lib/gnome-vfs-2.0/modules/libvfs-help.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.0
+lib/libgnome-2.so.200
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
 libexec/gnome2-db2html
 libexec/gnome2-info2html
 libexec/gnome2-man2html
+share/doc/libgnome/home.png
 share/doc/libgnome/index.html
 share/doc/libgnome/index.sgml
+share/doc/libgnome/left.png
 share/doc/libgnome/libgnome-gnome-config.html
 share/doc/libgnome/libgnome-gnome-exec.html
 share/doc/libgnome/libgnome-gnome-gconf.html
@@ -108,10 +115,12 @@ share/doc/libgnome/libgnome-gnome-url.html
 share/doc/libgnome/libgnome-gnome-util.html
 share/doc/libgnome/libgnome-libgnometypebuiltins.html
 share/doc/libgnome/libgnome.html
-share/doc/libgnome/x1311.html
-share/doc/libgnome/x2881.html
-share/doc/libgnome/x3341.html
-share/doc/libgnome/x4188.html
+share/doc/libgnome/right.png
+share/doc/libgnome/up.png
+share/doc/libgnome/x1296.html
+share/doc/libgnome/x2754.html
+share/doc/libgnome/x3411.html
+share/doc/libgnome/x4196.html
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
@@ -121,20 +130,31 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo
 share/locale/be/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bs/LC_MESSAGES/libgnome-2.0.mo
+share/locale/ca/LC_MESSAGES/libgnome-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnome-2.0.mo
 share/locale/da/LC_MESSAGES/libgnome-2.0.mo
 share/locale/de/LC_MESSAGES/libgnome-2.0.mo
 share/locale/el/LC_MESSAGES/libgnome-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo
 share/locale/es/LC_MESSAGES/libgnome-2.0.mo
+share/locale/et/LC_MESSAGES/libgnome-2.0.mo
 share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
+share/locale/fa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
+share/locale/he/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnome-2.0.mo
+share/locale/hu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/it/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
+share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnome-2.0.mo
+share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/no/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -166,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
@@ -193,6 +214,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard