Presenting GNOME 2.14.1 for FreeBSD! Checkout

http://www.gnome.org/start/2.14/ for the official release notes, and a list
of all the gooides in this new release.  In particular, GNOME 2.14 focused
on performance, and they did not miss the mark.  There's some new eye candy,
but most of the big things are waiting until GNOME 2.16.  On the FreeBSD
side, we tried to clean up all the crashers we could.  In particular, we
really improved GNOME's 64-bit support.

The good news is that this release does not bring any big shared library
version bumps, so you can almost do a simple portupgrade to get to 2.14.
There are a few minor gotchas that will be documented in UPDATING shortly.

The FreeBSD GNOME Team would like th thank the following users for their
patches, feedback, and sometimes incessant complaing about crashes (you
know who you are).

Yasuda Keisuke <kysd@po.harenet.ne.jp>
Pascal Hofstee <caelian@gmail.com>
rmgls@wanadoo.fr
tmclaugh
Yuri Pankov <yuri.pankov@gmail.com>
sajd on #freebsd-gnome
ade
ankon on #FreeBSD-Gnome
mux
Pascal Hofstee <caelian@gmail.com>
QuiRK on #freebsd-gnome
Vladimir Timofeev <vovkasm@gmail.com>

50 files changed, 345 insertions, 582 deletions

diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 0501a95c0408..91442e378223 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,27 +3,26 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.21 2005/10/03 15:22:10 ahze Exp $
+#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.35 2006/04/13 07:52:42 bland Exp $
 #
 
 PORTNAME=	eel
-PORTVERSION=	2.12.2
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Generally useful classes and extensions to GNOME
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack
-USE_AUTOTOOLS=  libtool:15
-USE_REINPLACE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index 86ac6e92706d..d6f6e83847ec 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.12.2.tar.bz2) = d78cd3e33c656a62b5bf1f8d0b8d271f
-SHA256 (gnome2/eel-2.12.2.tar.bz2) = df6c696f84bc9c2af12f3715f2703060ab1692a918fb221ea0403212c03e0b73
-SIZE (gnome2/eel-2.12.2.tar.bz2) = 675938
+MD5 (gnome2/eel-2.14.1.tar.bz2) = 7002f4f99317ed11da8b9db15b7e4a2b
+SHA256 (gnome2/eel-2.14.1.tar.bz2) = 93b4ef9152be93ae55bef7618c2c661e8424111d292f40e81f066f25ecd7f9cc
+SIZE (gnome2/eel-2.14.1.tar.bz2) = 639752
diff --git a/x11-toolkits/eel/files/patch-Makefile.in b/x11-toolkits/eel/files/patch-Makefile.in
index eaa3dc117279..f58c574eb5fc 100644
--- a/x11-toolkits/eel/files/patch-Makefile.in
+++ b/x11-toolkits/eel/files/patch-Makefile.in
@@ -1,15 +1,11 @@
-
-$FreeBSD$
-  $MCom: ports/x11-toolkits/eel/files/patch-Makefile.in,v 1.4 2005/06/28 05:40:14 adamw Exp $
-
---- Makefile.in	2002/06/13 16:05:09	1.1
-+++ Makefile.in	2002/06/13 16:05:18
-@@ -119,7 +119,7 @@
- 
+--- Makefile.in.orig	Mon Jan 16 12:53:35 2006
++++ Makefile.in	Mon Jan 16 12:54:04 2006
+@@ -239,7 +239,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  NULL = 
- 
 -SUBDIRS = eel test po
 +SUBDIRS = eel po
- 
- EXTRA_DIST =  	COPYING.LIB					HACKING						MAINTAINERS					eel.spec.in					$(NULL)
- 
+ EXTRA_DIST = \
+ 	COPYING.LIB				\
+ 	HACKING					\
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index bf3b8194961e..f4dd36a9e0c2 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -63,6 +63,7 @@ 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/dz/LC_MESSAGES/eel-2.0.mo
 share/locale/el/LC_MESSAGES/eel-2.0.mo
 share/locale/en_CA/LC_MESSAGES/eel-2.0.mo
 share/locale/en_GB/LC_MESSAGES/eel-2.0.mo
@@ -83,8 +84,11 @@ share/locale/id/LC_MESSAGES/eel-2.0.mo
 share/locale/is/LC_MESSAGES/eel-2.0.mo
 share/locale/it/LC_MESSAGES/eel-2.0.mo
 share/locale/ja/LC_MESSAGES/eel-2.0.mo
+share/locale/ka/LC_MESSAGES/eel-2.0.mo
 share/locale/kn/LC_MESSAGES/eel-2.0.mo
 share/locale/ko/LC_MESSAGES/eel-2.0.mo
+share/locale/ku/LC_MESSAGES/eel-2.0.mo
+share/locale/ky/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
@@ -121,6 +125,7 @@ share/locale/vi/LC_MESSAGES/eel-2.0.mo
 share/locale/wa/LC_MESSAGES/eel-2.0.mo
 share/locale/xh/LC_MESSAGES/eel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/eel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
@@ -128,6 +133,10 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
 @dirrm include/eel-2/eel
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index be2f3b44b840..403eee9a8fa9 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -3,24 +3,24 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.23 2005/10/03 15:24:49 ahze Exp $
+#   $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.37 2006/04/13 07:52:42 bland Exp $
 #
 
 PORTNAME=	gtksourceview
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.6.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A text widget that adds syntax highlighting to the GtkTextView widget
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome libgnomeprintui intlhack \
 		ltverhack
diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo
index 954fa1628ef7..3354b5558068 100644
--- a/x11-toolkits/gtksourceview/distinfo
+++ b/x11-toolkits/gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-1.4.2.tar.bz2) = 323a56ae9559af12f64fc5090955e68b
-SHA256 (gnome2/gtksourceview-1.4.2.tar.bz2) = 4edd368ac1141df9a0ae668ea66aacddb241f4812cd7134be249db0aabe65847
-SIZE (gnome2/gtksourceview-1.4.2.tar.bz2) = 704867
+MD5 (gnome2/gtksourceview-1.6.1.tar.bz2) = f8ca3a1a746477b2b46de7ebea276db5
+SHA256 (gnome2/gtksourceview-1.6.1.tar.bz2) = a08e0b470d3d2b49f7c2a43a20ba5ab185044835c0f427bfe45220ae0127024d
+SIZE (gnome2/gtksourceview-1.6.1.tar.bz2) = 743991
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index dc0462bd68a7..71e28a5d925d 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -27,6 +27,7 @@ libdata/pkgconfig/gtksourceview-1.0.pc
 %%DOCSDIR%%/gtksourceview-GtkSourceTagStyle.html
 %%DOCSDIR%%/gtksourceview-Searching-in-a-GtkSourceBuffer.html
 %%DOCSDIR%%/gtksourceview.devhelp
+%%DOCSDIR%%/gtksourceview.devhelp2
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
@@ -38,6 +39,7 @@ libdata/pkgconfig/gtksourceview-1.0.pc
 share/gnome/gtksourceview-1.0/language-specs/R.lang
 share/gnome/gtksourceview-1.0/language-specs/ada.lang
 share/gnome/gtksourceview-1.0/language-specs/c.lang
+share/gnome/gtksourceview-1.0/language-specs/changelog.lang
 share/gnome/gtksourceview-1.0/language-specs/cpp.lang
 share/gnome/gtksourceview-1.0/language-specs/csharp.lang
 share/gnome/gtksourceview-1.0/language-specs/css.lang
@@ -57,12 +59,14 @@ share/gnome/gtksourceview-1.0/language-specs/lua.lang
 share/gnome/gtksourceview-1.0/language-specs/makefile.lang
 share/gnome/gtksourceview-1.0/language-specs/msil.lang
 share/gnome/gtksourceview-1.0/language-specs/nemerle.lang
+share/gnome/gtksourceview-1.0/language-specs/octave.lang
 share/gnome/gtksourceview-1.0/language-specs/pascal.lang
 share/gnome/gtksourceview-1.0/language-specs/perl.lang
 share/gnome/gtksourceview-1.0/language-specs/php.lang
 share/gnome/gtksourceview-1.0/language-specs/po.lang
 share/gnome/gtksourceview-1.0/language-specs/python.lang
 share/gnome/gtksourceview-1.0/language-specs/ruby.lang
+share/gnome/gtksourceview-1.0/language-specs/scheme.lang
 share/gnome/gtksourceview-1.0/language-specs/sh.lang
 share/gnome/gtksourceview-1.0/language-specs/sql.lang
 share/gnome/gtksourceview-1.0/language-specs/tcl.lang
@@ -82,6 +86,7 @@ share/locale/cs/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/cy/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/da/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/de/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/dz/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/el/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/en_CA/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/en_GB/LC_MESSAGES/gtksourceview-1.0.mo
@@ -130,11 +135,16 @@ share/locale/uk/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/vi/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/xh/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/zh_HK/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/gtksourceview-1.0/language-specs
 @dirrm share/gnome/gtksourceview-1.0
 @dirrm %%DOCSDIR%%
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index b9fd1fad5308..774136d2fec5 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,25 +3,26 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.43 2006/04/13 07:52:43 bland Exp $
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.10.1
-PORTREVISION=	2
+PORTVERSION=	2.14.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
-DIST_SUBDIR=	gnome2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GUI frontend to the libbonobo component of GNOME 2
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack \
 		libgnomecanvas libgnome
-GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index b785d5f4e0e7..4a703b65ca1c 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonoboui-2.10.1.tar.bz2) = 74c4b633ae33524e2f6d3e6573b75f3c
-SHA256 (gnome2/libbonoboui-2.10.1.tar.bz2) = 7b1eb566f2485a97d3c3f2ab507b1b3112fce93ea588a8675e62da3ef6e17b40
-SIZE (gnome2/libbonoboui-2.10.1.tar.bz2) = 884026
+MD5 (gnome/libbonoboui-2.14.0.tar.bz2) = dc26dc17cddc625cac37ecfab263a51a
+SHA256 (gnome/libbonoboui-2.14.0.tar.bz2) = 2dd02787e5bad91e1efbfe2fe041eefe8cf13ebce9607d6dd9764c69f37233a8
+SIZE (gnome/libbonoboui-2.14.0.tar.bz2) = 893139
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index f622fe467c1f..2fff214904af 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Aug 19 16:03:13 2005
-+++ Makefile.in	Fri Aug 19 16:03:31 2005
-@@ -146,7 +146,7 @@
+--- Makefile.in.orig	Mon Jan 16 19:14:25 2006
++++ Makefile.in	Mon Jan 16 19:15:36 2006
+@@ -148,7 +148,7 @@
  am__quote = @am__quote@
  gnomelocaledir = @gnomelocaledir@
  install_sh = @install_sh@
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index a6424c427d06..fa586877ffe4 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -117,9 +117,11 @@ 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/ku/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/li/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/lt/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/mk/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/mr/LC_MESSAGES/libbonoboui-2.0.mo
@@ -153,10 +155,13 @@ share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/xh/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/yi/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrm lib/bonobo-2.0/samples
 @dirrm lib/bonobo-2.0
 @dirrm include/libbonoboui-2.0/bonobo
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 8e294ee5e465..df7a132312bd 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.66 2005/09/07 04:43:08 marcus Exp $
+#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.79 2006/04/13 07:52:43 bland Exp $
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.12.1
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,12 +20,13 @@ LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnomekeyring \
 RUN_DEPENDS=	${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui ltverhack
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 8134da41b22f..406ea091cd0a 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.12.1.tar.bz2) = 97ee22e36d6fb8c4a57796da4110145e
-SHA256 (gnome2/libgnomeui-2.12.1.tar.bz2) = 672e4f6b756b4a7a0b79b6c310bec1ba39e81840471eac85951df9795cf7afe9
-SIZE (gnome2/libgnomeui-2.12.1.tar.bz2) = 1852044
+MD5 (gnome2/libgnomeui-2.14.1.tar.bz2) = ff6b6c25de0e7e39c79998621cdec048
+SHA256 (gnome2/libgnomeui-2.14.1.tar.bz2) = e1029ed0c69d7e1259c48d9ff1afdd87505182e0a1ef28ef3b48592a3a3c1c88
+SIZE (gnome2/libgnomeui-2.14.1.tar.bz2) = 1891798
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
deleted file mode 100644
index 87c3856f1ce1..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- libgnomeui/gnome-app-helper.c.orig	Sun Mar 20 20:46:17 2005
-+++ libgnomeui/gnome-app-helper.c	Sun Mar 20 20:49:57 2005
-@@ -435,6 +435,8 @@
-                 new_setting = gconf_value_get_bool(value);
-         }
- 
-+	GDK_THREADS_ENTER();
-+
-         if (new_setting && (mi->image == NULL)) {
-                 GtkWidget *pixmap;
-                 GnomeUIPixmapType pixmap_type;
-@@ -457,6 +459,8 @@
-         } else if (!new_setting && (mi->image != NULL)) {
- 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), NULL);
-         }
-+
-+	GDK_THREADS_LEAVE();
- }
- 
- /* Note that this function is also used for toolbars, don't assume
-@@ -1320,6 +1324,8 @@
- 	if (entry->value->type != GCONF_VALUE_BOOL)
- 		return;
- 
-+	GDK_THREADS_ENTER();
-+
- 	menu = GTK_WIDGET (user_data);
- 	
- 	if (gconf_value_get_bool (entry->value)) {
-@@ -1329,6 +1335,7 @@
- 
- 		if (tearoff) {
- 			/* Do nothing */
-+			GDK_THREADS_LEAVE();
- 			return;
- 		}
- 		
-@@ -1345,6 +1352,7 @@
- 
- 		if (!tearoff) {
- 			/* Do nothing */
-+			GDK_THREADS_LEAVE();
- 			return;
- 		}
- 		
-@@ -1352,6 +1360,8 @@
- 		gtk_widget_destroy (tearoff);
- 		g_object_set_data (G_OBJECT (menu), "gnome-app-tearoff", NULL);
- 	}
-+
-+	GDK_THREADS_LEAVE();
- }
- 
- 
-@@ -2467,7 +2477,9 @@
-                 }
-         }
- 
-+	GDK_THREADS_ENTER();
-         gtk_toolbar_set_style(toolbar, style);
-+	GDK_THREADS_LEAVE();
- }
- 
- static void
-@@ -2511,7 +2523,9 @@
- 			style = GTK_TOOLBAR_BOTH;
-         }
- 
-+	GDK_THREADS_ENTER();
-         gtk_toolbar_set_style(toolbar, style);
-+	GDK_THREADS_LEAVE();
- }
- 
- static void
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
deleted file mode 100644
index aae4e39f80ab..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeui/gnome-app.c.orig	Sun Mar 20 20:51:20 2005
-+++ libgnomeui/gnome-app.c	Sun Mar 20 20:52:01 2005
-@@ -269,7 +269,9 @@
- 		detachable = gconf_value_get_bool (entry->value);
- 		
- 		/* Update */
-+		GDK_THREADS_ENTER();
- 		bonobo_dock_item_set_locked (item, !detachable);
-+		GDK_THREADS_LEAVE();
- 	}
- }
- 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
deleted file mode 100644
index e83891c08a3a..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- libgnomeui/gnome-entry.c.orig	Sun Mar 20 20:54:19 2005
-+++ libgnomeui/gnome-entry.c	Sun Mar 20 20:54:20 2005
-@@ -419,6 +419,8 @@
- {
- 	GnomeEntry *gentry;
- 
-+	GDK_THREADS_ENTER();
-+
- 	gentry = GNOME_ENTRY (user_data);
- 
- 	/* If we're getting a notification from saving our own
-@@ -427,10 +429,13 @@
- 	if (gentry->_priv->saving_history) {
- 		gentry->_priv->saving_history = FALSE;
- 
-+		GDK_THREADS_LEAVE();
- 		return;
- 	}
- 
- 	gnome_entry_load_history (gentry);
-+
-+	GDK_THREADS_LEAVE();
- }
- 
- /* FIXME: Make this static */
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
deleted file mode 100644
index 5713fbd49d15..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-gconf-ui.c.orig	Sun Mar 20 20:38:41 2005
-+++ libgnomeui/gnome-gconf-ui.c	Sun Mar 20 20:39:51 2005
-@@ -148,6 +148,8 @@
-         g_return_val_if_fail(eid.client != NULL, FALSE);
-         g_return_val_if_fail(pending_errors != NULL, FALSE);
- 
-+        GDK_THREADS_ENTER();
-+
-         if (current_dialog == NULL) {
-                 GtkWidget *dialog;
-                 gboolean have_overridden = FALSE;
-@@ -245,6 +247,8 @@
- 
-         gtk_window_present (GTK_WINDOW (current_dialog));
-         
-+        GDK_THREADS_LEAVE();
-+
-         return FALSE;
- }
- 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
deleted file mode 100644
index 160e5ad9b834..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-ice.c.orig	Sun Mar 20 20:33:56 2005
-+++ libgnomeui/gnome-ice.c	Sun Mar 20 20:34:21 2005
-@@ -54,6 +54,8 @@
-   IceConn connection = (IceConn) data;
-   IceProcessMessagesStatus status;
- 
-+  GDK_THREADS_ENTER();
-+
-   status = IceProcessMessages (connection, NULL, NULL);
- 
-   if (status == IceProcessMessagesIOError)
-@@ -73,6 +75,8 @@
- 	  IceCloseConnection (connection);
- 	}
-     }
-+
-+  GDK_THREADS_LEAVE();
- 
-   return TRUE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
deleted file mode 100644
index d096e0818dc3..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-icon-sel.c.orig	Sun Mar 20 20:40:05 2005
-+++ libgnomeui/gnome-icon-sel.c	Sun Mar 20 20:42:24 2005
-@@ -353,6 +353,8 @@
- 		return FALSE;
- 	}
- 
-+	GDK_THREADS_ENTER();
-+
- 	append_an_icon (gis, list->data);
- 
- 	g_free (list->data);
-@@ -367,6 +369,8 @@
- 				       (double)gis->_priv->load_i / gis->_priv->load_file_count);
- 
- 	gis->_priv->load_i ++;
-+
-+	GDK_THREADS_LEAVE();
- 
- 	return TRUE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
deleted file mode 100644
index 46fc0489b807..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- libgnomeui/gnome-pixmap-entry.c.orig	Sun Mar 20 20:34:49 2005
-+++ libgnomeui/gnome-pixmap-entry.c	Sun Mar 20 20:38:30 2005
-@@ -237,6 +237,8 @@
- {
- 	GSList *li,*tmp;
- 
-+	GDK_THREADS_ENTER();
-+
- 	tmp = changed_pentries;
- 	changed_pentries = NULL;
- 	if(tmp) {
-@@ -244,9 +246,13 @@
- 			refresh_preview(li->data);
- 		}
- 		g_slist_free(tmp);
-+
-+		GDK_THREADS_LEAVE();
- 		return TRUE;
- 	}
- 	change_timeout = 0;
-+
-+	GDK_THREADS_LEAVE();
- 
- 	return FALSE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
deleted file mode 100644
index a38f7005215e..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgnomeui/gnome-ui-init.c.orig	Sun Mar 20 20:56:32 2005
-+++ libgnomeui/gnome-ui-init.c	Sun Mar 20 20:56:36 2005
-@@ -492,8 +492,10 @@
-                                 gnome_gconf_get_bool ("/desktop/gnome/sound/event_sounds"));
- 
-         if (new_use_event_sounds && !use_event_sounds) {
-+                GDK_THREADS_ENTER();
-                 initialize_gtk_signal_relay ();
-                 initialize_gnome_signal_relay ();
-+                GDK_THREADS_LEAVE();
- 	}
- 
-         use_event_sounds = new_use_event_sounds;
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c
deleted file mode 100644
index 99990e1b9f63..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- libgnomeui/gnome-authentication-manager.c.orig	Mon Aug  1 03:34:03 2005
-+++ libgnomeui/gnome-authentication-manager.c	Mon Aug  1 03:36:29 2005
-@@ -849,7 +849,11 @@
- 	info->response = response;
- 	info->response_data = response_data;
- 
-+	GDK_THREADS_ENTER ();
-+
- 	present_question_dialog_nonblocking (info);
-+
-+	GDK_THREADS_LEAVE ();
- }
- 
- static void /* GnomeVFSModuleCallback */
-@@ -870,11 +874,15 @@
- 	in_real = (GnomeVFSModuleCallbackQuestionIn *)in;
- 	out_real = (GnomeVFSModuleCallbackQuestionOut *)out;
- 	
-+	GDK_THREADS_ENTER ();
-+
- 	out_real->answer = -1; /* Set a default value */
- 	dialog = create_question_dialog (in_real->primary_message, in_real->secondary_message, in_real->choices);
- 	out_real->answer = gtk_dialog_run (GTK_DIALOG(dialog));
- 
- 	gtk_widget_destroy (GTK_WIDGET (dialog));
-+
-+	GDK_THREADS_LEAVE ();
- }
- 
- 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
new file mode 100644
index 000000000000..c3c751eff668
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
@@ -0,0 +1,28 @@
+--- libgnomeui/gnome-thumbnail.c.orig	Sat Jan 21 23:11:21 2006
++++ libgnomeui/gnome-thumbnail.c	Sat Jan 21 23:10:52 2006
+@@ -994,11 +994,7 @@ gnome_thumbnail_factory_generate_thumbna
+     return NULL;
+ 
+   width = gdk_pixbuf_get_width (pixbuf);
+-  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
+-			  g_strdup_printf ("%d", width), g_free);
+   height = gdk_pixbuf_get_height (pixbuf);
+-  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
+-			  g_strdup_printf ("%d", height), g_free);
+ 
+   if (width > size || height > size)
+     {
+@@ -1011,6 +1007,13 @@ gnome_thumbnail_factory_generate_thumbna
+       g_object_unref (pixbuf);
+       pixbuf = scaled;
+     }
++
++  width = gdk_pixbuf_get_width (pixbuf);
++  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
++			  g_strdup_printf ("%d", width), g_free);
++  height = gdk_pixbuf_get_height (pixbuf);
++  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
++			  g_strdup_printf ("%d", height), g_free);
+   
+   return pixbuf;
+ }
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index bc295b7fa271..100cd660f7c3 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -79,6 +79,7 @@ libexec/gnome_segv2
 %%DOCSDIR%%/GnomeIconEntry.html
 %%DOCSDIR%%/GnomeIconList.html
 %%DOCSDIR%%/GnomeIconSelection.html
+%%DOCSDIR%%/GnomeIconTextItem.html
 %%DOCSDIR%%/GnomeMDI.html
 %%DOCSDIR%%/GnomeMDIChild.html
 %%DOCSDIR%%/GnomeMDIGenericChild.html
@@ -96,8 +97,12 @@ libexec/gnome_segv2
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
 %%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnomeui-GnomeAuthentication.html
+%%DOCSDIR%%/libgnomeui-GnomeIce.html
 %%DOCSDIR%%/libgnomeui-GnomeIconLookup.html
 %%DOCSDIR%%/libgnomeui-GnomeIconTheme.html
+%%DOCSDIR%%/libgnomeui-GnomeMultiScreen.html
+%%DOCSDIR%%/libgnomeui-GnomePassword.html
 %%DOCSDIR%%/libgnomeui-GnomeThemeFile.html
 %%DOCSDIR%%/libgnomeui-GnomeThumbnail.html
 %%DOCSDIR%%/libgnomeui-gnome-app-helper.html
@@ -110,6 +115,7 @@ libexec/gnome_segv2
 %%DOCSDIR%%/libgnomeui-gnome-ui-init.html
 %%DOCSDIR%%/libgnomeui-gnome-uidefs.html
 %%DOCSDIR%%/libgnomeui-gnome-vfs-util.html
+%%DOCSDIR%%/libgnomeui-gnome-window-icon.html
 %%DOCSDIR%%/libgnomeui-gnome-window.html
 %%DOCSDIR%%/libgnomeui-gnometypebuiltins.html
 %%DOCSDIR%%/libgnomeui-objects.html
@@ -169,6 +175,7 @@ share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/dz/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
@@ -190,6 +197,7 @@ share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ka/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/ku/LC_MESSAGES/libgnomeui-2.0.mo
@@ -227,6 +235,7 @@ share/locale/te/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/tk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/tt/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
@@ -238,11 +247,15 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm %%DOCSDIR%%
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
-@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 51447e451e1a..fbe2a65efa31 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,15 +3,14 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.5 2005/10/14 20:39:59 adamw Exp $
+#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.8 2006/04/13 07:52:43 bland Exp $
 #
 
 PORTNAME=	libgnomeuimm
-PORTVERSION=	2.12.0
-PORTREVISION=	1
+PORTVERSION=	2.14.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index f9dc65e88165..cd6b5f611295 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeuimm-2.12.0.tar.bz2) = 50ee34ec10c4527f1dc49bb12d0e0954
-SHA256 (gnome2/libgnomeuimm-2.12.0.tar.bz2) = 2d3c1c740c767d92c7c1b7c3147e42376bea866365ed913b6dd7d96cfc45f9c0
-SIZE (gnome2/libgnomeuimm-2.12.0.tar.bz2) = 322127
+MD5 (gnome2/libgnomeuimm-2.14.0.tar.bz2) = 066edc6d3dea4f0dce317dbf5ea7c24e
+SHA256 (gnome2/libgnomeuimm-2.14.0.tar.bz2) = a0fdc784acea3b2858ffd84e84d22928c3878d5714954df9fe7443c3e5dfe2b4
+SIZE (gnome2/libgnomeuimm-2.14.0.tar.bz2) = 323164
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index dac66f2316e9..65081a5a17ab 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.52 2005/10/03 15:44:48 ahze Exp $
+#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.70 2006/04/13 07:52:43 bland Exp $
 #
 
 PORTNAME=	libwnck
-PORTVERSION=	2.12.3
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,12 +19,13 @@ COMMENT=	Library used for writing pagers and taskslists
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 ltverhack intlhack
+USE_GNOME=	gnomehack gtk20 ltverhack
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index c61f0babf7b2..53a638090cc7 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.12.3.tar.bz2) = a3d7e72d8e756af0edd65380af795693
-SHA256 (gnome2/libwnck-2.12.3.tar.bz2) = 48508f68ffab806e7218113761293c0945f3fcb6a54ef711761879ffe93af3fc
-SIZE (gnome2/libwnck-2.12.3.tar.bz2) = 444009
+MD5 (gnome2/libwnck-2.14.1.tar.bz2) = 7049a33a2cb8c65433c742bd04de6407
+SHA256 (gnome2/libwnck-2.14.1.tar.bz2) = 168f17d9e29d08db1207dd5679181769306a9a1262a3835008638737f972fd85
+SIZE (gnome2/libwnck-2.14.1.tar.bz2) = 453898
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index b7ee3e730cde..a8b8c74d49d5 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -95,6 +95,7 @@ share/locale/ne/LC_MESSAGES/libwnck.mo
 share/locale/nl/LC_MESSAGES/libwnck.mo
 share/locale/nn/LC_MESSAGES/libwnck.mo
 share/locale/no/LC_MESSAGES/libwnck.mo
+share/locale/or/LC_MESSAGES/libwnck.mo
 share/locale/pa/LC_MESSAGES/libwnck.mo
 share/locale/pl/LC_MESSAGES/libwnck.mo
 share/locale/pt/LC_MESSAGES/libwnck.mo
@@ -122,8 +123,6 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
 @dirrm %%DOCSDIR%%
 @dirrm include/libwnck-1.0/libwnck
 @dirrm include/libwnck-1.0
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 6c5b1f2d41d4..d44477ea70d9 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,14 +3,14 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/pango/Makefile,v 1.5 2006/03/05 18:31:28 marcus Exp $
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.60 2006/04/27 11:12:49 ahze Exp $
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.10.4
+PORTVERSION=	1.12.2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.10,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.7/
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.12,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.10/
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -25,9 +25,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack glib20 ltverhack
 CONFIGURE_ARGS=	--with-qt=no \
 		--with-html-dir=${PREFIX}/share/doc \
@@ -38,7 +37,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 # stuff, with Bad Results[tm]
 #
 GLIB2_CFLAGS=	`pkg-config glib-2.0 --cflags`
-PLIST_SUB=	VERSION="1.4.0"
+PLIST_SUB=	VERSION="1.5.0"
 
 FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir
@@ -58,10 +57,6 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \
-		${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \
-		s|TT_Err_|FT_Err_|g'
 post-install:
 	@${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 3431d2d0c206..439efb04cbfd 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.10.4.tar.bz2) = d7eeb0f995a93534be8e7c687b465a0c
-SHA256 (gnome2/pango-1.10.4.tar.bz2) = c2e92e373e374c730a11dbe9a3d2ada01a20e6973863debfaf6f7295002e6b25
-SIZE (gnome2/pango-1.10.4.tar.bz2) = 1184862
+MD5 (gnome2/pango-1.12.2.tar.bz2) = f41488236baf881a4844216ac61abc24
+SHA256 (gnome2/pango-1.12.2.tar.bz2) = 64edfc430d7afd0787eafbd88205bcb2bd7f997b9a6b368fb0a8e73562cb6d7a
+SIZE (gnome2/pango-1.12.2.tar.bz2) = 1212512
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index 4f943b6912a8..63e2e8673d18 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,6 +1,6 @@
 
 $FreeBSD$
-  $MCom: ports-stable/x11-toolkits/pango/files/patch-ac,v 1.3 2006/02/27 01:17:11 marcus Exp $
+  $MCom: ports/x11-toolkits/pango/files/patch-ac,v 1.18 2006/03/13 05:45:48 mezz Exp $
 
 --- Makefile.in.orig	Mon Aug  2 19:12:56 2004
 +++ Makefile.in	Mon Aug  2 19:13:11 2004
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index be3aa8e84b6c..6b7b96d2d326 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -1,4 +1,5 @@
 bin/pango-querymodules
+bin/pango-view
 etc/pango/pango.modules
 etc/pango/pangox.aliases
 include/pango-1.0/pango/pango-attributes.h
@@ -98,6 +99,7 @@ libdata/pkgconfig/pangoxft.pc
 %%DOCSDIR%%/layout.gif
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/lowlevel.html
+%%DOCSDIR%%/pango-ATSUI-Fonts.html
 %%DOCSDIR%%/pango-Cairo-Rendering.html
 %%DOCSDIR%%/pango-Coverage-Maps.html
 %%DOCSDIR%%/pango-Engines.html
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
new file mode 100644
index 000000000000..9aeb67dc21a7
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for:	py-gnome-desktop
+# Date created:				20 January 2006
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.39 2006/03/12 23:43:07 marcus Exp $
+#
+
+PORTNAME=	gnome
+PORTVERSION=	2.14.0
+CATEGORIES=	x11-toolkits python gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-python-desktop/${PORTVERSION:C/..$//}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-desktop
+DISTNAME=	gnome-python-desktop-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A set of Python bindings used by modules in the GNOME Desktop
+
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
+		totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
+		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_PYTHON=	yes
+USE_GNOME=	gnomehack libgnomeprintui gnomepanel \
+		gtksourceview libwnck nautiluscdburner pygnome2 metacity
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+EG_SRC_DIR=	${WRKSRC}/examples
+EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
+.if !defined(NOPORTDOCS)
+DOCSDIR=	${PREFIX}/share/doc/py-gnome-desktop
+.else
+DOCSDIR=	${WRKSRC}/share/doc/py-gnome-desktop
+.endif
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
+
+.if !defined(NOPORTDOCS)
+post-install:
+	${MKDIR} ${EG_DST_DIR}
+	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
+	${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
new file mode 100644
index 000000000000..85e7ee9263a1
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-python-desktop-2.14.0.tar.bz2) = d3f9c2d213b7d486ca7bd87dd106ca69
+SHA256 (gnome2/gnome-python-desktop-2.14.0.tar.bz2) = 1e617686fc7b84a4b2779cdfe3987a592f40bd24f3f5e252fd559ca41452dde1
+SIZE (gnome2/gnome-python-desktop-2.14.0.tar.bz2) = 403302
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
index 05db58a4c083..05db58a4c083 100644
--- a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c
+++ b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
diff --git a/x11-toolkits/py-gnome-desktop/pkg-descr b/x11-toolkits/py-gnome-desktop/pkg-descr
new file mode 100644
index 000000000000..cbc8cc5d8dd1
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/pkg-descr
@@ -0,0 +1,2 @@
+GnomePythonDesktop provides python interfacing modules for some GNOME
+libraries part of the GNOME Desktop.
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
new file mode 100644
index 000000000000..7f7cd743a321
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -0,0 +1,108 @@
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
+libdata/pkgconfig/gnome-python-desktop-2.0.pc
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintconfig.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintcontext.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintfont.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintfontface.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintglyphlist.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintjob.html
+%%DOCSDIR%%/pygnomeprint/gnomeprint-class-reference.html
+%%DOCSDIR%%/pygnomeprint/index.html
+%%DOCSDIR%%/pygnomeprint/index.sgml
+%%DOCSDIR%%/pygnomeprint/pygnomeprint.devhelp
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuidialog.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontdialog.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontpreview.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontselection.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuijobpreview.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipaperselector.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipreview.html
+%%DOCSDIR%%/pygnomeprintui/gnomeprintui-class-reference.html
+%%DOCSDIR%%/pygnomeprintui/index.html
+%%DOCSDIR%%/pygnomeprintui/index.sgml
+%%DOCSDIR%%/pygnomeprintui/pygnomeprintui.devhelp
+%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourceprintjob.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
+%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
+%%DOCSDIR%%/pygtksourceview/index.html
+%%DOCSDIR%%/pygtksourceview/index.sgml
+%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
+share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
+share/examples/py-gnome/applet/README
+share/examples/py-gnome/applet/applet.py
+share/examples/py-gnome/gnomeprint/README
+share/examples/py-gnome/gnomeprint/example_01.py
+share/examples/py-gnome/gnomeprint/example_02.py
+share/examples/py-gnome/gnomeprint/example_03.py
+share/examples/py-gnome/gnomeprint/example_04.py
+share/examples/py-gnome/gnomeprint/example_05.py
+share/examples/py-gnome/gnomeprint/example_06.py
+share/examples/py-gnome/gnomeprint/example_08.py
+share/examples/py-gnome/gnomeprint/example_09.py
+share/examples/py-gnome/gnomeprint/example_10.glade
+share/examples/py-gnome/gnomeprint/example_10.py
+share/examples/py-gnome/gnomeprint/example_11.py
+share/examples/py-gnome/gnomeprint/sample-image.png
+share/examples/py-gnome/gnomeprint/test-print.py
+share/examples/py-gnome/gtksourceview/test-widget.py
+share/examples/py-gnome/mediaprofiles/profiles.py
+share/examples/py-gnome/nautilusburn/blank_disc.py
+share/examples/py-gnome/nautilusburn/drive_selection.py
+share/examples/py-gnome/nautilusburn/write_iso.py
+share/pygtk/2.0/defs/applet.defs
+share/pygtk/2.0/defs/art.defs
+share/pygtk/2.0/defs/gtksourceview.defs
+share/pygtk/2.0/defs/mediaprofiles.defs
+share/pygtk/2.0/defs/metacity.defs
+share/pygtk/2.0/defs/nautilus_burn.defs
+share/pygtk/2.0/defs/nb_drive_selection.defs
+share/pygtk/2.0/defs/print.defs
+share/pygtk/2.0/defs/printui.defs
+share/pygtk/2.0/defs/wnck.defs
+%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn
+%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
+%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
+%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
+%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprintui
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprint
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 4065d9338a95..f012c01c9279 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.26 2005/11/29 16:07:33 marcus Exp $
+#    $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.36 2006/03/12 23:45:37 marcus Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.12.1
-PORTREVISION=	2
+PORTVERSION=	2.14.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -21,19 +20,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of Python bindings for GNOME 2
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
-		gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
 		gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
 		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 \
 		gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
 
 USE_GECKO=	firefox mozilla seamonkey
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack libgnomeprintui libgtkhtml gnomepanel \
-		gtksourceview libwnck nautiluscdburner pygnome2
+USE_GNOME=	gnomehack libgtkhtml pygnome2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtkmozembed=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -53,8 +48,6 @@ DOCSDIR=	${WRKSRC}/share/doc/py-gnome-extras
 post-patch:
 	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
-	@${REINPLACE_CMD} -e 's|-DHAVE_GNOMEPRINT28||g' \
-		${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
index d1cab357601a..aa67159b86a0 100644
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ b/x11-toolkits/py-gnome-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 62a3d8bb5bd5c1696c7200c001ea34f2
-SHA256 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = d1f93adf096bd739cba988d9cdea8978faa97ac928bad26352e62830e8806ab5
-SIZE (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 476483
+MD5 (gnome2/gnome-python-extras-2.14.0.tar.bz2) = e9390569e18a5e71da1ed9476fa750b3
+SHA256 (gnome2/gnome-python-extras-2.14.0.tar.bz2) = 72108b6327b1894cc302b423aa18c0aad14d066c3befad403c7247148745aef3
+SIZE (gnome2/gnome-python-extras-2.14.0.tar.bz2) = 347462
diff --git a/x11-toolkits/py-gnome-extras/files/patch-Makefile.in b/x11-toolkits/py-gnome-extras/files/patch-Makefile.in
deleted file mode 100644
index 89faafbdc36f..000000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Jan 28 14:22:51 2005
-+++ Makefile.in	Fri Jan 28 14:23:04 2005
-@@ -43,7 +43,7 @@
- @BUILD_WNCK_TRUE@am__append_5 = wnck
- @BUILD_GTKMOZEMBED_TRUE@am__append_6 = gtkmozembed
- @BUILD_GTKSPELL_TRUE@am__append_7 = gtkspell
--@BUILD_GDL_TRUE@am__append_8 = gdl
-+@BUILD_GDL_TRUE@am__append_8 =
- @BUILD_TOTEM_PLPARSER_TRUE@am__append_9 = totem
- @BUILD_GTOP_TRUE@am__append_10 = gtop
- @BUILD_NAUTILUSBURN_TRUE@am__append_11 = nautilusburn
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override b/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override
deleted file mode 100644
index 1fa283a57d13..000000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override
+++ /dev/null
@@ -1,102 +0,0 @@
---- gda/gda.override.orig	Wed Apr 20 16:10:31 2005
-+++ gda/gda.override	Wed Apr 20 16:12:56 2005
-@@ -59,13 +59,14 @@ override gda_config_get_data_source_list
- static PyObject*
- _wrap_gda_config_get_data_source_list (PyObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_get_data_source_list();
-+	list = gda_config_get_data_source_list();
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pyg_boxed_new (GDA_TYPE_DATA_SOURCE_INFO, tmp->data, FALSE, FALSE);
-@@ -81,13 +82,14 @@ override gda_config_get_provider_list kw
- static PyObject*
- _wrap_gda_config_get_provider_list (PyObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_get_provider_list();
-+	list = gda_config_get_provider_list();
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pyg_boxed_new (GDA_TYPE_PROVIDER_INFO, tmp->data, FALSE, FALSE);
-@@ -174,20 +176,22 @@ static PyObject*
- _wrap_gda_config_list_keys (PyObject* self, PyObject* fargs, PyObject* kwargs) {
- 	static char* kwlist[] = { "path", NULL };
- 	gchar* path = "/";
-+	PyObject *plist;
-+	GList *tmp, *list;
- 
- 	if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "|s:config_list_keys", kwlist, &path)) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	PyObject* plist = PyList_New (0);
-+	plist = PyList_New (0);
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_config_list_keys (path);
-+	list = gda_config_list_keys (path);
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyList_Append (plist, PyString_FromString (tmp->data));
-@@ -201,7 +205,8 @@ override gda_connection_execute_command 
- static PyObject*
- _wrap_gda_connection_execute_command (PyGObject* self, PyObject* fargs, PyObject* kwargs) {
- 	static char* kwlist[] = { "cmd", "params", NULL };
--	PyGObject *cmd, *params;
-+	PyGObject *cmd, *params, *plist;
-+	GList *tmp, *list;
- 
- /* TODO: 
- 	if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "O!O!:GdaConnection.execute_command",
-@@ -211,14 +216,14 @@ _wrap_gda_connection_execute_command (Py
- 	}
- */
- 
--	PyObject* plist = PyList_New (0);
-+	plist = PyList_New (0);
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
-+	list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
- 	      GDA_COMMAND (cmd->obj), GDA_PARAMETER_LIST (params->obj));
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
-@@ -235,13 +240,14 @@ override gda_connection_get_errors kwarg
- static PyObject*
- _wrap_gda_connection_get_errors (PyGObject* self) {
- 	PyObject* plist = PyList_New (0);
-+	GList *tmp, *list;
- 
- 	if (!plist) {
- 		Py_INCREF (Py_None);
- 		return Py_None;
- 	}
- 
--	GList *tmp, *list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
-+	list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
- 
- 	for (tmp = list; tmp != NULL; tmp = tmp->next) {
- 		PyObject* obj = pygobject_new (G_OBJECT (tmp->data));
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 484a6bc85c03..3232c7de259a 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -5,6 +5,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/gdl.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo
@@ -12,145 +14,42 @@
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.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
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
 libdata/pkgconfig/gnome-python-extras-2.0.pc
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintconfig.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintcontext.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfont.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfontface.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintglyphlist.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/gnomeprint-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/pygnomeprint.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuidialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontdialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontselection.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuijobpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipaperselector.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/gnomeprintui-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/pygnomeprintui.devhelp
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.sgml
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
-%%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/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
 %%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.sgml
 %%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp
-%%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
-%%PORTDOCS%%share/examples/py-gnome/applet/README
-%%PORTDOCS%%share/examples/py-gnome/applet/applet.py
 %%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml
 %%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py
 %%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py
 %%PORTDOCS%%share/examples/py-gnome/egg/recent/populate-recent.py
 %%PORTDOCS%%share/examples/py-gnome/egg/trayicon.py
 %%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/README
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_01.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_02.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_03.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_04.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_05.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_06.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_08.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_09.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.glade
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_11.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/sample-image.png
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/test-print.py
 %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
-%%PORTDOCS%%share/examples/py-gnome/gtksourceview/test-widget.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
-%%PORTDOCS%%share/examples/py-gnome/mediaprofiles/profiles.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py
-share/pygtk/2.0/defs/applet.defs
-share/pygtk/2.0/defs/art.defs
 share/pygtk/2.0/defs/gtkhtml2.defs
 share/pygtk/2.0/defs/gtkmozembed.defs
-share/pygtk/2.0/defs/gtksourceview.defs
-share/pygtk/2.0/defs/mediaprofiles.defs
-share/pygtk/2.0/defs/nautilus_burn.defs
-share/pygtk/2.0/defs/nb_drive_selection.defs
-share/pygtk/2.0/defs/print.defs
-share/pygtk/2.0/defs/printui.defs
 share/pygtk/2.0/defs/trayicon.defs
-share/pygtk/2.0/defs/wnck.defs
-%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn
-%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gtkspell
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg
-%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprintui
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprint
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 3d4f57fc57f5..1210d475bcb9 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,15 +3,14 @@
 # Whom:					marc@informatik.uni-bremen.de
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.29 2005/10/09 19:52:49 marcus Exp $
+#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.38 2006/04/13 07:52:43 bland Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.8.2
-PORTREVISION=	1
+PORTVERSION=	2.8.6
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/pygtk/2.8
+MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtk-${PORTVERSION}
 DIST_SUBDIR=	gnome2
@@ -19,9 +18,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of Python bindings for GTK
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
 RUN_DEPENDS=	${PYNUMERIC} \
-		${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
+		${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -36,7 +37,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gtk
 
-CONFLICTS=	py*-gtk-0* py*-gobject-[0-9]*
+CONFLICTS=	py*-gtk-0*
 
 #
 # Use the same way as the Python port to determine if we want
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index b0496ee10880..28d9eb4c7da4 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.8.2.tar.bz2) = 455b50a79015e46b8bcb0664f6d1ece8
-SHA256 (gnome2/pygtk-2.8.2.tar.bz2) = eaf6caf884d35b5db384450a51a292c9c7ccf7f43366e050c1de8327d588463b
-SIZE (gnome2/pygtk-2.8.2.tar.bz2) = 748763
+MD5 (gnome2/pygtk-2.8.6.tar.bz2) = c69c2e5e86a8f21a5773df20e265fc3a
+SHA256 (gnome2/pygtk-2.8.6.tar.bz2) = dee1ec46a43bf624f1ff796903bd2d49e65c1cc8396385f46bf1489817bd6e60
+SIZE (gnome2/pygtk-2.8.6.tar.bz2) = 756885
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 37de690b7a74..5799444a5585 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -1,6 +1,5 @@
 bin/pygtk-codegen-2.0
 bin/pygtk-demo
-include/pygtk-2.0/pygobject.h
 include/pygtk-2.0/pygtk/pygtk.h
 lib/pygtk/2.0/demos/__init__.py
 lib/pygtk/2.0/demos/__init__.pyc
@@ -88,11 +87,6 @@ lib/pygtk/2.0/pygtk-demo.pyc
 lib/pygtk/2.0/pygtk-demo.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/atk.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/atk.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo
@@ -110,11 +104,6 @@ lib/pygtk/2.0/pygtk-demo.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pango.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.so
-%%PYTHON_SITELIBDIR%%/pygtk.pth
-%%PYTHON_SITELIBDIR%%/pygtk.py
-%%PYTHON_SITELIBDIR%%/pygtk.pyc
-%%PYTHON_SITELIBDIR%%/pygtk.pyo
-libdata/pkgconfig/pygobject-2.0.pc
 libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/doc/py-gtk/MAPPING
 %%PORTDOCS%%share/doc/py-gtk/THREADS
@@ -130,7 +119,10 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/examples/py-gtk/glade/test2.glade
 %%PORTDOCS%%share/examples/py-gtk/gobject/properties.py
 %%PORTDOCS%%share/examples/py-gtk/gobject/signal.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/bin.py
 %%PORTDOCS%%share/examples/py-gtk/gtk/filechooser.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/scrollable.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/sizegroup.py
 %%PORTDOCS%%share/examples/py-gtk/gtk/uimanager.py
 %%PORTDOCS%%share/examples/py-gtk/gtk/widget.py
 %%PORTDOCS%%share/examples/py-gtk/ide/README
@@ -265,10 +257,8 @@ share/pygtk/2.0/defs/pangocairo.override
 %%PORTDOCS%%@dirrm share/examples/py-gtk
 %%PORTDOCS%%@dirrm share/doc/py-gtk
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0
 @dirrm lib/pygtk/2.0/demos/images
 @dirrm lib/pygtk/2.0/demos
 @dirrm lib/pygtk/2.0
 @dirrm lib/pygtk
 @dirrm include/pygtk-2.0/pygtk
-@dirrm include/pygtk-2.0
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 59b87fe2120b..e16a5a5c080c 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.49 2006/04/27 01:40:22 ahze Exp $
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.11.21
+PORTVERSION=	0.12.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,8 +21,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20
+USE_AUTOTOOLS=	libtool:15
+USE_GETTEXT=	yes
+USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index b75009a512b8..cdea565e0797 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.11.21.tar.bz2) = bd949ff041681021f091fa9e6f511bb4
-SHA256 (gnome2/vte-0.11.21.tar.bz2) = b107bc0c55c8cbfcd22f2e11dc2931920a9c0a0943fef4e3f9bf1387183b8b74
-SIZE (gnome2/vte-0.11.21.tar.bz2) = 952981
+MD5 (gnome2/vte-0.12.1.tar.bz2) = 15afabb3ee753441eaa26317bc97ca1f
+SHA256 (gnome2/vte-0.12.1.tar.bz2) = 5f8a9ee415e4e14344555700760d06a32a98a7ca7a78e92c611a1049cccd80a1
+SIZE (gnome2/vte-0.12.1.tar.bz2) = 973915
diff --git a/x11-toolkits/vte/pkg-descr b/x11-toolkits/vte/pkg-descr
index ef1e497b907e..9c325db4ccc0 100644
--- a/x11-toolkits/vte/pkg-descr
+++ b/x11-toolkits/vte/pkg-descr
@@ -1,2 +1,2 @@
-Terminal widget with improved font, internationalization and accessibility
+Terminal widget with improved font, internationalisation and accessibility
 support for the GNOME 2 desktop.  Designed to replace libzvt.
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index f8973fe1be52..e841915c67a6 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -6,7 +6,7 @@ include/vte/vteaccess.h
 lib/libvte.a
 lib/libvte.la
 lib/libvte.so
-lib/libvte.so.8
+lib/libvte.so.4
 lib/vte/decset
 lib/vte/interpret
 lib/vte/iso8859mode
@@ -31,6 +31,7 @@ libexec/gnome-pty-helper
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
 %%DOCSDIR%%/vte.devhelp
+%%DOCSDIR%%/vte.devhelp2
 share/gnome/vte/termcap/xterm
 share/locale/am/LC_MESSAGES/vte.mo
 share/locale/ang/LC_MESSAGES/vte.mo
@@ -45,6 +46,7 @@ share/locale/cs/LC_MESSAGES/vte.mo
 share/locale/cy/LC_MESSAGES/vte.mo
 share/locale/da/LC_MESSAGES/vte.mo
 share/locale/de/LC_MESSAGES/vte.mo
+share/locale/dz/LC_MESSAGES/vte.mo
 share/locale/el/LC_MESSAGES/vte.mo
 share/locale/en_CA/LC_MESSAGES/vte.mo
 share/locale/en_GB/LC_MESSAGES/vte.mo
@@ -66,6 +68,7 @@ share/locale/is/LC_MESSAGES/vte.mo
 share/locale/it/LC_MESSAGES/vte.mo
 share/locale/ja/LC_MESSAGES/vte.mo
 share/locale/ka/LC_MESSAGES/vte.mo
+share/locale/kn/LC_MESSAGES/vte.mo
 share/locale/ko/LC_MESSAGES/vte.mo
 share/locale/ku/LC_MESSAGES/vte.mo
 share/locale/ky/LC_MESSAGES/vte.mo
@@ -115,6 +118,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
 @dirrm share/gnome/vte/termcap