The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD. The official GNOME 2.22 release notes can be found at http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front, this release features an updated hal port with support for video4linux devices, DRM (Direct Rendering), and better support of removable media. Work is also underway to tie webkit more closely into GNOME. As part of the GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well. Be sure to consult UPDATING on the proper steps to upgrade all of your GNOME ports. This release would not have been possible without the contributions and testing efforts of the following people: Pawel Worach kan edwin Peter Ulrich Kruppa J. W. Ballantine Yasuda Keisuke Andriy Gapon
author: Joe Marcus Clarke <marcus@FreeBSD.org> 2008-03-24 03:52:36 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2008-03-24 03:52:36 +0000
commit: 6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch)
tree: 0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /x11-toolkits
parent: - Add USE_XORG= x11 (diff)
38 files changed, 147 insertions, 151 deletions
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index e0597a556f97..edfbf0e4d959 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/bakery/Makefile,v 1.5 2007/12/02 07:02:19 marcus Exp $
+#   $MCom: ports/x11-toolkits/bakery/Makefile,v 1.11 2008/03/23 06:57:57 marcus Exp $
 #
 
 PORTNAME=	bakery
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
index 1c28b5348fea..9d0fa0b3ee9b 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
@@ -1,6 +1,6 @@
---- bakery/Makefile.in.orig	2007-12-02 01:51:18.000000000 -0500
-+++ bakery/Makefile.in	2007-12-02 01:55:39.000000000 -0500
-@@ -279,10 +279,10 @@ libbakery_2_4_la_LIBADD = App/libbakery_
+--- bakery/Makefile.in.orig	2008-03-17 21:46:07.000000000 +0100
++++ bakery/Makefile.in	2008-03-17 21:47:37.000000000 +0100
+@@ -279,10 +279,10 @@
                        View/libbakery_view.la \
                        $(BAKERY_LIBS)
  
@@ -9,7 +9,7 @@
  
  # Install the headers:
 -library_configdir = $(libdir)/bakery-2.4/include
-+library_configdir = $(library_includedir)
++library_configdir = $(includedir)/bakery-2.4
  library_config_DATA = bakeryconfig.h
  all: bakeryconfig.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index 576d15e85667..5642da1da4c0 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -17,8 +17,8 @@ include/bakery-%%API_VERSION%%/bakery/View/View.h
 include/bakery-%%API_VERSION%%/bakery/View/ViewBase.h
 include/bakery-%%API_VERSION%%/bakery/View/View_Composite.h
 include/bakery-%%API_VERSION%%/bakery/bakery.h
-include/bakery-%%API_VERSION%%/bakery/bakeryconfig.h
 include/bakery-%%API_VERSION%%/bakery/init.h
+include/bakery-%%API_VERSION%%/bakeryconfig.h
 lib/libbakery-%%VERSION%%.a
 lib/libbakery-%%VERSION%%.la
 lib/libbakery-%%VERSION%%.so
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 41f8f44c5f63..046b5293d833 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,14 +3,13 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.60 2007/09/18 14:12:45 ahze Exp $
+#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.67 2008/03/10 21:38:32 mezz Exp $
 #
 
 PORTNAME=	eel
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,18 +18,13 @@ COMMENT=	Generally useful classes and extensions to GNOME
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_XORG=	xrender
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack
+USE_GNOME=	gnomeprefix gnomehack gail gnomedesktop ltverhack intlhack
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/eel/eel-open-with-dialog.c
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index 24738bf2d84b..838be7cde287 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.20.0.tar.bz2) = 691734dc1078e05e726b4f5b8646dadf
-SHA256 (gnome2/eel-2.20.0.tar.bz2) = ba35db646ce069ee66a92fa95d10aff583e00e6039b1b5bb0fa6036742fddd70
-SIZE (gnome2/eel-2.20.0.tar.bz2) = 647919
+MD5 (gnome2/eel-2.22.0.tar.bz2) = cd0db25194c154f07c39b45ca5943999
+SHA256 (gnome2/eel-2.22.0.tar.bz2) = 09258b129d1cf805b56bfbbfc19798d158fa8001594d0f807e23562805581331
+SIZE (gnome2/eel-2.22.0.tar.bz2) = 606502
diff --git a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c
deleted file mode 100644
index 09270d77cacc..000000000000
--- a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- eel/eel-open-with-dialog.c.orig	Mon Mar 21 06:25:51 2005
-+++ eel/eel-open-with-dialog.c	Mon Mar 21 06:39:29 2005
-@@ -422,7 +422,7 @@
- 	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser),
- 					      FALSE);
- 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
--					     "/usr/bin");
-+					     "%%LOCALBASE%%/bin");
- 
- 	gtk_widget_show (chooser);
- }
-@@ -452,10 +452,13 @@
- 	char         *file;
- 	gboolean      long_operation;
- 
-+	GDK_THREADS_ENTER ();
-+
- 	long_operation = FALSE;
- 	do {
- 		if (!dialog->details->add_icon_paths) {
- 			dialog->details->add_icons_idle_id = 0;
-+			GDK_THREADS_LEAVE ();
- 			return FALSE;
- 		}
- 
-@@ -508,6 +511,8 @@
- 	/* don't go back into the main loop if this wasn't very hard to do */
- 	} while (!long_operation);
- 
-+	GDK_THREADS_LEAVE ();
-+
- 	return TRUE;
- }
- 
-@@ -575,6 +580,8 @@
- 	GSList            *l;
- 	const char        *prev_name;
- 
-+	GDK_THREADS_ENTER ();
-+
- 	/* create list store */
- 	dialog->details->program_list_store = gtk_list_store_new (NUM_COLUMNS,
- 								  GDK_TYPE_PIXBUF,
-@@ -633,6 +640,8 @@
-                                              NULL);
- 					          
- 	gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->details->program_list), column);
-+
-+	GDK_THREADS_LEAVE ();
- 
- 	dialog->details->add_icon_paths = g_slist_reverse (dialog->details->add_icon_paths);
- 
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index fac1807dce3c..8316a352c40a 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -1,5 +1,6 @@
 include/eel-2/eel/eel-accessibility.h
 include/eel-2/eel/eel-alert-dialog.h
+include/eel-2/eel/eel-app-launch-context.h
 include/eel-2/eel/eel-art-extensions.h
 include/eel-2/eel/eel-art-gtk-extensions.h
 include/eel-2/eel/eel-background-box.h
@@ -7,7 +8,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-dateedit-extensions.h
 include/eel-2/eel/eel-debug-drawing.h
 include/eel-2/eel/eel-debug.h
 include/eel-2/eel/eel-editable-label.h
@@ -26,15 +26,12 @@ include/eel-2/eel/eel-i18n.h
 include/eel-2/eel/eel-image-table.h
 include/eel-2/eel/eel-labeled-image.h
 include/eel-2/eel/eel-marshal.h
-include/eel-2/eel/eel-mime-application-chooser.h
-include/eel-2/eel/eel-mime-extensions.h
-include/eel-2/eel/eel-open-with-dialog.h
+include/eel-2/eel/eel-mount-operation.h
 include/eel-2/eel/eel-pango-extensions.h
 include/eel-2/eel/eel-preferences-glade.h
 include/eel-2/eel/eel-preferences.h
 include/eel-2/eel/eel-self-checks.h
 include/eel-2/eel/eel-stock-dialogs.h
-include/eel-2/eel/eel-string-list.h
 include/eel-2/eel/eel-string.h
 include/eel-2/eel/eel-type-builtins.h
 include/eel-2/eel/eel-types.h
@@ -50,6 +47,7 @@ libdata/pkgconfig/eel-2.0.pc
 share/locale/am/LC_MESSAGES/eel-2.0.mo
 share/locale/ang/LC_MESSAGES/eel-2.0.mo
 share/locale/ar/LC_MESSAGES/eel-2.0.mo
+share/locale/as/LC_MESSAGES/eel-2.0.mo
 share/locale/az/LC_MESSAGES/eel-2.0.mo
 share/locale/be/LC_MESSAGES/eel-2.0.mo
 share/locale/bg/LC_MESSAGES/eel-2.0.mo
@@ -151,5 +149,7 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
diff --git a/x11-toolkits/gstreamer-plugins-pango/Makefile b/x11-toolkits/gstreamer-plugins-pango/Makefile
index aca74a40196d..a06c6e5e4ba7 100644
--- a/x11-toolkits/gstreamer-plugins-pango/Makefile
+++ b/x11-toolkits/gstreamer-plugins-pango/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-toolkits/gstreamer-plugins-pango/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits
 
 COMMENT=	Gstreamer pango textoverlay plugin
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 5e741c69f79a..7f8363b1cdb3 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/gtksourceview2/Makefile,v 1.1 2007/12/01 06:20:10 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.60 2008/03/10 13:49:44 ahze Exp $
 #
 
 PORTNAME=	gtksourceview2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.2.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index 7e14ac6e8368..40cee0a7a183 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.0.2.tar.bz2) = 8a9daf3fa9ddeed92c18572ee16cd1f5
-SHA256 (gnome2/gtksourceview-2.0.2.tar.bz2) = bd775a331aec8fe682e123773a0609fd673256437c950ced8415ab56eb292e39
-SIZE (gnome2/gtksourceview-2.0.2.tar.bz2) = 1020145
+MD5 (gnome2/gtksourceview-2.2.0.tar.bz2) = f794b2bfea6f56bbdb6da494b5335f74
+SHA256 (gnome2/gtksourceview-2.2.0.tar.bz2) = 05c53f6fe640a07c6f42f3c6fa5a0d6591b659764baaf3292430987f1a558857
+SIZE (gnome2/gtksourceview-2.2.0.tar.bz2) = 1127301
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
index 69850a61fae5..3b30647c2285 100644
--- a/x11-toolkits/gtksourceview2/pkg-plist
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -2,6 +2,8 @@ include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h
 include/gtksourceview-2.0/gtksourceview/gtksourceiter.h
 include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h
 include/gtksourceview-2.0/gtksourceview/gtksourcelanguagemanager.h
+include/gtksourceview-2.0/gtksourceview/gtksourcemark.h
+include/gtksourceview-2.0/gtksourceview/gtksourceprintcompositor.h
 include/gtksourceview-2.0/gtksourceview/gtksourcestyle.h
 include/gtksourceview-2.0/gtksourceview/gtksourcestylescheme.h
 include/gtksourceview-2.0/gtksourceview/gtksourcestyleschememanager.h
@@ -31,7 +33,9 @@ share/gtksourceview-2.0/language-specs/diff.lang
 share/gtksourceview-2.0/language-specs/docbook.lang
 share/gtksourceview-2.0/language-specs/dpatch.lang
 share/gtksourceview-2.0/language-specs/dtd.lang
+share/gtksourceview-2.0/language-specs/eiffel.lang
 share/gtksourceview-2.0/language-specs/erlang.lang
+share/gtksourceview-2.0/language-specs/forth.lang
 share/gtksourceview-2.0/language-specs/fortran.lang
 share/gtksourceview-2.0/language-specs/gap.lang
 share/gtksourceview-2.0/language-specs/gtk-doc.lang
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 9c1966b82d42..66d0623c6786 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.61 2007/09/17 14:52:59 ahze Exp $
+#   $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.64 2008/03/10 16:41:24 ahze Exp $
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 43cf32693b35..6ba8647ba852 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.20.0.tar.bz2) = 14427a459f6ca355de5f5e47ce95c1c4
-SHA256 (gnome/libbonoboui-2.20.0.tar.bz2) = e6958e88039a9ef409ad8e90f78d65c0171e22ee0927f07790eaf6ede722a838
-SIZE (gnome/libbonoboui-2.20.0.tar.bz2) = 991509
+MD5 (gnome/libbonoboui-2.22.0.tar.bz2) = e4e4d74c9387d08c956574f981cf91f2
+SHA256 (gnome/libbonoboui-2.22.0.tar.bz2) = a1f2cc830a67cf02ea66812624d92f369b7d9e0231dc05ee1d0a0374b7706926
+SIZE (gnome/libbonoboui-2.22.0.tar.bz2) = 1006030
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index f7257bbe9e60..589cb347ceb7 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -50,6 +50,7 @@ share/gnome-2.0/ui/bonobo-browser.xml
 share/locale/af/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/as/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
@@ -109,6 +110,7 @@ share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ro/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ru/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/rw/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/si/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sk/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sq/LC_MESSAGES/libbonoboui-2.0.mo
@@ -132,6 +134,7 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrm lib/bonobo-2.0
 @dirrm include/libbonoboui-2.0/bonobo
 @dirrm include/libbonoboui-2.0
+@dirrmtry share/applications
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -142,6 +145,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -158,4 +163,5 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 3bf8762aa97b..5f41b960278f 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.108 2007/10/17 22:37:05 mezz Exp $
+#   $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.116 2008/03/10 15:46:28 ahze Exp $
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.20.1.1
+PORTVERSION=	2.22.01
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -26,11 +26,10 @@ LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
-USE_XPM=	yes
+USE_XORG=	sm
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui ltverhack \
-		referencehack
+		referencehack gvfs
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_BISON=	build
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 36eb70bcf572..9bef1fe4c05e 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = d1f500c5d33ce93159b4952bb476fcf3
-SHA256 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 133933c70234ecd4560cec165034c21c94598c24c34138ed1ee1770f52328cef
-SIZE (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 1445994
+MD5 (gnome2/libgnomeui-2.22.01.tar.bz2) = 7d2bb24361f90201bcbf1327e1498251
+SHA256 (gnome2/libgnomeui-2.22.01.tar.bz2) = 516d2c995fd0acff05be88f75952d7ca2fa68c270f5a60a8b00df823cba289cc
+SIZE (gnome2/libgnomeui-2.22.01.tar.bz2) = 1512741
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index acce03934cfd..8a8f7d0e4b26 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -49,6 +49,9 @@ 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/%%GTK2_VERSION%%/filesystems/libgio.a
+lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgio.la
+lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgio.so
 lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.a
 lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.la
 lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.so
@@ -63,6 +66,7 @@ libdata/pkgconfig/libgnomeui-2.0.pc
 share/locale/af/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/as/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/be@latin/LC_MESSAGES/libgnomeui-2.0.mo
@@ -87,6 +91,7 @@ share/locale/eu/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/fur/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
@@ -122,6 +127,7 @@ share/locale/oc/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ps/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
@@ -172,6 +178,8 @@ share/pixmaps/gnome-about-logo.png
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
@@ -186,9 +194,13 @@ share/pixmaps/gnome-about-logo.png
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 1a714ac77067..fd926d660f85 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.12 2007/09/17 17:05:03 marcus Exp $
+#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.14 2008/03/08 16:56:56 marcus Exp $
 #
 
 PORTNAME=	libgnomeuimm
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index 16f95ce7ae66..4692cdf98bc8 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 350d3424247611a009432395aff8619f
-SHA256 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = f8bb4f068b7b0fc65e026ca28a57f2109f643f537f050f8a2bd0bb019e8bca8f
-SIZE (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 326994
+MD5 (gnome2/libgnomeuimm-2.22.0.tar.bz2) = 74b22fd00133e683ffa23b060d1862e7
+SHA256 (gnome2/libgnomeuimm-2.22.0.tar.bz2) = 493fdc8b31461edbfc3e65b09c29d61670e67706d3b9d2ee3f8a1d9a5303447e
+SIZE (gnome2/libgnomeuimm-2.22.0.tar.bz2) = 325394
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 0c2d8eea8680..a9251b339c7d 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libpanelappletmm
-PORTVERSION=	2.6.0
-PORTREVISION=	5
+PORTVERSION=	2.22.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/libpanelappletmm/distinfo b/x11-toolkits/libpanelappletmm/distinfo
index 963edd2e9379..b099d4dd234a 100644
--- a/x11-toolkits/libpanelappletmm/distinfo
+++ b/x11-toolkits/libpanelappletmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libpanelappletmm-2.6.0.tar.bz2) = 74368673013ca6fe470d2b3f4a06b1df
-SHA256 (gnome2/libpanelappletmm-2.6.0.tar.bz2) = e201eca0b3f35d7fe00f00b7b6c848d2787b9e8172f703994db687ebe065b7b1
-SIZE (gnome2/libpanelappletmm-2.6.0.tar.bz2) = 246596
+MD5 (gnome2/libpanelappletmm-2.22.0.tar.bz2) = 9209dd219a3f4542753743f3c8666e79
+SHA256 (gnome2/libpanelappletmm-2.22.0.tar.bz2) = 74e88cf91f7c3c50e8a546ebc9ff1d011e76b9720644cdc07b613544bd2be33b
+SIZE (gnome2/libpanelappletmm-2.22.0.tar.bz2) = 264581
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 46d9f927d79e..d568db1649c9 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.1 2007/12/01 20:04:12 marcus Exp $
+#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.106 2008/03/10 23:48:53 ahze Exp $
 #
 
 PORTNAME=	libwnck
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -24,9 +24,9 @@ USE_BZIP2=	yes
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_XORG=	xres
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 ltverhack referencehack
+USE_GNOME=	gnomehack gtk20 ltverhack referencehack intlhack
 USE_BISON=	build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 898183405bb9..c50ebfcb474f 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.20.3.tar.bz2) = 0f0f54764993497ed02f34a44056efb2
-SHA256 (gnome2/libwnck-2.20.3.tar.bz2) = d5fc1d8b0202ad169052dcd50b283ed4fb30a4a7da9bbf0be462d2879535dd6a
-SIZE (gnome2/libwnck-2.20.3.tar.bz2) = 637507
+MD5 (gnome2/libwnck-2.22.0.tar.bz2) = db7b86ef93ed08ee1562cd08206f9c66
+SHA256 (gnome2/libwnck-2.22.0.tar.bz2) = 481dbf1ac490eb1a83abbb218a8191a0b7ae378a8d31e353a1abf96dc11f442a
+SIZE (gnome2/libwnck-2.22.0.tar.bz2) = 725210
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index b59fd91fd3a8..91af411df713 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.111 2007/10/15 21:40:26 mezz Exp $
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.118 2008/03/10 17:44:38 ahze Exp $
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.18.4
+PORTVERSION=	1.20.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 RUN_DEPENDS=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
 		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 5087ec0930fa..9bf649719b69 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.18.4.tar.bz2) = 5f4a24eb03789746a13e41beb7044776
-SHA256 (gnome2/pango-1.18.4.tar.bz2) = 6fd3c82eb7aa1fd410cde21189b005095e882d8ab381a5b85bb7483ab7e7efdd
-SIZE (gnome2/pango-1.18.4.tar.bz2) = 1406821
+MD5 (gnome2/pango-1.20.0.tar.bz2) = f0959c4b9b058ba9e4d13fc9086b7e7d
+SHA256 (gnome2/pango-1.20.0.tar.bz2) = 3933d8fbfbc890ae29081a23e76be8da32024dd2a1bfe63c4cc77d607492e23b
+SIZE (gnome2/pango-1.20.0.tar.bz2) = 1412843
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index c7fad2d56cb1..7ffddc166a34 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.65 2007/09/16 17:47:04 ahze Exp $
+#   $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.72 2008/03/09 21:58:25 mezz Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +21,7 @@ COMMENT=	A set of Python bindings used by modules in the GNOME Desktop
 
 BUILD_DEPENDS=	bug-buddy:${PORTSDIR}/devel/bug-buddy
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		totem-plparser.7:${PORTSDIR}/multimedia/totem \
+		totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
 		gnome-keyring:${PORTSDIR}/security/gnome-keyring
 RUN_DEPENDS=	bug-buddy:${PORTSDIR}/devel/bug-buddy
@@ -30,7 +30,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack libgnomeprintui gnomepanel gnomedesktop \
-		gtksourceview libwnck nautiluscdburner pygnome2 metacity
+		gtksourceview libwnck nautiluscdburner pygnome2 metacity \
+		evolutiondataserver
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-metacity
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 244fc7d5468b..ccb42e48dd79 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 02b177f488091d27bf0648ec4660d8f7
-SHA256 (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 32e2f5f4d3e79157a83cb7a1c6c409bc2fef75178f9626b2d83a1fd1c2ee4a8d
-SIZE (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 440199
+MD5 (gnome2/gnome-python-desktop-2.22.0.tar.bz2) = 504877a973f6abc0788283232cd703cb
+SHA256 (gnome2/gnome-python-desktop-2.22.0.tar.bz2) = 116213b0b0fc3f1fa6771589eab86ccdf5d5024c30a987f3b912da0902be9d37
+SIZE (gnome2/gnome-python-desktop-2.22.0.tar.bz2) = 571816
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
index 7fd7db4d9b0a..cdc0b502be3b 100644
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -1,6 +1,11 @@
 %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ecal.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ecal.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo
@@ -71,7 +76,7 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc
 %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourceview-class-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.sgml
 %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
@@ -104,6 +109,7 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc
 share/pygtk/2.0/defs/_gnomedesktop.defs
 share/pygtk/2.0/defs/applet.defs
 share/pygtk/2.0/defs/art.defs
+share/pygtk/2.0/defs/ebook.defs
 share/pygtk/2.0/defs/gnomekeyring.defs
 share/pygtk/2.0/defs/gtksourceview.defs
 share/pygtk/2.0/defs/mediaprofiles.defs
@@ -126,3 +132,4 @@ share/pygtk/2.0/defs/wnck.defs
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/evolution
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 8bb79f1fe771..ff3c9b301074 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.41 2007/07/28 18:23:53 marcus Exp $
+#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.43 2008/02/05 13:25:18 kwm Exp $
 #
 
 PORTNAME=	gnome
 PORTVERSION=	2.19.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -29,7 +29,7 @@ USE_GECKO=	firefox seamonkey xulrunner mozilla
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack libgtkhtml pygnome2
+USE_GNOME=	gnomehack libgtkhtml pygnome2 libgda3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtkmozembed=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 9a0550865cec..e3d9e16306b7 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -1,3 +1,4 @@
+include/pygda-3.0/pygdavalue_conversions.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
@@ -5,6 +6,8 @@
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
@@ -21,6 +24,7 @@
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
 libdata/pkgconfig/gnome-python-extras-2.0.pc
+libdata/pkgconfig/pygda-3.0.pc
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
@@ -43,6 +47,10 @@ libdata/pkgconfig/gnome-python-extras-2.0.pc
 %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
+share/pygtk/2.0/argtypes/gda-arg-types.py
+share/pygtk/2.0/argtypes/gda-arg-types.pyc
+share/pygtk/2.0/argtypes/gda-arg-types.pyo
+share/pygtk/2.0/defs/gda.defs
 share/pygtk/2.0/defs/gtkhtml2.defs
 share/pygtk/2.0/defs/gtkmozembed.defs
 share/pygtk/2.0/defs/trayicon.defs
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 068d1f92f43d..5bcc4067636d 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/py-gnome2/Makefile,v 1.4 2007/11/30 18:56:55 marcus Exp $
+#   $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.49 2008/03/09 21:47:30 mezz Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 8734b64c2526..89fe66a34a5f 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.20.1.tar.bz2) = f05d67b0f288728e703faa8f74995358
-SHA256 (gnome2/gnome-python-2.20.1.tar.bz2) = ab790703c899168ed609b558e011795efdbe4112f8a04f2d605abbfb2190fd2f
-SIZE (gnome2/gnome-python-2.20.1.tar.bz2) = 416845
+MD5 (gnome2/gnome-python-2.22.0.tar.bz2) = ff84c54314adec195149c59365e35a13
+SHA256 (gnome2/gnome-python-2.22.0.tar.bz2) = 13dd15da0b330e32d9798788c0d1a67feaa1ed877698bc9e5bb6acd135cfdf94
+SIZE (gnome2/gnome-python-2.22.0.tar.bz2) = 539423
diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure
index 21db26c6c54e..0f477bfeff7f 100644
--- a/x11-toolkits/py-gnome2/files/patch-configure
+++ b/x11-toolkits/py-gnome2/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Mon Nov  6 02:40:04 2006
-+++ configure	Mon Nov  6 02:40:26 2006
-@@ -19038,7 +19038,7 @@
- 
+--- configure.orig	2007-12-26 11:53:20.000000000 +0100
++++ configure	2007-12-26 11:56:25.000000000 +0100
+@@ -19694,7 +19694,7 @@
+ save_CC="$CC"
  save_LIBS="$LIBS"
  
 -PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
 +PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}"
  
+ CC="$PYTHON_CC"
  LIBS="$LIBS $PYTHON_EMBED_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 913242687d92..54bab3102807 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -57,6 +57,19 @@ libdata/pkgconfig/gnome-python-2.0.pc
 %%PORTDOCS%%share/examples/py-gnome/vfs/pygvfsmethod/pyfs.py
 %%PORTDOCS%%share/examples/py-gnome/vfs/shell.py
 %%PORTDOCS%%share/examples/py-gnome/vfs/sync-xfer.py
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-context.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-directoryhandle.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-drive.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-fileinfo.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-handle.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-uri.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-volume.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-class-reference.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-constants.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-functions.html
+share/gtk-doc/html/pygnomevfs/index.html
+share/gtk-doc/html/pygnomevfs/index.sgml
+share/gtk-doc/html/pygnomevfs/pygnomevfs.devhelp
 share/pygtk/2.0/argtypes/bonobo-arg-types.py
 share/pygtk/2.0/argtypes/bonobo-arg-types.pyc
 share/pygtk/2.0/argtypes/bonobo-arg-types.pyo
@@ -73,6 +86,9 @@ share/pygtk/2.0/defs/gnome-types.defs
 share/pygtk/2.0/defs/gnome.defs
 share/pygtk/2.0/defs/ui.defs
 @dirrmtry share/pygtk/2.0/argtypes
+@dirrm share/gtk-doc/html/pygnomevfs
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
 %%PORTDOCS%%@dirrm share/examples/py-gnome/vfs/pygvfsmethod
 %%PORTDOCS%%@dirrm share/examples/py-gnome/vfs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/popt
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 533c315e3516..ddadb95bf245 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Mezz <mezz@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.6 2007/09/17 13:46:28 ahze Exp $
+#   $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.10 2008/03/10 15:18:35 ahze Exp $
 #
 
 PORTNAME=	gtksourceview
-PORTVERSION=	2.0.0
+PORTVERSION=	2.2.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo
index ed287d31e15f..f96d4b90fe41 100644
--- a/x11-toolkits/py-gtksourceview/distinfo
+++ b/x11-toolkits/py-gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (pygtksourceview-2.0.0.tar.bz2) = a4947108e7a669b67ff0ff157a132728
-SHA256 (pygtksourceview-2.0.0.tar.bz2) = 749075c118a029efc51c58f4a49afbf0ec969a1c1f9ee8c25782ea08b3f9c649
-SIZE (pygtksourceview-2.0.0.tar.bz2) = 255507
+MD5 (pygtksourceview-2.2.0.tar.bz2) = 5dd0a9aa99168f989ed04123a65077e4
+SHA256 (pygtksourceview-2.2.0.tar.bz2) = 457484cf4b6c5c18ba4bcd9d35d5879f3a85e6dbf37f07ba4cfa6c20e6271963
+SIZE (pygtksourceview-2.2.0.tar.bz2) = 267402
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 0cb85727af92..8c18795ef389 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/vte/Makefile,v 1.9 2007/12/04 17:23:37 mezz Exp $
+#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.86 2008/03/10 23:44:02 ahze Exp $
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.16.12
+PORTVERSION=	0.16.13
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 5ae867b6871c..8ef8e670085f 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.16.12.tar.bz2) = 9816c35be2ff1b0cf57bd831e1344d1d
-SHA256 (gnome2/vte-0.16.12.tar.bz2) = 7f0865c5cf5a433052bc6e67ce90f479df6322e37ebbc6f4462f8d947f18978f
-SIZE (gnome2/vte-0.16.12.tar.bz2) = 1113860
+MD5 (gnome2/vte-0.16.13.tar.bz2) = 40480f20f6b7664f3d364e4f2ed27889
+SHA256 (gnome2/vte-0.16.13.tar.bz2) = edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d
+SIZE (gnome2/vte-0.16.13.tar.bz2) = 1114585
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2008-03-24 03:52:36 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2008-03-24 03:52:36 +0000
commit	6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch)
tree	0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /x11-toolkits
parent	- Add USE_XORG= x11 (diff)