Update to GNOME 2.2.

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

5 files changed, 82 insertions, 12 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 00f4eb3e66c8..6a2da9db23c0 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTVERSION=	2.2.0.1
 CATEGORIES=	x11-toolkits 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
 
-LIB_DEPENDS+=	bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui
+LIB_DEPENDS+=	bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS=	${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 16327a337d4c..7014f72c327e 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-2.0.6.tar.bz2) = 5915cc352f3c89705f9dc5d73a6a2600
+MD5 (gnome2/libgnomeui-2.2.0.1.tar.bz2) = f8cb4ecb5058e59a2df11a007323ae91
diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in
index a0bf02e31068..5eb473f9c1d8 100644
--- a/x11-toolkits/libgnomeui/files/patch-Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	Fri May 17 20:27:51 2002
-+++ Makefile.in	Fri May 17 20:29:00 2002
-@@ -115,7 +115,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
+--- Makefile.in.orig	Sat Nov  9 02:33:58 2002
++++ Makefile.in	Sat Nov  9 02:36:36 2002
+@@ -122,7 +122,7 @@
+ cxxflags_set = @cxxflags_set@
+ gnomelocaledir = @gnomelocaledir@
  
 -SUBDIRS = libgnomeui glade images demos test-gnome doc po #tests
 +SUBDIRS = libgnomeui glade images demos doc po #tests
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
new file mode 100644
index 000000000000..4aa372f11bb9
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
@@ -0,0 +1,11 @@
+--- libgnomeui/Makefile.in.orig	Sat Nov  9 02:37:09 2002
++++ libgnomeui/Makefile.in	Sat Nov  9 02:38:38 2002
+@@ -150,7 +150,7 @@
+         -DGNOMEUILIBDIR=\""$(libdir)"\" 		\
+         -DGNOMEUIDATADIR=\""$(datadir)"\" 		\
+         -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
+-        -DGNOMEUIICONDIR=\""$(datadir)/icons"\"	\
++        -DGNOMEUIICONDIR=\""$(prefix)/share/icons"\"	\
+         -DGNOMEUISERVERDIR=\""$(libexecdir)"\" 		\
+ 	-DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" 	\
+         -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\"	\
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index aafe82e641c8..77f82ec0b27a 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -21,7 +21,9 @@ include/libgnomeui-2.0/libgnomeui/gnome-ice.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-entry.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-item.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-list.h
+include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-sel.h
+include/libgnomeui-2.0/libgnomeui/gnome-icon-theme.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-child.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-generic-child.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-session.h
@@ -33,6 +35,8 @@ include/libgnomeui-2.0/libgnomeui/gnome-popup-menu.h
 include/libgnomeui-2.0/libgnomeui/gnome-propertybox.h
 include/libgnomeui-2.0/libgnomeui/gnome-scores.h
 include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h
+include/libgnomeui-2.0/libgnomeui/gnome-theme-parser.h
+include/libgnomeui-2.0/libgnomeui/gnome-thumbnail.h
 include/libgnomeui-2.0/libgnomeui/gnome-types.h
 include/libgnomeui-2.0/libgnomeui/gnome-ui-init.h
 include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h
@@ -44,10 +48,14 @@ include/libgnomeui-2.0/libgnomeui/libgnomeui.h
 lib/libglade/2.0/libgnome.so
 lib/libgnomeui-2.a
 lib/libgnomeui-2.so
-lib/libgnomeui-2.so.0
+lib/libgnomeui-2.so.200
 libdata/pkgconfig/libgnomeui-2.0.pc
 libexec/gnome_segv2
+share/doc/libgnomeui/application-mgmt.html
 share/doc/libgnomeui/c4.html
+share/doc/libgnomeui/deprecated.html
+share/doc/libgnomeui/druids.html
+share/doc/libgnomeui/fixme.html
 share/doc/libgnomeui/gnomeabout.html
 share/doc/libgnomeui/gnomeapp.html
 share/doc/libgnomeui/gnomeappbar.html
@@ -79,6 +87,9 @@ share/doc/libgnomeui/index.sgml
 share/doc/libgnomeui/libgnomeui-gnome-app-helper.html
 share/doc/libgnomeui/libgnomeui-gnome-app-util.html
 share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html
+share/doc/libgnomeui/libgnomeui-gnome-gconf-ui.html
+share/doc/libgnomeui/libgnomeui-gnome-ice.html
+share/doc/libgnomeui/libgnomeui-gnome-macros.html
 share/doc/libgnomeui/libgnomeui-gnome-mdi-session.html
 share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html
 share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html
@@ -87,12 +98,54 @@ share/doc/libgnomeui/libgnomeui-gnome-ui-init.html
 share/doc/libgnomeui/libgnomeui-gnome-uidefs.html
 share/doc/libgnomeui/libgnomeui-gnome-vfs-util.html
 share/doc/libgnomeui/libgnomeui-gnome-window.html
+share/doc/libgnomeui/libgnomeui-gnomeabout.html
+share/doc/libgnomeui/libgnomeui-gnomeapp.html
+share/doc/libgnomeui/libgnomeui-gnomeappbar.html
+share/doc/libgnomeui/libgnomeui-gnomeclient.html
+share/doc/libgnomeui/libgnomeui-gnomecolorpicker.html
+share/doc/libgnomeui/libgnomeui-gnomedateedit.html
+share/doc/libgnomeui/libgnomeui-gnomedialog.html
+share/doc/libgnomeui/libgnomeui-gnomedruid.html
+share/doc/libgnomeui/libgnomeui-gnomedruidpage.html
+share/doc/libgnomeui/libgnomeui-gnomedruidpageedge.html
+share/doc/libgnomeui/libgnomeui-gnomedruidpagestandard.html
+share/doc/libgnomeui/libgnomeui-gnomeentry.html
+share/doc/libgnomeui/libgnomeui-gnomefileentry.html
+share/doc/libgnomeui/libgnomeui-gnomefontpicker.html
+share/doc/libgnomeui/libgnomeui-gnomehref.html
+share/doc/libgnomeui/libgnomeui-gnomeiconentry.html
+share/doc/libgnomeui/libgnomeui-gnomeiconlist.html
+share/doc/libgnomeui/libgnomeui-gnomeiconlookup.html
+share/doc/libgnomeui/libgnomeui-gnomeiconselection.html
+share/doc/libgnomeui/libgnomeui-gnomeicontheme.html
+share/doc/libgnomeui/libgnomeui-gnomemdi.html
+share/doc/libgnomeui/libgnomeui-gnomemdichild.html
+share/doc/libgnomeui/libgnomeui-gnomemdigenericchild.html
+share/doc/libgnomeui/libgnomeui-gnomemessagebox.html
+share/doc/libgnomeui/libgnomeui-gnomepixmap.html
+share/doc/libgnomeui/libgnomeui-gnomepixmapentry.html
+share/doc/libgnomeui/libgnomeui-gnomepropertybox.html
+share/doc/libgnomeui/libgnomeui-gnomescores.html
+share/doc/libgnomeui/libgnomeui-gnomethemefile.html
+share/doc/libgnomeui/libgnomeui-gnomethumbnail.html
 share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html
 share/doc/libgnomeui/libgnomeui-objects.html
+share/doc/libgnomeui/miscellaneous.html
+share/doc/libgnomeui/x1427.html
 share/doc/libgnomeui/x1495.html
+share/doc/libgnomeui/x15441.html
+share/doc/libgnomeui/x15454.html
+share/doc/libgnomeui/x15523.html
 share/doc/libgnomeui/x15980.html
+share/doc/libgnomeui/x17879.html
+share/doc/libgnomeui/x17892.html
+share/doc/libgnomeui/x17961.html
 share/doc/libgnomeui/x18473.html
+share/doc/libgnomeui/x6079.html
+share/doc/libgnomeui/x6088.html
 share/doc/libgnomeui/x6263.html
+share/doc/libgnomeui/x7838.html
+share/doc/libgnomeui/x7859.html
 share/doc/libgnomeui/x8080.html
 share/gnome/pixmaps/gnome-about-logo.png
 share/gnome/pixmaps/gnome-default-dlg.png
@@ -100,8 +153,9 @@ share/gnome/pixmaps/gnome-error.png
 share/gnome/pixmaps/gnome-info.png
 share/gnome/pixmaps/gnome-question.png
 share/gnome/pixmaps/gnome-warning.png
-share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
@@ -114,6 +168,7 @@ share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/et/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
@@ -121,7 +176,10 @@ share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/no/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo