5 files changed, 24 insertions, 70 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index ecc70b99e3f1..aca6fc8bccec 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 7014f72c327e..6097e490908f 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-2.2.0.1.tar.bz2) = f8cb4ecb5058e59a2df11a007323ae91
+MD5 (gnome2/libgnomeui-2.2.1.tar.bz2) = 90305814535ae79ab48584728854f4b8
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
index 4aa372f11bb9..4f5b7e04a5a4 100644
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
@@ -1,11 +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)"\"	\
+--- libgnomeui/Makefile.in.orig	Wed Jun  4 10:23:03 2003
++++ libgnomeui/Makefile.in	Wed Jun  4 10:23:38 2003
+@@ -144,7 +144,7 @@
+ #
+ libgnomeuiincludedir = $(includedir)/libgnomeui-2.0/libgnomeui
+ 
+-INCLUDES =  	-I$(top_builddir)					-I$(top_srcdir)					        -DG_DISABLE_DEPRECATED				        -DGDK_DISABLE_DEPRECATED			        -DGDK_PIXBUF_DISABLE_DEPRECATED			        -DGNOMEUILIBDIR=\""$(libdir)"\" 		        -DGNOMEUIDATADIR=\""$(datadir)"\" 		        -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\"	        -DGNOMEUIICONDIR=\""$(datadir)/icons"\"	        -DGNOMEUISERVERDIR=\""$(libexecdir)"\" 			-DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" 	        -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\"		-DSYSCONFDIR=\""$(sysconfdir)"\"			-DG_LOG_DOMAIN=\"GnomeUI\"				$(WARN_CFLAGS)						$(LIBGNOMEUI_CFLAGS)
++INCLUDES =  	-I$(top_builddir)					-I$(top_srcdir)					        -DG_DISABLE_DEPRECATED				        -DGDK_DISABLE_DEPRECATED			        -DGDK_PIXBUF_DISABLE_DEPRECATED			        -DGNOMEUILIBDIR=\""$(libdir)"\" 		        -DGNOMEUIDATADIR=\""$(datadir)"\" 		        -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\"	        -DGNOMEUIICONDIR=\""$(datadir)/share/icons"\"	        -DGNOMEUISERVERDIR=\""$(libexecdir)"\" 			-DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" 	        -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\"		-DSYSCONFDIR=\""$(sysconfdir)"\"			-DG_LOG_DOMAIN=\"GnomeUI\"				$(WARN_CFLAGS)						$(LIBGNOMEUI_CFLAGS)
+ 
+ 
+ EXTRA_HEADERS = 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-app.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-app.c
deleted file mode 100644
index a359d9ae14db..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-app.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomeui/gnome-app.c.orig	Sat Apr 19 16:42:12 2003
-+++ libgnomeui/gnome-app.c	Sat Apr 19 16:42:21 2003
-@@ -194,7 +194,7 @@
- static void
- gnome_app_instance_init (GnomeApp *app)
- {
--	const char *icons;
-+	const char *icons = NULL;
- 		
- 	app->_priv = NULL;
- 	/* XXX: when there is some private stuff enable this
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 77f82ec0b27a..9cff7d5c4d84 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -74,6 +74,7 @@ share/doc/libgnomeui/gnomehref.html
 share/doc/libgnomeui/gnomeiconentry.html
 share/doc/libgnomeui/gnomeiconlist.html
 share/doc/libgnomeui/gnomeiconselection.html
+share/doc/libgnomeui/gnomeicontextitem.html
 share/doc/libgnomeui/gnomemdi.html
 share/doc/libgnomeui/gnomemdichild.html
 share/doc/libgnomeui/gnomemdigenericchild.html
@@ -87,9 +88,6 @@ 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
@@ -98,55 +96,13 @@ 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
 share/gnome/pixmaps/gnome-error.png
@@ -164,19 +120,26 @@ share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/eo/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/et/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/fa/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/ga/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/id/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/kn/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/ml/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
@@ -189,12 +152,15 @@ share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/sr/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrm share/doc/libgnomeui