Update to 2.5.90.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1949 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 117 insertions, 8 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index a78e6769b..4e9fb8227 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.5.90
+PORTVERSION=	2.5.90.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -29,5 +29,6 @@ USE_LIBTOOL=	yes
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+PLIST_SUB=	GTK_VERSION="2.2.0"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 9240bbc7f..5a12986ea 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeui-2.5.90.tar.bz2) = cb6bdd3d170b0e323c3bd8fe2deb30a9
-SIZE (gnome2/libgnomeui-2.5.90.tar.bz2) = 1219580
+MD5 (gnome2/libgnomeui-2.5.90.1.tar.bz2) = 94466d61b75487672a8921539ab9bb88
+SIZE (gnome2/libgnomeui-2.5.90.1.tar.bz2) = 1437915
diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in
index 223a325a7..367849606 100644
--- a/x11-toolkits/libgnomeui/files/patch-Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Dec  9 19:35:35 2003
-+++ Makefile.in	Tue Dec  9 19:35:41 2003
-@@ -133,7 +133,7 @@
+--- Makefile.in.orig	Wed Mar  3 19:09:35 2004
++++ Makefile.in	Wed Mar  3 19:12:45 2004
+@@ -138,7 +138,7 @@
  YACC = @YACC@
  gnomelocaledir = @gnomelocaledir@
  
--SUBDIRS = libgnomeui glade images demos test-gnome doc po #tests
-+SUBDIRS = libgnomeui glade images demos doc po #tests
+-SUBDIRS = libgnomeui file-chooser glade images demos test-gnome doc po #tests
++SUBDIRS = libgnomeui file-chooser glade images demos doc po #tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
diff --git a/x11-toolkits/libgnomeui/files/patch-configure b/x11-toolkits/libgnomeui/files/patch-configure
new file mode 100644
index 000000000..e6e3aac62
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-configure
@@ -0,0 +1,34 @@
+--- configure.orig	Wed Mar  3 19:44:51 2004
++++ configure	Wed Mar  3 19:45:23 2004
+@@ -463,7 +463,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBGNOMEUI_CURRENT LIBGNOMEUI_REVISION LIBGNOMEUI_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC PATH_TO_XRDB GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir WARN_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SM_LIBS PKG_CONFIG SOUND_TEST_CFLAGS SOUND_TEST_LIBS LIBJPEG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOMEUI_COMPONENTS_CFLAGS LIBGNOMEUI_COMPONENTS_LIBS LIBGNOMEUI_DEMOS_CFLAGS LIBGNOMEUI_DEMOS_LIBS LIBGNOMEUI_GLADE_CFLAGS LIBGNOMEUI_GLADE_LIBS LIBGLADE_CONVERT FILE_SYSTEM_CFLAGS FILE_SYSTEM_LIBS GTK_VERSION HTML_DIR GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GCONF_CONFIG_SOURCE INSTALL_GCONF_CONFIG_SOURCE GDK_PIXBUF_CSOURCE AWK PERL GCONFTOOL REBUILD LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBGNOMEUI_CURRENT LIBGNOMEUI_REVISION LIBGNOMEUI_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC PATH_TO_XRDB GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir WARN_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SM_LIBS PKG_CONFIG SOUND_TEST_CFLAGS SOUND_TEST_LIBS LIBJPEG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOMEUI_COMPONENTS_CFLAGS LIBGNOMEUI_COMPONENTS_LIBS LIBGNOMEUI_DEMOS_CFLAGS LIBGNOMEUI_DEMOS_LIBS LIBGNOMEUI_GLADE_CFLAGS LIBGNOMEUI_GLADE_LIBS LIBGLADE_CONVERT FILE_SYSTEM_CFLAGS FILE_SYSTEM_LIBS GTK_VERSION GTK_BINARY_VERSION HTML_DIR GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GCONF_CONFIG_SOURCE INSTALL_GCONF_CONFIG_SOURCE GDK_PIXBUF_CSOURCE AWK PERL GCONFTOOL REBUILD LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -23962,12 +23962,12 @@
+    { (exit 1); exit 1; }; }
+   fi
+ 
+-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+ 
+ 
+ 
+ 
+-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+ 
+ 
+ 
+@@ -25384,6 +25384,7 @@
+ s,@FILE_SYSTEM_CFLAGS@,$FILE_SYSTEM_CFLAGS,;t t
+ s,@FILE_SYSTEM_LIBS@,$FILE_SYSTEM_LIBS,;t t
+ s,@GTK_VERSION@,$GTK_VERSION,;t t
++s,@GTK_BINARY_VERSION@,$GTK_BINARY_VERSION,;t t
+ s,@HTML_DIR@,$HTML_DIR,;t t
+ s,@GTKDOC@,$GTKDOC,;t t
+ s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t
diff --git a/x11-toolkits/libgnomeui/files/patch-file-chooser_Makefile.in b/x11-toolkits/libgnomeui/files/patch-file-chooser_Makefile.in
new file mode 100644
index 000000000..1cc67b0f2
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-file-chooser_Makefile.in
@@ -0,0 +1,19 @@
+--- file-chooser/Makefile.in.orig	Wed Mar  3 19:46:14 2004
++++ file-chooser/Makefile.in	Wed Mar  3 19:46:36 2004
+@@ -90,6 +90,7 @@
+ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@
+ GTKDOC = @GTKDOC@
+ GTK_VERSION = @GTK_VERSION@
++GTK_BINARY_VERSION= @GTK_BINARY_VERSION@
+ HAVE_LIB = @HAVE_LIB@
+ HTML_DIR = @HTML_DIR@
+ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
+@@ -159,7 +160,7 @@
+ 
+ 
+ module_flags = -export_dynamic -avoid-version -module -no-undefined
+-modulesdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/filesystems
++modulesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/filesystems
+ 
+ modules_LTLIBRARIES = \
+ 	libgnome-vfs.la			\
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 620c75405..cd36ed47b 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -49,12 +49,64 @@ include/libgnomeui-2.0/libgnomeui/gnome-window-icon.h
 include/libgnomeui-2.0/libgnomeui/gnome-window.h
 include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h
 include/libgnomeui-2.0/libgnomeui/libgnomeui.h
+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.590
 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
 share/gnome/pixmaps/gnome-about-logo.png
 share/gnome/pixmaps/gnome-default-dlg.png
 share/gnome/pixmaps/gnome-error.png
@@ -113,8 +165,10 @@ share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sq/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/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/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
@@ -124,3 +178,4 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems