Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

43 files changed, 282 insertions, 221 deletions

diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 43121bd21a09..553b6210ba23 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/at-spi/distinfo b/x11-toolkits/at-spi/distinfo
index 54ca92afb782..1c53333d61c8 100644
--- a/x11-toolkits/at-spi/distinfo
+++ b/x11-toolkits/at-spi/distinfo
@@ -1 +1 @@
-MD5 (gnome2/at-spi-1.2.1.tar.bz2) = 562620310d9150e4803a275311f0088d
+MD5 (gnome2/at-spi-1.3.7.tar.bz2) = c5ee8c9ae592c547ac557fa58003b021
diff --git a/x11-toolkits/at-spi/files/patch-atk-bridge_Makefile.in b/x11-toolkits/at-spi/files/patch-atk-bridge_Makefile.in
new file mode 100644
index 000000000000..9c50885971b2
--- /dev/null
+++ b/x11-toolkits/at-spi/files/patch-atk-bridge_Makefile.in
@@ -0,0 +1,11 @@
+--- atk-bridge/Makefile.in.orig	Sat Apr 12 01:06:28 2003
++++ atk-bridge/Makefile.in	Sat Apr 12 01:06:48 2003
+@@ -147,7 +147,7 @@
+ 
+ LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version
+ 
+-libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) $(top_builddir)/libspi/libspi.la
++libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la
+ 
+ CFLAGS = @CFLAGS@ $(ATK_BRIDGE_CFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11-toolkits/at-spi/files/patch-libspi_Makefile.in b/x11-toolkits/at-spi/files/patch-libspi_Makefile.in
new file mode 100644
index 000000000000..cfb55a212a86
--- /dev/null
+++ b/x11-toolkits/at-spi/files/patch-libspi_Makefile.in
@@ -0,0 +1,11 @@
+--- libspi/Makefile.in.orig	Fri May  2 13:36:07 2003
++++ libspi/Makefile.in	Fri May  2 13:36:37 2003
+@@ -539,7 +539,7 @@
+ mostlyclean distclean maintainer-clean
+ 
+ 
+-$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h
++accessible.c base.h keystrokelistener.h libspi.h listener.h remoteobject.h : Accessibility.h
+ 
+ $(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL)
+ 	$(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl
diff --git a/x11-toolkits/at-spi/files/patch-registryd_Makefile.in b/x11-toolkits/at-spi/files/patch-registryd_Makefile.in
new file mode 100644
index 000000000000..7729e9da1400
--- /dev/null
+++ b/x11-toolkits/at-spi/files/patch-registryd_Makefile.in
@@ -0,0 +1,11 @@
+--- registryd/Makefile.in.orig	Fri Aug  8 12:15:34 2003
++++ registryd/Makefile.in	Fri Aug  8 12:20:05 2003
+@@ -150,7 +150,7 @@
+ at_spi_registryd_SOURCES =  	desktop.c			desktop.h			deviceeventcontroller.c		deviceeventcontroller.h		registry-main.c			registry.c			registry.h
+ 
+ 
+-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
++LDADD = -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
+ 
+ serverinfodir = $(prefix)/libdata/bonobo/servers
+ serverinfo_DATA = Accessibility_Registry.server
diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist
index 54c07250ed45..fe058837b88e 100644
--- a/x11-toolkits/at-spi/pkg-plist
+++ b/x11-toolkits/at-spi/pkg-plist
@@ -23,42 +23,41 @@ include/at-spi-1.0/libspi/relation.h
 include/at-spi-1.0/libspi/remoteobject.h
 include/at-spi-1.0/libspi/selection.h
 include/at-spi-1.0/libspi/stateset.h
+include/at-spi-1.0/libspi/streamablecontent.h
 include/at-spi-1.0/libspi/table.h
 include/at-spi-1.0/libspi/text.h
 include/at-spi-1.0/libspi/value.h
 lib/libcspi.a
 lib/libcspi.so
-lib/libcspi.so.0
+lib/libcspi.so.9
 lib/libspi.a
 lib/libspi.so
-lib/libspi.so.0
+lib/libspi.so.9
 lib/gtk-2.0/modules/libatk-bridge.so
 lib/orbit-2.0/Accessibility_module.so
 libdata/bonobo/servers/Accessibility_Registry.server
 libdata/pkgconfig/cspi-1.0.pc
 libdata/pkgconfig/libspi-1.0.pc
 libexec/at-spi-registryd
-share/doc/at-spi-cspi/at-spi-cspi-accessible-objects.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleaction-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleapplication-api.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblecomponent-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleeditabletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehyperlink-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehypertext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleimage-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblerelations-and-relationsets.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleselection-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletable-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblevalue-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-event-listener-support.html
-share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html
-share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html
-share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html
-share/doc/at-spi-cspi/book1.html
-share/doc/at-spi-cspi/c5968.html
-share/doc/at-spi-cspi/c7152.html
-share/doc/at-spi-cspi/index.sgml
+share/doc/at-spi-cspi/at-spi-cspi-Accessible-Objects.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleAction-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleApplication-API.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleComponent-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleEditableText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHyperlink-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHypertext-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleImage-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleRelations-and-RelationSets.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleSelection-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleTable-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleValue-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-Event-Listener-Support.html
+share/doc/at-spi-cspi/at-spi-cspi-Registry-queries.html
+share/doc/at-spi-cspi/at-spi-cspi-SPI-main-loop-and-initialization.html
+share/doc/at-spi-cspi/at-spi-cspi-State-and-StateSets.html
+share/doc/at-spi-cspi/ch05.html
+share/doc/at-spi-cspi/index.html
 share/doc/at-spi-cspi/spi-accessible.html
 share/doc/at-spi-cspi/spi-application.html
 share/doc/at-spi-cspi/spi-component.html
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 8ddd07a436fe..2596492612f9 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	eel2
-PORTVERSION=	2.2.4
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DIST_SUBDIR=	gnome2
 DISTNAME=	eel-${PORTVERSION}
 
@@ -27,6 +27,6 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo
index af1f88db108e..9120d5dfa753 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eel-2.2.4.tar.bz2) = 39d3ff28fbadd7341521644269d467b5
+MD5 (gnome2/eel-2.4.0.tar.bz2) = d15b6faec48f203d4e319a2364585511
diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist
index 31ab646e9c0d..74a9dfab0e38 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel2/pkg-plist
@@ -6,7 +6,6 @@ include/eel-2/eel/eel-background.h
 include/eel-2/eel/eel-canvas-rect-ellipse.h
 include/eel-2/eel/eel-canvas-util.h
 include/eel-2/eel/eel-canvas.h
-include/eel-2/eel/eel-caption-table.h
 include/eel-2/eel/eel-caption.h
 include/eel-2/eel/eel-cell-renderer-pixbuf-list.h
 include/eel-2/eel/eel-dateedit-extensions.h
@@ -33,7 +32,6 @@ include/eel-2/eel/eel-input-event-box.h
 include/eel-2/eel/eel-labeled-image.h
 include/eel-2/eel/eel-marshal.h
 include/eel-2/eel/eel-pango-extensions.h
-include/eel-2/eel/eel-password-dialog.h
 include/eel-2/eel/eel-preferences-glade.h
 include/eel-2/eel/eel-preferences.h
 include/eel-2/eel/eel-radio-button-group.h
@@ -50,7 +48,7 @@ include/eel-2/eel/eel-xml-extensions.h
 include/eel-2/eel/eel.h
 lib/libeel-2.a
 lib/libeel-2.so
-lib/libeel-2.so.4
+lib/libeel-2.so.6
 libdata/pkgconfig/eel-2.0.pc
 share/locale/am/LC_MESSAGES/eel-2.0.mo
 share/locale/ar/LC_MESSAGES/eel-2.0.mo
@@ -61,6 +59,7 @@ share/locale/bn/LC_MESSAGES/eel-2.0.mo
 share/locale/bs/LC_MESSAGES/eel-2.0.mo
 share/locale/ca/LC_MESSAGES/eel-2.0.mo
 share/locale/cs/LC_MESSAGES/eel-2.0.mo
+share/locale/cy/LC_MESSAGES/eel-2.0.mo
 share/locale/da/LC_MESSAGES/eel-2.0.mo
 share/locale/de/LC_MESSAGES/eel-2.0.mo
 share/locale/el/LC_MESSAGES/eel-2.0.mo
@@ -82,12 +81,14 @@ share/locale/it/LC_MESSAGES/eel-2.0.mo
 share/locale/ja/LC_MESSAGES/eel-2.0.mo
 share/locale/ko/LC_MESSAGES/eel-2.0.mo
 share/locale/kn/LC_MESSAGES/eel-2.0.mo
+share/locale/li/LC_MESSAGES/eel-2.0.mo
 share/locale/lt/LC_MESSAGES/eel-2.0.mo
 share/locale/lv/LC_MESSAGES/eel-2.0.mo
 share/locale/mk/LC_MESSAGES/eel-2.0.mo
 share/locale/ml/LC_MESSAGES/eel-2.0.mo
 share/locale/mn/LC_MESSAGES/eel-2.0.mo
 share/locale/ms/LC_MESSAGES/eel-2.0.mo
+share/locale/ne/LC_MESSAGES/eel-2.0.mo
 share/locale/nl/LC_MESSAGES/eel-2.0.mo
 share/locale/nn/LC_MESSAGES/eel-2.0.mo
 share/locale/no/LC_MESSAGES/eel-2.0.mo
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 2f81cac2a9a8..9a66364bd004 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	1.2.2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo
index 7b01394f42b0..1c8abbab58fe 100644
--- a/x11-toolkits/gail/distinfo
+++ b/x11-toolkits/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-1.2.2.tar.bz2) = cace76d052501c10f57c145618205509
+MD5 (gnome2/gail-1.4.0.tar.bz2) = 6eba35f812cf007da332a9fef4865e71
diff --git a/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in
new file mode 100644
index 000000000000..c61bc365ad8f
--- /dev/null
+++ b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/libgail-util/Makefile.in.orig	Thu May 15 14:45:49 2003
++++ docs/reference/libgail-util/Makefile.in	Thu May 15 14:47:43 2003
+@@ -299,8 +299,6 @@
+ 	echo '-- Installing '$$i ; \
+ 	$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+ 	fi)
+ 
+ #
diff --git a/x11-toolkits/gail/pkg-plist b/x11-toolkits/gail/pkg-plist
index a947bd3a9d5d..a45c4b6a4380 100644
--- a/x11-toolkits/gail/pkg-plist
+++ b/x11-toolkits/gail/pkg-plist
@@ -8,9 +8,11 @@ lib/libgailutil.so
 lib/libgailutil.so.17
 libdata/pkgconfig/gail.pc
 share/doc/gail-libgail-util/book1.html
+share/doc/gail-libgail-util/gail-libgail-util-GailMisc.html
+share/doc/gail-libgail-util/gail-libgail-util-GailTextUtil.html
 share/doc/gail-libgail-util/gail-libgail-util-gailmisc.html
 share/doc/gail-libgail-util/gail-libgail-util-gailtextutil.html
-share/doc/gail-libgail-util/index.sgml
+share/doc/gail-libgail-util/index.html
 share/doc/gail-libgail-util/libgail-util-main.html
 @dirrm share/doc/gail-libgail-util
 @dirrm lib/gtk-2.0/modules
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index 18d28258364d..0a6fe90fa29e 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	gnome-themes
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of themes and icons for GNOME 2 designed for accessibility
 
-BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
-		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
-RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
-		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack metacity
+USE_GNOME=	gnomehack metacity libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LIBS="-L${LOCALBASE}/lib"
+	       	LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo
index 71091d975407..def286a7c89e 100644
--- a/x11-toolkits/gnome-themes/distinfo
+++ b/x11-toolkits/gnome-themes/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-2.2.2.tar.bz2) = 41095ed3c7d8a6f761d92a1bc13bfdb0
+MD5 (gnome2/gnome-themes-2.4.0.tar.bz2) = 57ae1cf8a8bac1a461310f26347605e6
diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure
index 2a763b11ffe5..3a3c068040c5 100644
--- a/x11-toolkits/gnome-themes/files/patch-configure
+++ b/x11-toolkits/gnome-themes/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed Mar 12 07:49:35 2003
-+++ configure	Thu Mar 13 23:50:27 2003
-@@ -7641,6 +7641,7 @@
+--- configure.orig	Fri May 16 15:56:25 2003
++++ configure	Fri May 16 23:10:03 2003
+@@ -18073,6 +18073,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,80 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7707,22 +7708,16 @@
-         echo "$as_me:$LINENO: checking for gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0" >&5
-+		  gtk-thinice-engine-2" >&5
- echo $ECHO_N "checking for gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0... $ECHO_C" >&6
-+		  gtk-thinice-engine-2... $ECHO_C" >&6
- 
-         if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0" ; then
-+		  gtk-thinice-engine-2" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
-@@ -7732,9 +7727,7 @@
-             GTKTHEME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0"`
-+		  gtk-thinice-engine-2"`
-             echo "$as_me:$LINENO: result: $GTKTHEME_CFLAGS" >&5
- echo "${ECHO_T}$GTKTHEME_CFLAGS" >&6
- 
-@@ -7743,9 +7736,7 @@
-             GTKTHEME_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0"`
-+		  gtk-thinice-engine-2"`
-             echo "$as_me:$LINENO: result: $GTKTHEME_LIBS" >&5
- echo "${ECHO_T}$GTKTHEME_LIBS" >&6
-         else
-@@ -7756,9 +7747,7 @@
-             GTKTHEME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0"`
-+		  gtk-thinice-engine-2"`
-             echo $GTKTHEME_PKG_ERRORS
-         fi
- 
-@@ -7776,15 +7765,11 @@
-      { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-+		  gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
- echo "$as_me: error: Library requirements (gtk+-2.0 >= 1.3.11
- 		  gdk-pixbuf-2.0 >= 1.3.11
- 		  gtk-engines-2
--		  gtk-thinice-engine-2
--		  libgnomeui-2.0
--		  libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+		  gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist
index e87b8bcc477d..44fb48c7ec8d 100644
--- a/x11-toolkits/gnome-themes/pkg-plist
+++ b/x11-toolkits/gnome-themes/pkg-plist
@@ -2,6 +2,7 @@ lib/gtk-2.0/2.2.0/engines/libcrux-engine.so
 lib/gtk-2.0/2.2.0/engines/libhcengine.so
 lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so
 lib/gtk-2.0/2.2.0/engines/libmist.so
+lib/gtk-2.0/2.2.0/engines/libthinice.so
 share/eazel-engine/arrow_down-spinner.png
 share/eazel-engine/arrow_down.png
 share/eazel-engine/arrow_left.png
@@ -931,6 +932,7 @@ share/locale/bg/LC_MESSAGES/gnome-themes.mo
 share/locale/bn/LC_MESSAGES/gnome-themes.mo
 share/locale/ca/LC_MESSAGES/gnome-themes.mo
 share/locale/cs/LC_MESSAGES/gnome-themes.mo
+share/locale/cy/LC_MESSAGES/gnome-themes.mo
 share/locale/da/LC_MESSAGES/gnome-themes.mo
 share/locale/de/LC_MESSAGES/gnome-themes.mo
 share/locale/el/LC_MESSAGES/gnome-themes.mo
@@ -939,15 +941,20 @@ share/locale/et/LC_MESSAGES/gnome-themes.mo
 share/locale/fa/LC_MESSAGES/gnome-themes.mo
 share/locale/fi/LC_MESSAGES/gnome-themes.mo
 share/locale/fr/LC_MESSAGES/gnome-themes.mo
+share/locale/ga/LC_MESSAGES/gnome-themes.mo
 share/locale/he/LC_MESSAGES/gnome-themes.mo
 share/locale/hi/LC_MESSAGES/gnome-themes.mo
 share/locale/hu/LC_MESSAGES/gnome-themes.mo
 share/locale/id/LC_MESSAGES/gnome-themes.mo
+share/locale/is/LC_MESSAGES/gnome-themes.mo
 share/locale/it/LC_MESSAGES/gnome-themes.mo
 share/locale/ja/LC_MESSAGES/gnome-themes.mo
 share/locale/ko/LC_MESSAGES/gnome-themes.mo
+share/locale/li/LC_MESSAGES/gnome-themes.mo
+share/locale/lt/LC_MESSAGES/gnome-themes.mo
 share/locale/lv/LC_MESSAGES/gnome-themes.mo
 share/locale/mk/LC_MESSAGES/gnome-themes.mo
+share/locale/ml/LC_MESSAGES/gnome-themes.mo
 share/locale/mn/LC_MESSAGES/gnome-themes.mo
 share/locale/ms/LC_MESSAGES/gnome-themes.mo
 share/locale/nl/LC_MESSAGES/gnome-themes.mo
@@ -967,6 +974,7 @@ share/locale/th/LC_MESSAGES/gnome-themes.mo
 share/locale/tr/LC_MESSAGES/gnome-themes.mo
 share/locale/uk/LC_MESSAGES/gnome-themes.mo
 share/locale/vi/LC_MESSAGES/gnome-themes.mo
+share/locale/wa/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
 share/themes/Crux/gtk-2.0/gtkrc
@@ -1024,6 +1032,7 @@ share/themes/HighContrastLargePrint/pixmaps/media-next.png
 share/themes/HighContrastLargePrint/pixmaps/media-pause.png
 share/themes/HighContrastLargePrint/pixmaps/media-play.png
 share/themes/HighContrastLargePrint/pixmaps/media-prev.png
+share/themes/HighContrastLargePrint/pixmaps/media-record.png
 share/themes/HighContrastLargePrint/pixmaps/media-stop.png
 share/themes/HighContrastLargePrint/pixmaps/printer-broken.png
 share/themes/HighContrastLargePrint/pixmaps/printer-default.png
@@ -1157,6 +1166,7 @@ share/themes/HighContrastLargePrintInverse/pixmaps/media-next.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-pause.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-play.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-prev.png
+share/themes/HighContrastLargePrintInverse/pixmaps/media-record.png
 share/themes/HighContrastLargePrintInverse/pixmaps/media-stop.png
 share/themes/HighContrastLargePrintInverse/pixmaps/printer-broken.png
 share/themes/HighContrastLargePrintInverse/pixmaps/printer-default.png
@@ -1290,6 +1300,7 @@ share/themes/LargePrint/pixmaps/media-next.png
 share/themes/LargePrint/pixmaps/media-pause.png
 share/themes/LargePrint/pixmaps/media-play.png
 share/themes/LargePrint/pixmaps/media-prev.png
+share/themes/LargePrint/pixmaps/media-record.png
 share/themes/LargePrint/pixmaps/media-stop.png
 share/themes/LargePrint/pixmaps/printer-broken.png
 share/themes/LargePrint/pixmaps/printer-default.png
@@ -1426,6 +1437,7 @@ share/themes/LowContrastLargePrint/pixmaps/media-next.png
 share/themes/LowContrastLargePrint/pixmaps/media-pause.png
 share/themes/LowContrastLargePrint/pixmaps/media-play.png
 share/themes/LowContrastLargePrint/pixmaps/media-prev.png
+share/themes/LowContrastLargePrint/pixmaps/media-record.png
 share/themes/LowContrastLargePrint/pixmaps/media-stop.png
 share/themes/LowContrastLargePrint/pixmaps/printer-broken.png
 share/themes/LowContrastLargePrint/pixmaps/printer-default.png
@@ -1575,8 +1587,11 @@ share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png
 share/themes/Smokey-Blue/gtk-2.0/option1.png
 share/themes/Smokey-Blue/gtk-2.0/option2.png
 share/themes/Smokey-Blue/index.theme
+share/themes/ThinIce/gtk-2.0/gtkrc
 share/themes/Traditional/index.theme
 @dirrm share/themes/Traditional
+@dirrm share/themes/ThinIce/gtk-2.0
+@dirrm share/themes/ThinIce
 @dirrm share/themes/Smokey-Blue/gtk-2.0
 @dirrm share/themes/Smokey-Blue
 @dirrm share/themes/Simple/gtk-2.0
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 20eb2d7f170e..e3ece0690fc5 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.2.4
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 124f41e5ddc4..1d6f2f98d6c9 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-2.2.4.tar.bz2) = bbf8715be93ac8e6dbc70a16a6353d0a
+MD5 (gnome2/libbonoboui-2.4.0.tar.bz2) = 176e1a094ecbfaf765c9996fc3eccf3c
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index 3512fa0d365e..156a4f587188 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Tue Jul 29 21:56:19 2003
-+++ Makefile.in	Tue Jul 29 21:56:48 2003
-@@ -133,7 +133,7 @@
- cxxflags_set = @cxxflags_set@
- gnomelocaledir = @gnomelocaledir@
- install_sh = @install_sh@
+--- Makefile.in.orig	Sat Jun 14 04:47:53 2003
++++ Makefile.in	Sat Jun 14 04:48:13 2003
+@@ -192,7 +192,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = bonobo glade samples tests po doc
 +SUBDIRS = bonobo glade samples po doc
  
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index a3acc2d68002..3bc4954d1eb2 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -37,6 +37,7 @@ lib/libbonoboui-2.so
 lib/libbonoboui-2.so.0
 lib/libglade/2.0/libbonobo.so
 libdata/bonobo/servers/Bonobo_Sample_Controls.server
+libdata/bonobo/servers/CanvDemo.server
 libdata/pkgconfig/libbonoboui-2.0.pc
 share/doc/libbonoboui/bonobo-controls.html
 share/doc/libbonoboui/bonobo-support-utilities.html
@@ -72,6 +73,7 @@ share/doc/libbonoboui/libbonoboui-faq.html
 share/doc/libbonoboui/libbonoboui.devhelp
 share/doc/libbonoboui/right.png
 share/doc/libbonoboui/up.png
+share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
 share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
 share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
@@ -92,10 +94,12 @@ share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/id/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/is/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/kn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/li/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index c1ef23fa98b1..2b633ac049fe 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgail-gnome
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index bef064ea9bd8..f78676fdcbdc 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomeprintui
-PORTVERSION=	2.2.1.3
+PORTVERSION=	2.3.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index c512cf3141e8..dc1f241615b3 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprintui-2.2.1.3.tar.bz2) = 7a55f50151fe54ff9d92544b5b0fdd6d
+MD5 (gnome2/libgnomeprintui-2.3.1.tar.bz2) = d6efea19435e8659c26fe4d4fd480336
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 51060b0eb257..8129d2da4be8 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -6,11 +6,13 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h
 lib/libgnomeprintui-2-2.a
 lib/libgnomeprintui-2-2.so
-lib/libgnomeprintui-2-2.so.0
+lib/libgnomeprintui-2-2.so.1
 libdata/pkgconfig/libgnomeprintui-2.2.pc
 share/doc/libgnomeprintui/c7.html
+share/doc/libgnomeprintui/home.png
 share/doc/libgnomeprintui/index.html
 share/doc/libgnomeprintui/index.sgml
+share/doc/libgnomeprintui/left.png
 share/doc/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
 share/doc/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
 share/doc/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
@@ -20,6 +22,8 @@ share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
 share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-dialog.html
 share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
 share/doc/libgnomeprintui/libgnomeprintui.html
+share/doc/libgnomeprintui/right.png
+share/doc/libgnomeprintui/up.png
 share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -28,6 +32,7 @@ share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/bn/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -49,9 +54,9 @@ share/locale/it/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ja/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/kn/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/li/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo
-share/locale/mk/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 2e5ce8983bbf..c06e101516de 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,7 +23,6 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 7a9f1dd050e2..51f00e14c13d 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-2.2.2.tar.bz2) = 2d58cd438aabffc00e65ecd4bab63349
+MD5 (gnome2/libgnomeui-2.4.0.1.tar.bz2) = 196f4a3f1f4a531ff57acaa879e98dd2
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
index c8ff2dcd7d66..69f8b2e7c4d5 100644
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- libgnomeui/Makefile.in.orig	Fri Jun 13 14:41:05 2003
++++ libgnomeui/Makefile.in	Fri Jun 13 14:41:43 2003
+@@ -148,7 +148,7 @@
  #
  libgnomeuiincludedir = $(includedir)/libgnomeui-2.0/libgnomeui
  
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c
new file mode 100644
index 000000000000..ecb6739ab17b
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c
@@ -0,0 +1,24 @@
+--- libgnomeui/gnome-icon-lookup.c.orig	Thu Sep 18 02:13:50 2003
++++ libgnomeui/gnome-icon-lookup.c	Thu Sep 18 02:16:19 2003
+@@ -107,6 +107,10 @@
+ 
+   if (vfs_mime_name)
+     {
++      /* Handle absolute files */
++      if (vfs_mime_name[0] == '/')
++        return g_strdup (vfs_mime_name);
++
+       p = strrchr(vfs_mime_name, '.');
+ 
+       if (p)
+@@ -293,7 +297,9 @@
+   if (mime_type)
+     {
+       mime_name = get_vfs_mime_name (mime_type);
+-      if (mime_name && gnome_icon_theme_has_icon (icon_theme, mime_name))
++      if (mime_name &&
++	 ((mime_name[0] == '/' && g_file_test (mime_name, G_FILE_TEST_IS_REGULAR) ||
++	   gnome_icon_theme_has_icon (icon_theme, mime_name))))
+ 	return mime_name;
+       g_free (mime_name);
+       
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index fe141862799b..e7113b5466a7 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -4,6 +4,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h
 include/libgnomeui-2.0/libgnomeui/gnome-app-util.h
 include/libgnomeui-2.0/libgnomeui/gnome-app.h
 include/libgnomeui-2.0/libgnomeui/gnome-appbar.h
+include/libgnomeui-2.0/libgnomeui/gnome-authentication-manager.h
 include/libgnomeui-2.0/libgnomeui/gnome-client.h
 include/libgnomeui-2.0/libgnomeui/gnome-color-picker.h
 include/libgnomeui-2.0/libgnomeui/gnome-dateedit.h
@@ -29,6 +30,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-mdi-generic-child.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-session.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi.h
 include/libgnomeui-2.0/libgnomeui/gnome-messagebox.h
+include/libgnomeui-2.0/libgnomeui/gnome-password-dialog.h
 include/libgnomeui-2.0/libgnomeui/gnome-pixmap-entry.h
 include/libgnomeui-2.0/libgnomeui/gnome-pixmap.h
 include/libgnomeui-2.0/libgnomeui/gnome-popup-menu.h
@@ -48,43 +50,46 @@ 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.200
+lib/libgnomeui-2.so.400
 libdata/pkgconfig/libgnomeui-2.0.pc
 libexec/gnome_segv2
+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/c4.html
+share/doc/libgnomeui/ch01.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
-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/gnomeicontextitem.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/index.html
 share/doc/libgnomeui/index.sgml
+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
@@ -96,10 +101,6 @@ 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-gnomeiconlookup.html
-share/doc/libgnomeui/libgnomeui-gnomeicontheme.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
@@ -114,6 +115,7 @@ 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/bn/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 +139,7 @@ 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/li/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
@@ -153,6 +156,7 @@ 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/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/sv/LC_MESSAGES/libgnomeui-2.0.mo
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index d528f1bf3e81..87e8908a6f80 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libwnck
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 8fc395f30cbe..57becd510ec1 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libwnck-2.2.2.tar.bz2) = f2498192c020c40303bf477e6b100055
+MD5 (gnome2/libwnck-2.4.0.1.tar.bz2) = 7a7007b285a4e3c39a7bb113cb2be45b
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 13af8fb66b65..8094fd6082e1 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -11,7 +11,7 @@ include/libwnck-1.0/libwnck/wnck-enum-types.h
 include/libwnck-1.0/libwnck/workspace.h
 lib/libwnck-1.a
 lib/libwnck-1.so
-lib/libwnck-1.so.9
+lib/libwnck-1.so.11
 libdata/pkgconfig/libwnck-1.0.pc
 share/locale/am/LC_MESSAGES/libwnck.mo
 share/locale/ar/LC_MESSAGES/libwnck.mo
@@ -21,9 +21,11 @@ share/locale/bg/LC_MESSAGES/libwnck.mo
 share/locale/bn/LC_MESSAGES/libwnck.mo
 share/locale/ca/LC_MESSAGES/libwnck.mo
 share/locale/cs/LC_MESSAGES/libwnck.mo
+share/locale/cy/LC_MESSAGES/libwnck.mo
 share/locale/da/LC_MESSAGES/libwnck.mo
 share/locale/de/LC_MESSAGES/libwnck.mo
 share/locale/el/LC_MESSAGES/libwnck.mo
+share/locale/eo/LC_MESSAGES/libwnck.mo
 share/locale/es/LC_MESSAGES/libwnck.mo
 share/locale/et/LC_MESSAGES/libwnck.mo
 share/locale/fa/LC_MESSAGES/libwnck.mo
@@ -40,6 +42,8 @@ share/locale/it/LC_MESSAGES/libwnck.mo
 share/locale/ja/LC_MESSAGES/libwnck.mo
 share/locale/kn/LC_MESSAGES/libwnck.mo
 share/locale/ko/LC_MESSAGES/libwnck.mo
+share/locale/li/LC_MESSAGES/libwnck.mo
+share/locale/lt/LC_MESSAGES/libwnck.mo
 share/locale/lv/LC_MESSAGES/libwnck.mo
 share/locale/mk/LC_MESSAGES/libwnck.mo
 share/locale/ml/LC_MESSAGES/libwnck.mo
@@ -54,10 +58,10 @@ share/locale/pt_BR/LC_MESSAGES/libwnck.mo
 share/locale/ro/LC_MESSAGES/libwnck.mo
 share/locale/ru/LC_MESSAGES/libwnck.mo
 share/locale/sk/LC_MESSAGES/libwnck.mo
-share/locale/sl/LC_MESSAGES/libwnck.mo
 share/locale/sq/LC_MESSAGES/libwnck.mo
 share/locale/sr/LC_MESSAGES/libwnck.mo
 share/locale/sr@Latn/LC_MESSAGES/libwnck.mo
+share/locale/sl/LC_MESSAGES/libwnck.mo
 share/locale/sv/LC_MESSAGES/libwnck.mo
 share/locale/ta/LC_MESSAGES/libwnck.mo
 share/locale/th/LC_MESSAGES/libwnck.mo
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index e319fee4fa57..23290abd992d 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.10.29
+PORTVERSION=	0.11.10
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,10 +23,21 @@ USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-python
 
+.ifdef(WITH_GLX)
+CONFIGURE_ARGS+=	--with-glX
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Vte supports the following configurable option(s):"
+	@${ECHO_MSG} "	WITH_GLX=yes	Enable support for DRI rendering (may improve performance)"
+	@${ECHO_MSG} ""
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \
 		${WRKSRC}/gnome-pty-helper/gnome-pty-helper.c
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 0da53fe475b2..505d4768788b 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1 +1 @@
-MD5 (gnome2/vte-0.10.29.tar.bz2) = f1bba34a7c3cadde8d1b9a333163184b
+MD5 (gnome2/vte-0.11.10.tar.bz2) = 71facdedd477749908402a6931d36e64
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
index 72106cddb908..955fd6d5115e 100644
--- a/x11-toolkits/vte/files/patch-configure
+++ b/x11-toolkits/vte/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Dec  3 02:15:27 2002
-+++ configure	Wed Dec  4 02:01:09 2002
-@@ -8643,6 +8643,7 @@
+--- configure.orig	Tue May  6 10:14:49 2003
++++ configure	Wed May  7 02:24:01 2003
+@@ -8724,6 +8724,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,14 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -13009,10 +13010,6 @@
+ fi
+ rm -f conftest*
+ 
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define _XOPEN_SOURCE_EXTENDED 1
+-_ACEOF
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
index e609f0e131fe..fdb419f853c2 100644
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
@@ -1,6 +1,23 @@
---- gnome-pty-helper/Makefile.in.orig	Wed Nov 27 13:30:48 2002
-+++ gnome-pty-helper/Makefile.in	Wed Nov 27 13:31:05 2002
-@@ -425,8 +425,8 @@
+--- gnome-pty-helper/Makefile.in.orig	Mon Jun  2 20:23:02 2003
++++ gnome-pty-helper/Makefile.in	Mon Jun  2 20:26:54 2003
+@@ -65,6 +65,7 @@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+@@ -217,7 +218,7 @@
+ 	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+ gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) 
+ 	@rm -f gnome-pty-helper$(EXEEXT)
+-	$(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS)
++	$(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
+@@ -514,8 +515,8 @@
  
  
  install-exec-hook:
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
new file mode 100644
index 000000000000..668f2a6dba5b
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
@@ -0,0 +1,10 @@
+--- gnome-pty-helper/configure.orig	Mon Jun  2 20:27:32 2003
++++ gnome-pty-helper/configure	Mon Jun  2 20:28:06 2003
+@@ -6318,6 +6318,7 @@
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+ s,@LIBS@,$LIBS,;t t
++s,@BSD_PTHREAD_LIBS@,$BSD_PTHREAD_LIBS,;t t
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
diff --git a/x11-toolkits/vte/files/patch-src_dumpkeys.c b/x11-toolkits/vte/files/patch-src_dumpkeys.c
index 74852c5eb9ef..9c7110edf5d5 100644
--- a/x11-toolkits/vte/files/patch-src_dumpkeys.c
+++ b/x11-toolkits/vte/files/patch-src_dumpkeys.c
@@ -2,7 +2,7 @@
 +++ src/dumpkeys.c	Wed Dec  4 02:04:30 2002
 @@ -18,11 +18,11 @@
  
- #ident "$Id: patch-src_dumpkeys.c,v 1.1 2002/12/04 07:10:42 marcus Exp $"
+ #ident "$Id: patch-src_dumpkeys.c,v 1.3 2003/04/12 04:52:53 marcus Exp $"
  #include "../config.h"
 +#include <sys/types.h>
  #ifdef HAVE_SYS_SELECT_H
diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c
index 16012c800304..db657443b846 100644
--- a/x11-toolkits/vte/files/patch-src_keymap.c
+++ b/x11-toolkits/vte/files/patch-src_keymap.c
@@ -2,7 +2,7 @@
 +++ src/keymap.c	Tue Oct 22 17:42:33 2002
 @@ -18,6 +18,7 @@
  
- #ident "$Id: patch-src_keymap.c,v 1.1 2002/10/22 21:53:50 marcus Exp $"
+ #ident "$Id: patch-src_keymap.c,v 1.3 2003/04/12 04:52:53 marcus Exp $"
  #include "../config.h"
 +#include <sys/types.h>
  #include <stdlib.h>
diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c
index f88e85642dee..3601fb3d69f0 100644
--- a/x11-toolkits/vte/files/patch-src_pty.c
+++ b/x11-toolkits/vte/files/patch-src_pty.c
@@ -1,13 +1,10 @@
---- src/pty.c.orig	Tue May 13 01:18:15 2003
-+++ src/pty.c	Tue May 13 01:26:22 2003
-@@ -48,6 +48,10 @@
+--- src/pty.c.orig	Sat Apr 12 00:47:10 2003
++++ src/pty.c	Sat Apr 12 00:47:34 2003
+@@ -45,6 +45,7 @@
+ #include "pty.h"
+ 
+ #ifdef VTE_USE_GNOME_PTY_HELPER
++#include "../gnome-pty-helper/config.h"
  #include "../gnome-pty-helper/gnome-pty.h"
  #endif
  
-+#ifdef __FreeBSD__
-+#define HAVE_RECVMSG 1
-+#endif
-+
- #ifdef MSG_NOSIGNAL
- #define PTY_RECVMSG_FLAGS MSG_NOSIGNAL
- #else
diff --git a/x11-toolkits/vte/files/patch-src_vte.c b/x11-toolkits/vte/files/patch-src_vte.c
deleted file mode 100644
index 9c267212f5c1..000000000000
--- a/x11-toolkits/vte/files/patch-src_vte.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/vte.c.orig	Tue Mar  4 14:25:26 2003
-+++ src/vte.c	Wed Mar 26 01:42:42 2003
-@@ -547,7 +547,7 @@
- static wchar_t
- vte_wc_from_unichar(VteTerminal *terminal, gunichar c)
- {
--#ifdef __STDC_ISO_10646__
-+#if defined(__STDC_ISO_10646__) || (defined(__FreeBSD__) && __FreeBSD_version < 500000)
- 	return (wchar_t) c;
- #else
- 	gpointer original, result;
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 30ebb21d7f75..d9d48291e46d 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -5,13 +5,14 @@ include/vte/vte.h
 include/vte/vteaccess.h
 lib/libvte.a
 lib/libvte.so
-lib/libvte.so.4
+lib/libvte.so.5
 lib/vte/decset
 lib/vte/interpret
 lib/vte/iso8859mode
 lib/vte/nativeecho
 lib/vte/osc
 lib/vte/slowcat
+lib/vte/vterdb
 lib/vte/utf8echo
 lib/vte/utf8mode
 lib/vte/window
@@ -40,7 +41,9 @@ share/locale/is/LC_MESSAGES/vte.mo
 share/locale/it/LC_MESSAGES/vte.mo
 share/locale/ja/LC_MESSAGES/vte.mo
 share/locale/ko/LC_MESSAGES/vte.mo
+share/locale/li/LC_MESSAGES/vte.mo
 share/locale/lv/LC_MESSAGES/vte.mo
+share/locale/mk/LC_MESSAGES/vte.mo
 share/locale/ml/LC_MESSAGES/vte.mo
 share/locale/mn/LC_MESSAGES/vte.mo
 share/locale/ms/LC_MESSAGES/vte.mo