4 files changed, 123 insertions, 60 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index cecbd610282b..5761fff80844 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.6.1.1
+PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,9 +24,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack lthack gnomehier libbonoboui
+USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 47b24e35c1a8..7b6c6e3427a2 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeui-2.6.1.1.tar.bz2) = 16e6717b5d7da982db00fea6167188ef
-SIZE (gnome2/libgnomeui-2.6.1.1.tar.bz2) = 1505062
+MD5 (gnome2/libgnomeui-2.8.0.tar.bz2) = ef0df128e3c0b2047ce440bbbe481390
+SIZE (gnome2/libgnomeui-2.8.0.tar.bz2) = 1623044
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c
new file mode 100644
index 000000000000..8c5bbd501398
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c
@@ -0,0 +1,20 @@
+--- libgnomeui/gnome-ice.c.orig	Fri Oct 22 23:22:11 2004
++++ libgnomeui/gnome-ice.c	Fri Oct 22 23:22:38 2004
+@@ -54,6 +54,8 @@
+   IceConn connection = (IceConn) data;
+   IceProcessMessagesStatus status;
+ 
++  GDK_THREADS_ENTER();
++
+   status = IceProcessMessages (connection, NULL, NULL);
+ 
+   if (status == IceProcessMessagesIOError)
+@@ -73,6 +75,8 @@
+ 	  IceCloseConnection (connection);
+ 	}
+     }
++
++  GDK_THREADS_LEAVE();
+ 
+   return TRUE;
+ }
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 249cdf07e79a..ad14752b1e83 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -53,61 +53,97 @@ lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so
 lib/libglade/2.0/libgnome.so
 lib/libgnomeui-2.a
 lib/libgnomeui-2.so
-lib/libgnomeui-2.so.600
+lib/libgnomeui-2.so.800
 libdata/pkgconfig/libgnomeui-2.0.pc
 libexec/gnome_segv2
-%%DOCSDIR%%/GnomeAbout.html
-%%DOCSDIR%%/GnomeApp.html
-%%DOCSDIR%%/GnomeAppBar.html
-%%DOCSDIR%%/GnomeClient.html
-%%DOCSDIR%%/GnomeColorPicker.html
-%%DOCSDIR%%/GnomeDateEdit.html
-%%DOCSDIR%%/GnomeDialog.html
-%%DOCSDIR%%/GnomeDruid.html
-%%DOCSDIR%%/GnomeDruidPage.html
-%%DOCSDIR%%/GnomeDruidPageEdge.html
-%%DOCSDIR%%/GnomeDruidPageStandard.html
-%%DOCSDIR%%/GnomeEntry.html
-%%DOCSDIR%%/GnomeFileEntry.html
-%%DOCSDIR%%/GnomeFontPicker.html
-%%DOCSDIR%%/GnomeHRef.html
-%%DOCSDIR%%/GnomeIconEntry.html
-%%DOCSDIR%%/GnomeIconList.html
-%%DOCSDIR%%/GnomeIconSelection.html
-%%DOCSDIR%%/GnomeMDI.html
-%%DOCSDIR%%/GnomeMDIChild.html
-%%DOCSDIR%%/GnomeMDIGenericChild.html
-%%DOCSDIR%%/GnomeMessageBox.html
-%%DOCSDIR%%/GnomePixmap.html
-%%DOCSDIR%%/GnomePixmapEntry.html
-%%DOCSDIR%%/GnomePropertyBox.html
-%%DOCSDIR%%/GnomeScores.html
-%%DOCSDIR%%/application-mgmt.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/deprecated.html
-%%DOCSDIR%%/druids.html
-%%DOCSDIR%%/fixme.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/libgnomeui-GnomeIconLookup.html
-%%DOCSDIR%%/libgnomeui-GnomeIconTheme.html
-%%DOCSDIR%%/libgnomeui-GnomeThemeFile.html
-%%DOCSDIR%%/libgnomeui-GnomeThumbnail.html
-%%DOCSDIR%%/libgnomeui-gnome-app-helper.html
-%%DOCSDIR%%/libgnomeui-gnome-app-util.html
-%%DOCSDIR%%/libgnomeui-gnome-dialog-util.html
-%%DOCSDIR%%/libgnomeui-gnome-mdi-session.html
-%%DOCSDIR%%/libgnomeui-gnome-popup-menu.html
-%%DOCSDIR%%/libgnomeui-gnome-stock-icons.html
-%%DOCSDIR%%/libgnomeui-gnome-types.html
-%%DOCSDIR%%/libgnomeui-gnome-ui-init.html
-%%DOCSDIR%%/libgnomeui-gnome-uidefs.html
-%%DOCSDIR%%/libgnomeui-gnome-vfs-util.html
-%%DOCSDIR%%/libgnomeui-gnome-window.html
-%%DOCSDIR%%/libgnomeui-gnometypebuiltins.html
-%%DOCSDIR%%/libgnomeui-objects.html
-%%DOCSDIR%%/miscellaneous.html
-%%DOCSDIR%%/style.css
+share/doc/libgnomeui/GnomeAbout.html
+share/doc/libgnomeui/GnomeApp.html
+share/doc/libgnomeui/GnomeAppBar.html
+share/doc/libgnomeui/GnomeClient.html
+share/doc/libgnomeui/GnomeColorPicker.html
+share/doc/libgnomeui/GnomeDateEdit.html
+share/doc/libgnomeui/GnomeDialog.html
+share/doc/libgnomeui/GnomeDruid.html
+share/doc/libgnomeui/GnomeDruidPage.html
+share/doc/libgnomeui/GnomeDruidPageEdge.html
+share/doc/libgnomeui/GnomeDruidPageStandard.html
+share/doc/libgnomeui/GnomeEntry.html
+share/doc/libgnomeui/GnomeFileEntry.html
+share/doc/libgnomeui/GnomeFontPicker.html
+share/doc/libgnomeui/GnomeHRef.html
+share/doc/libgnomeui/GnomeIconEntry.html
+share/doc/libgnomeui/GnomeIconList.html
+share/doc/libgnomeui/GnomeIconSelection.html
+share/doc/libgnomeui/GnomeMDI.html
+share/doc/libgnomeui/GnomeMDIChild.html
+share/doc/libgnomeui/GnomeMDIGenericChild.html
+share/doc/libgnomeui/GnomeMessageBox.html
+share/doc/libgnomeui/GnomePixmap.html
+share/doc/libgnomeui/GnomePixmapEntry.html
+share/doc/libgnomeui/GnomePropertyBox.html
+share/doc/libgnomeui/GnomeScores.html
+share/doc/libgnomeui/application-mgmt.html
+share/doc/libgnomeui/ch01.html
+share/doc/libgnomeui/deprecated.html
+share/doc/libgnomeui/druids.html
+share/doc/libgnomeui/fixme.html
+share/doc/libgnomeui/home.png
+share/doc/libgnomeui/index.html
+share/doc/libgnomeui/index.sgml
+share/doc/libgnomeui/left.png
+share/doc/libgnomeui/libgnomeui-GnomeIconLookup.html
+share/doc/libgnomeui/libgnomeui-GnomeIconTheme.html
+share/doc/libgnomeui/libgnomeui-GnomeThemeFile.html
+share/doc/libgnomeui/libgnomeui-GnomeThumbnail.html
+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-mdi-session.html
+share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html
+share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html
+share/doc/libgnomeui/libgnomeui-gnome-types.html
+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-gnometypebuiltins.html
+share/doc/libgnomeui/libgnomeui-objects.html
+share/doc/libgnomeui/libgnomeui.devhelp
+share/doc/libgnomeui/miscellaneous.html
+share/doc/libgnomeui/right.png
+share/doc/libgnomeui/stock_attach.png
+share/doc/libgnomeui/stock_book_blue.png
+share/doc/libgnomeui/stock_book_green.png
+share/doc/libgnomeui/stock_book_open.png
+share/doc/libgnomeui/stock_book_red.png
+share/doc/libgnomeui/stock_book_yellow.png
+share/doc/libgnomeui/stock_line_in.png
+share/doc/libgnomeui/stock_mail.png
+share/doc/libgnomeui/stock_mail_compose.png
+share/doc/libgnomeui/stock_mail_forward.png
+share/doc/libgnomeui/stock_mail_receive.png
+share/doc/libgnomeui/stock_mail_reply.png
+share/doc/libgnomeui/stock_mail_send.png
+share/doc/libgnomeui/stock_menu_about.png
+share/doc/libgnomeui/stock_menu_blank.png
+share/doc/libgnomeui/stock_mic.png
+share/doc/libgnomeui/stock_midi.png
+share/doc/libgnomeui/stock_multiple_file.png
+share/doc/libgnomeui/stock_not.png
+share/doc/libgnomeui/stock_scores.png
+share/doc/libgnomeui/stock_table_borders.png
+share/doc/libgnomeui/stock_table_fill.png
+share/doc/libgnomeui/stock_text_bulleted_list.png
+share/doc/libgnomeui/stock_text_indent.png
+share/doc/libgnomeui/stock_text_numbered_list.png
+share/doc/libgnomeui/stock_text_unindent.png
+share/doc/libgnomeui/stock_timer.png
+share/doc/libgnomeui/stock_timer_stopped.png
+share/doc/libgnomeui/stock_trash.png
+share/doc/libgnomeui/stock_trash_full.png
+share/doc/libgnomeui/stock_volume.png
+share/doc/libgnomeui/style.css
+share/doc/libgnomeui/up.png
 share/gnome/pixmaps/gnome-about-logo.png
 share/gnome/pixmaps/gnome-default-dlg.png
 share/gnome/pixmaps/gnome-error.png
@@ -121,6 +157,8 @@ 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/bn/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/br/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/bs/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo
@@ -137,6 +175,7 @@ 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/gl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/gu/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
@@ -157,6 +196,8 @@ share/locale/ml/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/mr/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/nb/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ne/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
@@ -175,6 +216,7 @@ share/locale/sr@ije/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/th/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/tk/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
@@ -182,7 +224,7 @@ 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 %%DOCSDIR%%
+@dirrm share/doc/libgnomeui
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems