Update to GNOME 2.2.

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

8 files changed, 70 insertions, 52 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 3a7c61b84520..94b107947b2e 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.0.7
+PORTVERSION=	2.2.0.3
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.2
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -29,9 +29,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=	archive-generator.1 gnome-calculator.1 \
+MAN1=	gnome-calculator.1 \
 	gnome-character-map.1 gnome-dictionary.1 \
-	gnome-search-tool.1 gnome-system-log.1
+	gnome-search-tool.1 gnome-system-log.1 gdialog.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index faead41ee708..c03547bae072 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.0.7.tar.bz2) = 84751dc1ccf07c1dd19746404f7dee88
+MD5 (gnome2/gnome-utils-2.2.0.3.tar.bz2) = cef6a3be39d160cf5e2a371293044f7f
diff --git a/deskutils/gnome-utils/files/patch-configure b/deskutils/gnome-utils/files/patch-configure
index f562f261364b..d5d7d0e103f2 100644
--- a/deskutils/gnome-utils/files/patch-configure
+++ b/deskutils/gnome-utils/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Jan 13 06:31:59 2003
-+++ configure	Mon Jan 13 19:40:06 2003
-@@ -10323,7 +10323,7 @@
+--- configure.orig	Mon Nov 25 09:25:29 2002
++++ configure	Tue Nov 26 16:04:42 2002
+@@ -10347,7 +10347,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 3a44db63e89f..9172619a8a13 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,15 +1,17 @@
-bin/archive-generator
+bin/gdialog
 bin/gnome-calculator
 bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
 etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
+etc/gconf/schemas/logview.schemas
 etc/gconf/schemas/gdict.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
-share/gnome/applications/archive-generator.desktop
 share/gnome/applications/gnome-calculator.desktop
 share/gnome/applications/gnome-character-map.desktop
 share/gnome/applications/gnome-dictionary.desktop
@@ -19,43 +21,42 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/archive-generator/C/archive-generator.xml
-share/gnome/help/archive-generator/C/figures/archive-generator-contents.png
-share/gnome/help/archive-generator/C/figures/archive-generator.png
-share/gnome/help/archive-generator/C/legal.xml
+share/gnome/help/gdialog/C/figures/example-dialog.png
+share/gnome/help/gdialog/C/figures/gdialog-msgbox.png
+share/gnome/help/gdialog/C/figures/gdialog-yesno.png
+share/gnome/help/gdialog/C/gdialog.xml
+share/gnome/help/gdialog/C/legal.xml
 share/gnome/help/gnome-calculator/C/figures/gcalc_window.png
 share/gnome/help/gnome-calculator/C/gnome-calculator.xml
 share/gnome/help/gnome-calculator/C/legal.xml
 share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png
 share/gnome/help/gnome-character-map/C/gnome-character-map.xml
 share/gnome/help/gnome-character-map/C/legal.xml
-share/gnome/help/gnome-dictionary/C/figures/gdict-find.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-main.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png
 share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
 share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/C/legal.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png
-share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
 share/gnome/help/gnome-system-log/C/figures/syslog_window.png
 share/gnome/help/gnome-system-log/C/gnome-system-log.xml
 share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/omf/gnome-utils/archive-generator-C.omf
+share/gnome/omf/gnome-utils/gdialog-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-calculator-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-character-map-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-system-log-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdict.png
 share/gnome/pixmaps/gnome-character-map.png
 share/gnome/pixmaps/gnome-searchtool.png
-share/gnome/pixmaps/gnome-system-log/logview.xpm
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
@@ -74,12 +75,15 @@ share/locale/fi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo
@@ -115,9 +119,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-calculator/C/figures
 @dirrm share/gnome/help/gnome-calculator/C
 @dirrm share/gnome/help/gnome-calculator
-@dirrm share/gnome/help/archive-generator/C/figures
-@dirrm share/gnome/help/archive-generator/C
-@dirrm share/gnome/help/archive-generator
+@dirrm share/gnome/help/gdialog/C/figures
+@dirrm share/gnome/help/gdialog/C
 @dirrm share/gnome/gnome-system-log
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 3a7c61b84520..94b107947b2e 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.0.7
+PORTVERSION=	2.2.0.3
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.2
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -29,9 +29,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=	archive-generator.1 gnome-calculator.1 \
+MAN1=	gnome-calculator.1 \
 	gnome-character-map.1 gnome-dictionary.1 \
-	gnome-search-tool.1 gnome-system-log.1
+	gnome-search-tool.1 gnome-system-log.1 gdialog.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index faead41ee708..c03547bae072 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.0.7.tar.bz2) = 84751dc1ccf07c1dd19746404f7dee88
+MD5 (gnome2/gnome-utils-2.2.0.3.tar.bz2) = cef6a3be39d160cf5e2a371293044f7f
diff --git a/deskutils/gnomeutils2/files/patch-configure b/deskutils/gnomeutils2/files/patch-configure
index f562f261364b..d5d7d0e103f2 100644
--- a/deskutils/gnomeutils2/files/patch-configure
+++ b/deskutils/gnomeutils2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Jan 13 06:31:59 2003
-+++ configure	Mon Jan 13 19:40:06 2003
-@@ -10323,7 +10323,7 @@
+--- configure.orig	Mon Nov 25 09:25:29 2002
++++ configure	Tue Nov 26 16:04:42 2002
+@@ -10347,7 +10347,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 3a44db63e89f..9172619a8a13 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -1,15 +1,17 @@
-bin/archive-generator
+bin/gdialog
 bin/gnome-calculator
 bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
 etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
+etc/gconf/schemas/logview.schemas
 etc/gconf/schemas/gdict.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
-share/gnome/applications/archive-generator.desktop
 share/gnome/applications/gnome-calculator.desktop
 share/gnome/applications/gnome-character-map.desktop
 share/gnome/applications/gnome-dictionary.desktop
@@ -19,43 +21,42 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/archive-generator/C/archive-generator.xml
-share/gnome/help/archive-generator/C/figures/archive-generator-contents.png
-share/gnome/help/archive-generator/C/figures/archive-generator.png
-share/gnome/help/archive-generator/C/legal.xml
+share/gnome/help/gdialog/C/figures/example-dialog.png
+share/gnome/help/gdialog/C/figures/gdialog-msgbox.png
+share/gnome/help/gdialog/C/figures/gdialog-yesno.png
+share/gnome/help/gdialog/C/gdialog.xml
+share/gnome/help/gdialog/C/legal.xml
 share/gnome/help/gnome-calculator/C/figures/gcalc_window.png
 share/gnome/help/gnome-calculator/C/gnome-calculator.xml
 share/gnome/help/gnome-calculator/C/legal.xml
 share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png
 share/gnome/help/gnome-character-map/C/gnome-character-map.xml
 share/gnome/help/gnome-character-map/C/legal.xml
-share/gnome/help/gnome-dictionary/C/figures/gdict-find.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-main.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png
-share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png
 share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
 share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/C/legal.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png
-share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
 share/gnome/help/gnome-system-log/C/figures/syslog_window.png
 share/gnome/help/gnome-system-log/C/gnome-system-log.xml
 share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/omf/gnome-utils/archive-generator-C.omf
+share/gnome/omf/gnome-utils/gdialog-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-calculator-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-character-map-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-system-log-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdict.png
 share/gnome/pixmaps/gnome-character-map.png
 share/gnome/pixmaps/gnome-searchtool.png
-share/gnome/pixmaps/gnome-system-log/logview.xpm
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
@@ -74,12 +75,15 @@ share/locale/fi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo
@@ -115,9 +119,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-calculator/C/figures
 @dirrm share/gnome/help/gnome-calculator/C
 @dirrm share/gnome/help/gnome-calculator
-@dirrm share/gnome/help/archive-generator/C/figures
-@dirrm share/gnome/help/archive-generator/C
-@dirrm share/gnome/help/archive-generator
+@dirrm share/gnome/help/gdialog/C/figures
+@dirrm share/gnome/help/gdialog/C
 @dirrm share/gnome/gnome-system-log
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true