Presenting GNOME 2.24 for FreeBSD.

See http://library.gnome.org/misc/release-notes/2.24/ for the general release notes. On the FreeBSD front, this release introduces Fuse support in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some long-standing seahorse and gnome-keyring bugs. The documentation updates to the website are forthcoming. This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov Craig Butler [1] Dmitry Marakasov [6] Eric L. Chen Joseph S. Atkinson Kris Moore Lapo Luchini [7] Nikos Ntarmos Pawel Worach Romain Tartiere TAOKA Fumiyoshi [3] Yasuda Keisuke Zyl aZ [4] bf [2] [5] Florent Thoumie Peter Wemm pluknet PR: 125857 [1] 126993 [2] 130031 [3] 127399 [4] 127661 [5] 124302 [6] 129570 [7] 129936 123790
author: marcus <marcus@FreeBSD.org> 2009-01-10 13:22:13 +0800
committer: marcus <marcus@FreeBSD.org> 2009-01-10 13:22:13 +0800
commit: 6d8ed8f7c7511223163de715a97ffc04bf6fada9 (patch)
tree: 40dc015efe383243b0880df377f73ee250da7de7 /x11-toolkits
parent: c7f342a8d7b82e85b9625c4403600fc20ce41da6 (diff)
download: freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.gz
freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.zst
freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.zip
81 files changed, 1116 insertions, 471 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 04f0be65c36e..ae788a866fdd 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -180,6 +180,7 @@
     SUBDIR += p5-Tk-TableMatrix
     SUBDIR += pango
     SUBDIR += pango-reference
+    SUBDIR += pangomm
     SUBDIR += pangoxsl
     SUBDIR += paragui
     SUBDIR += paragui-devel
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 1c473cf83aab..5cb8868d2a2b 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/bakery/Makefile,v 1.11 2008/03/23 06:57:57 marcus Exp $
+#   $MCom: ports/x11-toolkits/bakery/Makefile,v 1.16 2009/01/09 22:07:11 kwm Exp $
 #
 
 PORTNAME=	bakery
-PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTVERSION=	2.6.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 
@@ -20,7 +19,7 @@ LIB_DEPENDS=	gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
 		gnomevfsmm-2.6:${PORTSDIR}/devel/gnome-vfsmm \
 		xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26
 
-USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack ltverhack
+USE_GNOME=	gnomehack gnomeprefix intlhack ltverhack
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
@@ -29,7 +28,7 @@ USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
+PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
diff --git a/x11-toolkits/bakery/distinfo b/x11-toolkits/bakery/distinfo
index dadb0ad3f19c..5cfa1968f748 100644
--- a/x11-toolkits/bakery/distinfo
+++ b/x11-toolkits/bakery/distinfo
@@ -1,3 +1,3 @@
-MD5 (bakery-2.4.4.tar.bz2) = c80b4cf39dc8aa65bb9302b84f084b93
-SHA256 (bakery-2.4.4.tar.bz2) = 04fccb599d28884214da9a6ed71e195141baa4e48da09c1f80fc2ec5440f02b9
-SIZE (bakery-2.4.4.tar.bz2) = 382214
+MD5 (bakery-2.6.2.tar.bz2) = 749586e2f9dfc381a16c4f7cc56c03f1
+SHA256 (bakery-2.6.2.tar.bz2) = 8617eb028f72c2f0c426950c5b7b06a369212ae8f373ef4aa04dfd1504b9eb53
+SIZE (bakery-2.6.2.tar.bz2) = 1190518
diff --git a/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in b/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in
deleted file mode 100644
index 61609f1dea58..000000000000
--- a/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- bakery-2.4.pc.in.orig	2007-12-02 01:54:38.000000000 -0500
-+++ bakery-2.4.pc.in	2007-12-02 01:54:46.000000000 -0500
-@@ -8,5 +8,5 @@ Description: C++ Application Framework f
- Requires: gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.6.0 gnome-vfsmm-2.6 >= 2.6.0
- Version: @VERSION@
- Libs: -L${libdir} -lbakery-2.4
--Cflags: -I${includedir}/bakery-2.4 -I${libdir}/bakery-2.4/include
-+Cflags: -I${includedir}/bakery-2.4
- 
diff --git a/x11-toolkits/bakery/files/patch-bakery-2.6.pc.in b/x11-toolkits/bakery/files/patch-bakery-2.6.pc.in
new file mode 100644
index 000000000000..eaeaad3550fa
--- /dev/null
+++ b/x11-toolkits/bakery/files/patch-bakery-2.6.pc.in
@@ -0,0 +1,9 @@
+--- bakery-2.6.pc.in.orig	2008-03-18 10:47:08.000000000 +0100
++++ bakery-2.6.pc.in	2008-08-08 02:10:39.000000000 +0200
+@@ -8,5 +8,5 @@ Description: C++ Application Framework f
+ Requires: gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.6.0 giomm-2.4 >= 2.16.0
+ Version: @VERSION@
+ Libs: -L${libdir} -lbakery-2.6
+-Cflags: -I${includedir}/bakery-2.6 -I${libdir}/bakery-2.6/include
++Cflags: -I${includedir}/bakery-2.6
+ 
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
index 90f78eb92bdd..39cb5057a688 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in
@@ -1,15 +1,15 @@
---- bakery/Makefile.in.orig	2008-04-07 16:18:10.000000000 -0500
-+++ bakery/Makefile.in	2008-04-07 16:19:12.000000000 -0500
-@@ -284,10 +284,10 @@
+--- bakery/Makefile.in.orig	2008-08-08 02:12:58.000000000 +0200
++++ bakery/Makefile.in	2008-08-08 02:13:37.000000000 +0200
+@@ -287,10 +287,10 @@ libbakery_2_6_la_LIBADD = App/libbakery_
                        View/libbakery_view.la \
                        $(BAKERY_LIBS)
  
--libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -no-undefined
-+libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
+-libbakery_2_6_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -no-undefined
++libbakery_2_6_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
  
  # Install the headers:
--library_configdir = $(libdir)/bakery-2.4/include
-+library_configdir = $(includedir)/bakery-2.4
+-library_configdir = $(libdir)/bakery-2.6/include
++library_configdir = $(includedir)/bakery-2.6
  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 b8d3c54424e6..84d82572432e 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -27,12 +27,14 @@ libdata/pkgconfig/bakery-%%API_VERSION%%.pc
 share/locale/ar/LC_MESSAGES/bakery.mo
 share/locale/bg/LC_MESSAGES/bakery.mo
 share/locale/ca/LC_MESSAGES/bakery.mo
+share/locale/da/LC_MESSAGES/bakery.mo
 share/locale/de/LC_MESSAGES/bakery.mo
 share/locale/dz/LC_MESSAGES/bakery.mo
 share/locale/el/LC_MESSAGES/bakery.mo
 share/locale/en_CA/LC_MESSAGES/bakery.mo
 share/locale/en_GB/LC_MESSAGES/bakery.mo
 share/locale/es/LC_MESSAGES/bakery.mo
+share/locale/eu/LC_MESSAGES/bakery.mo
 share/locale/fi/LC_MESSAGES/bakery.mo
 share/locale/fr/LC_MESSAGES/bakery.mo
 share/locale/gl/LC_MESSAGES/bakery.mo
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index c0f3f8356d1d..fb6e22c418a5 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.67 2008/03/10 21:38:32 mezz Exp $
+#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.80 2008/10/20 21:37:09 mezz Exp $
 #
 
 PORTNAME=	eel
-PORTVERSION=	2.22.2
-PORTREVISION=	1
+PORTVERSION=	2.24.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	xrender
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gail gnomedesktop ltverhack intlhack
+USE_GNOME=	gnomeprefix gnomehack gnomedesktop ltverhack intlhack
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index da75f3eacd4d..aa469fcbd173 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.22.2.tar.bz2) = f0dc46f4bc6a772da9e149c0018a8b09
-SHA256 (gnome2/eel-2.22.2.tar.bz2) = e91e576ed22e5ba9a930d4292e3dbec4fe4ec7276029d82188cc91db117e21d4
-SIZE (gnome2/eel-2.22.2.tar.bz2) = 597895
+MD5 (gnome2/eel-2.24.1.tar.bz2) = b591df36af8f1b23dd175be33b5de073
+SHA256 (gnome2/eel-2.24.1.tar.bz2) = 32cde7b589b49f439d82f76b6456983d36de7d20688f7c6ac2fdae4ce354e629
+SIZE (gnome2/eel-2.24.1.tar.bz2) = 596529
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 8316a352c40a..628987f36aab 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -1,6 +1,5 @@
 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
@@ -102,6 +101,7 @@ share/locale/oc/LC_MESSAGES/eel-2.0.mo
 share/locale/or/LC_MESSAGES/eel-2.0.mo
 share/locale/pa/LC_MESSAGES/eel-2.0.mo
 share/locale/pl/LC_MESSAGES/eel-2.0.mo
+share/locale/ps/LC_MESSAGES/eel-2.0.mo
 share/locale/pt/LC_MESSAGES/eel-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/eel-2.0.mo
 share/locale/ro/LC_MESSAGES/eel-2.0.mo
@@ -112,7 +112,7 @@ share/locale/sk/LC_MESSAGES/eel-2.0.mo
 share/locale/sl/LC_MESSAGES/eel-2.0.mo
 share/locale/sq/LC_MESSAGES/eel-2.0.mo
 share/locale/sr/LC_MESSAGES/eel-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/eel-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/eel-2.0.mo
 share/locale/sv/LC_MESSAGES/eel-2.0.mo
 share/locale/ta/LC_MESSAGES/eel-2.0.mo
 share/locale/th/LC_MESSAGES/eel-2.0.mo
@@ -133,10 +133,14 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @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/mr/LC_MESSAGES
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 3506383ad7c3..70aed9a09a6d 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.15 2007/09/09 22:45:27 mezz Exp $
+#   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.18 2008/09/22 18:02:25 marcus Exp $
 #
 
 PORTNAME=	gdl
-PORTREVISION=	2
-PORTVERSION=	0.7.11
+PORTVERSION=	2.24.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index 389a3aa5b9c7..482befef9a78 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-0.7.11.tar.bz2) = 74f529cc2623376ee793be65439f54d6
-SHA256 (gdl-0.7.11.tar.bz2) = 98c97d185acec2b80769aaaa6e4bde938514e8cd5ff9df2956aab93b6584abde
-SIZE (gdl-0.7.11.tar.bz2) = 521832
+MD5 (gdl-2.24.0.tar.bz2) = 1d5cd4af1f4041394169d643316646bf
+SHA256 (gdl-2.24.0.tar.bz2) = c175ac5faa1c3e27464f71f80c632bb3a960aa03ccd748736aead20adc31a112
+SIZE (gdl-2.24.0.tar.bz2) = 551420
diff --git a/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c b/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c
deleted file mode 100644
index bcfde3afce14..000000000000
--- a/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- gdl/gdl-icons.c.orig	Tue May 24 16:37:14 2005
-+++ gdl/gdl-icons.c	Tue May 24 16:37:38 2005
-@@ -202,12 +202,13 @@
- {
- 	GdkPixbuf *pixbuf;
- 	char *icon_name;
-+	GdlIconsPrivate *priv;
- 
- 	g_return_val_if_fail (icons != NULL, NULL);
- 	g_return_val_if_fail (GDL_IS_ICONS (icons), NULL);
- 	g_return_val_if_fail (mime_type != NULL, NULL);
- 
--	GdlIconsPrivate *priv = GDL_ICONS_GET_PRIVATE (icons);
-+	priv = GDL_ICONS_GET_PRIVATE (icons);
- 
- 	pixbuf = g_hash_table_lookup (priv->icons, mime_type);
- 	if (pixbuf != NULL) {
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 36561f399cb0..4411d89a5de2 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -9,7 +9,6 @@ include/libgdl-1.0/gdl/gdl-dock-paned.h
 include/libgdl-1.0/gdl/gdl-dock-placeholder.h
 include/libgdl-1.0/gdl/gdl-dock-tablabel.h
 include/libgdl-1.0/gdl/gdl-dock.h
-include/libgdl-1.0/gdl/gdl-icons.h
 include/libgdl-1.0/gdl/gdl-stock-icons.h
 include/libgdl-1.0/gdl/gdl-stock.h
 include/libgdl-1.0/gdl/gdl-switcher.h
@@ -19,11 +18,7 @@ include/libgdl-1.0/gdl/libgdltypebuiltins.h
 lib/libgdl-1.la
 lib/libgdl-1.so
 lib/libgdl-1.so.0
-lib/libgdl-gnome-1.la
-lib/libgdl-gnome-1.so
-lib/libgdl-gnome-1.so.0
 libdata/pkgconfig/gdl-1.0.pc
-libdata/pkgconfig/gdl-gnome-1.0.pc
 %%DOCSDIR%%/GdlComboButton.html
 %%DOCSDIR%%/GdlDock.html
 %%DOCSDIR%%/GdlDockBar.html
@@ -35,7 +30,6 @@ libdata/pkgconfig/gdl-gnome-1.0.pc
 %%DOCSDIR%%/GdlDockPaned.html
 %%DOCSDIR%%/GdlDockPlaceholder.html
 %%DOCSDIR%%/GdlDockTablabel.html
-%%DOCSDIR%%/GdlIcons.html
 %%DOCSDIR%%/GdlSwitcher.html
 %%DOCSDIR%%/gdl-gdl-stock.html
 %%DOCSDIR%%/gdl-gdl-tools.html
@@ -63,11 +57,13 @@ share/locale/el/LC_MESSAGES/gdl-1.mo
 share/locale/en_CA/LC_MESSAGES/gdl-1.mo
 share/locale/en_GB/LC_MESSAGES/gdl-1.mo
 share/locale/es/LC_MESSAGES/gdl-1.mo
+share/locale/et/LC_MESSAGES/gdl-1.mo
 share/locale/eu/LC_MESSAGES/gdl-1.mo
 share/locale/fi/LC_MESSAGES/gdl-1.mo
 share/locale/fr/LC_MESSAGES/gdl-1.mo
 share/locale/ga/LC_MESSAGES/gdl-1.mo
 share/locale/gl/LC_MESSAGES/gdl-1.mo
+share/locale/he/LC_MESSAGES/gdl-1.mo
 share/locale/hi/LC_MESSAGES/gdl-1.mo
 share/locale/hr/LC_MESSAGES/gdl-1.mo
 share/locale/hu/LC_MESSAGES/gdl-1.mo
@@ -78,12 +74,14 @@ share/locale/lt/LC_MESSAGES/gdl-1.mo
 share/locale/lv/LC_MESSAGES/gdl-1.mo
 share/locale/mk/LC_MESSAGES/gdl-1.mo
 share/locale/ml/LC_MESSAGES/gdl-1.mo
+share/locale/mr/LC_MESSAGES/gdl-1.mo
 share/locale/nb/LC_MESSAGES/gdl-1.mo
 share/locale/ne/LC_MESSAGES/gdl-1.mo
 share/locale/nl/LC_MESSAGES/gdl-1.mo
 share/locale/oc/LC_MESSAGES/gdl-1.mo
 share/locale/pa/LC_MESSAGES/gdl-1.mo
 share/locale/pl/LC_MESSAGES/gdl-1.mo
+share/locale/ps/LC_MESSAGES/gdl-1.mo
 share/locale/pt/LC_MESSAGES/gdl-1.mo
 share/locale/pt_BR/LC_MESSAGES/gdl-1.mo
 share/locale/ru/LC_MESSAGES/gdl-1.mo
@@ -93,23 +91,33 @@ share/locale/sk/LC_MESSAGES/gdl-1.mo
 share/locale/sl/LC_MESSAGES/gdl-1.mo
 share/locale/sq/LC_MESSAGES/gdl-1.mo
 share/locale/sr/LC_MESSAGES/gdl-1.mo
-share/locale/sr@Latn/LC_MESSAGES/gdl-1.mo
+share/locale/sr@latin/LC_MESSAGES/gdl-1.mo
 share/locale/sv/LC_MESSAGES/gdl-1.mo
 share/locale/th/LC_MESSAGES/gdl-1.mo
 share/locale/tr/LC_MESSAGES/gdl-1.mo
 share/locale/uk/LC_MESSAGES/gdl-1.mo
 share/locale/vi/LC_MESSAGES/gdl-1.mo
 share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
+share/locale/zh_HK/LC_MESSAGES/gdl-1.mo
+share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
 @dirrm share/gdl/glade
 @dirrm share/gdl
 @dirrm %%DOCSDIR%%
 @dirrm include/libgdl-1.0/gdl
 @dirrm include/libgdl-1.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 4d9eff1c82f0..b547bb10d663 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.11 2007/12/04 21:45:14 mezz Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.147 2009/01/08 17:38:06 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.12.11
-PORTREVISION?=	1
+PORTVERSION=	2.14.7
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -29,10 +29,11 @@ LATEST_LINK=	gtk20
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		jasper.4:${PORTSDIR}/graphics/jasper
+RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_GMAKE=	yes
@@ -76,8 +77,6 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/gtk/xdgmime/xdgmime.c
 # GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
 	@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
 		s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 69efc41c7e01..a7d8aa722018 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.12.11.tar.bz2) = f7aab88e856a813386f797aade5867ad
-SHA256 (gnome2/gtk+-2.12.11.tar.bz2) = c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
-SIZE (gnome2/gtk+-2.12.11.tar.bz2) = 16232428
+MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604
+SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14
+SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index a04d08ef58b3..a7c07057c598 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	Fri Oct 24 23:38:06 2003
-+++ docs/reference/Makefile.in	Fri Oct 24 23:48:00 2003
-@@ -286,7 +286,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- docs/reference/Makefile.in.orig	2008-02-23 10:25:17.000000000 -0500
++++ docs/reference/Makefile.in	2008-02-23 10:26:36.000000000 -0500
+@@ -372,7 +372,7 @@
+ 	&& DISPLAY=:$$XID && export DISPLAY
  
--SUBDIRS = gdk-pixbuf gdk gtk
-+SUBDIRS = #gdk-pixbuf gdk gtk
+ 
+-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
++SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
  subdir = docs/reference
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index af39120b2088..7f8e0eb0c02d 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-  $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.8 2007/12/01 05:56:33 marcus Exp $
-
 --- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
 +++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
 @@ -315,7 +315,7 @@
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
new file mode 100644
index 000000000000..c687dec4009b
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
@@ -0,0 +1,13 @@
+--- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
++++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
+@@ -29,7 +29,9 @@
+ #ifndef __GTK_SIGNAL_H__
+ #define __GTK_SIGNAL_H__
+ 
+-#include <gtk/gtk.h>
++#include <gtk/gtkenums.h>
++#include <gtk/gtktypeutils.h>
++#include <gtk/gtkobject.h>
+ #include <gtk/gtkmarshal.h>
+ 
+ G_BEGIN_DECLS
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
deleted file mode 100644
index e0fd02d4fbac..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/xdgmime/xdgmime.c.orig	Mon Nov  8 22:25:27 2004
-+++ gtk/xdgmime/xdgmime.c	Sat Nov 13 10:27:22 2004
-@@ -204,7 +204,7 @@
- 
-   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-   if (xdg_data_dirs == NULL)
--    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "/usr/local/share/";
- 
-   ptr = xdg_data_dirs;
- 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
deleted file mode 100644
index b64106809ef6..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/xdgmime/xdgmimecache.h.orig	2007-09-13 16:35:37.000000000 -0400
-+++ gtk/xdgmime/xdgmimecache.h	2007-09-14 00:59:43.000000000 -0400
-@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
- #define _xdg_mime_cache_list_mime_parents             XDG_ENTRY(cache_list_mime_parents)
- #define _xdg_mime_cache_mime_type_subclass            XDG_ENTRY(cache_mime_type_subclass)
- #define _xdg_mime_cache_unalias_mime_type             XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_is_valid_mime_type            XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal               XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal              XDG_ENTRY(cache_media_type_equal)
- 
- #endif
- 
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 99b4f04150ac..f916fc6fda4f 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -7,6 +7,10 @@ bin/gtk-update-icon-cache
 etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
 etc/gtk-2.0/im-multipress.conf
+include/gail-1.0/gail/gailwidget.h
+include/gail-1.0/libgail-util/gail-util.h
+include/gail-1.0/libgail-util/gailmisc.h
+include/gail-1.0/libgail-util/gailtextutil.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -21,7 +25,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
-include/gtk-2.0/gdk/gdkalias.h
+include/gtk-2.0/gdk/gdkapplaunchcontext.h
 include/gtk-2.0/gdk/gdkcairo.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
@@ -48,6 +52,7 @@ include/gtk-2.0/gdk/gdkrgb.h
 include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
 include/gtk-2.0/gdk/gdkspawn.h
+include/gtk-2.0/gdk/gdktestutils.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
@@ -114,7 +119,6 @@ include/gtk-2.0/gtk/gtkfilechooserdialog.h
 include/gtk-2.0/gtk/gtkfilechooserwidget.h
 include/gtk-2.0/gtk/gtkfilefilter.h
 include/gtk-2.0/gtk/gtkfilesel.h
-include/gtk-2.0/gtk/gtkfilesystem.h
 include/gtk-2.0/gtk/gtkfixed.h
 include/gtk-2.0/gtk/gtkfontbutton.h
 include/gtk-2.0/gtk/gtkfontsel.h
@@ -129,6 +133,7 @@ include/gtk-2.0/gtk/gtkhruler.h
 include/gtk-2.0/gtk/gtkhscale.h
 include/gtk-2.0/gtk/gtkhscrollbar.h
 include/gtk-2.0/gtk/gtkhseparator.h
+include/gtk-2.0/gtk/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkicontheme.h
 include/gtk-2.0/gtk/gtkiconview.h
@@ -158,6 +163,7 @@ include/gtk-2.0/gtk/gtkmenutoolbutton.h
 include/gtk-2.0/gtk/gtkmessagedialog.h
 include/gtk-2.0/gtk/gtkmisc.h
 include/gtk-2.0/gtk/gtkmodules.h
+include/gtk-2.0/gtk/gtkmountoperation.h
 include/gtk-2.0/gtk/gtknotebook.h
 include/gtk-2.0/gtk/gtkobject.h
 include/gtk-2.0/gtk/gtkoldeditable.h
@@ -198,6 +204,7 @@ include/gtk-2.0/gtk/gtkseparator.h
 include/gtk-2.0/gtk/gtkseparatormenuitem.h
 include/gtk-2.0/gtk/gtkseparatortoolitem.h
 include/gtk-2.0/gtk/gtksettings.h
+include/gtk-2.0/gtk/gtkshow.h
 include/gtk-2.0/gtk/gtksignal.h
 include/gtk-2.0/gtk/gtksizegroup.h
 include/gtk-2.0/gtk/gtksocket.h
@@ -208,6 +215,7 @@ include/gtk-2.0/gtk/gtkstock.h
 include/gtk-2.0/gtk/gtkstyle.h
 include/gtk-2.0/gtk/gtktable.h
 include/gtk-2.0/gtk/gtktearoffmenuitem.h
+include/gtk-2.0/gtk/gtktestutils.h
 include/gtk-2.0/gtk/gtktext.h
 include/gtk-2.0/gtk/gtktextbuffer.h
 include/gtk-2.0/gtk/gtktextbufferrichtext.h
@@ -226,6 +234,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolshell.h
 include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
@@ -258,6 +267,7 @@ include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
 include/gtk-unix-print-2.0/gtk/gtkprinter.h
 include/gtk-unix-print-2.0/gtk/gtkprintjob.h
 include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
+include/gtk-unix-print-2.0/gtk/gtkunixprint.h
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
@@ -303,9 +313,15 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
@@ -345,6 +361,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so
+lib/gtk-2.0/modules/libferret.a
+lib/gtk-2.0/modules/libferret.la
+lib/gtk-2.0/modules/libferret.so
+lib/gtk-2.0/modules/libgail.a
+lib/gtk-2.0/modules/libgail.la
+lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
+lib/libgailutil.la
+lib/libgailutil.so
+lib/libgailutil.so.18
 lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
@@ -361,6 +387,7 @@ lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
+libdata/pkgconfig/gail.pc
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -424,6 +451,8 @@ share/locale/ar/LC_MESSAGES/gtk20-properties.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
 share/locale/as/LC_MESSAGES/gtk20-properties.mo
 share/locale/as/LC_MESSAGES/gtk20.mo
+share/locale/ast/LC_MESSAGES/gtk20-properties.mo
+share/locale/ast/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20-properties.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo
@@ -518,6 +547,8 @@ share/locale/lt/LC_MESSAGES/gtk20-properties.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
 share/locale/lv/LC_MESSAGES/gtk20-properties.mo
 share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mai/LC_MESSAGES/gtk20-properties.mo
+share/locale/mai/LC_MESSAGES/gtk20.mo
 share/locale/mi/LC_MESSAGES/gtk20-properties.mo
 share/locale/mi/LC_MESSAGES/gtk20.mo
 share/locale/mk/LC_MESSAGES/gtk20-properties.mo
@@ -548,6 +579,8 @@ share/locale/pa/LC_MESSAGES/gtk20-properties.mo
 share/locale/pa/LC_MESSAGES/gtk20.mo
 share/locale/pl/LC_MESSAGES/gtk20-properties.mo
 share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/ps/LC_MESSAGES/gtk20-properties.mo
+share/locale/ps/LC_MESSAGES/gtk20.mo
 share/locale/pt/LC_MESSAGES/gtk20-properties.mo
 share/locale/pt/LC_MESSAGES/gtk20.mo
 share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
@@ -568,10 +601,10 @@ share/locale/sq/LC_MESSAGES/gtk20-properties.mo
 share/locale/sq/LC_MESSAGES/gtk20.mo
 share/locale/sr/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr/LC_MESSAGES/gtk20.mo
-share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/sr@Latn/LC_MESSAGES/gtk20.mo
 share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr@ije/LC_MESSAGES/gtk20.mo
+share/locale/sr@latin/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr@latin/LC_MESSAGES/gtk20.mo
 share/locale/sv/LC_MESSAGES/gtk20-properties.mo
 share/locale/sv/LC_MESSAGES/gtk20.mo
 share/locale/ta/LC_MESSAGES/gtk20-properties.mo
@@ -627,6 +660,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrm include/gtk-2.0/gdk-pixbuf
 @dirrm include/gtk-2.0/gdk
 @dirrm include/gtk-2.0
+@dirrm include/gail-1.0/libgail-util
+@dirrm include/gail-1.0/gail
+@dirrm include/gail-1.0
 @dirrm etc/gtk-2.0
 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules
 @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
@@ -634,11 +670,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/themes
 @dirrmtry lib/gtk-2.0/modules
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
+@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
 @dirrmtry lib/gtk-2.0
+@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES
@@ -653,12 +692,16 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @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/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
@@ -667,6 +710,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/io/LC_MESSAGES
@@ -685,9 +730,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/az_IR/LC_MESSAGES
 @dirrmtry share/locale/az_IR
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
-@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
-@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 4d9eff1c82f0..b547bb10d663 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.11 2007/12/04 21:45:14 mezz Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.147 2009/01/08 17:38:06 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.12.11
-PORTREVISION?=	1
+PORTVERSION=	2.14.7
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -29,10 +29,11 @@ LATEST_LINK=	gtk20
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		jasper.4:${PORTSDIR}/graphics/jasper
+RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_GMAKE=	yes
@@ -76,8 +77,6 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/gtk/xdgmime/xdgmime.c
 # GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
 	@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
 		s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 69efc41c7e01..a7d8aa722018 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.12.11.tar.bz2) = f7aab88e856a813386f797aade5867ad
-SHA256 (gnome2/gtk+-2.12.11.tar.bz2) = c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
-SIZE (gnome2/gtk+-2.12.11.tar.bz2) = 16232428
+MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604
+SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14
+SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
index a04d08ef58b3..a7c07057c598 100644
--- a/x11-toolkits/gtk30/files/patch-ai
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	Fri Oct 24 23:38:06 2003
-+++ docs/reference/Makefile.in	Fri Oct 24 23:48:00 2003
-@@ -286,7 +286,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- docs/reference/Makefile.in.orig	2008-02-23 10:25:17.000000000 -0500
++++ docs/reference/Makefile.in	2008-02-23 10:26:36.000000000 -0500
+@@ -372,7 +372,7 @@
+ 	&& DISPLAY=:$$XID && export DISPLAY
  
--SUBDIRS = gdk-pixbuf gdk gtk
-+SUBDIRS = #gdk-pixbuf gdk gtk
+ 
+-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
++SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
  subdir = docs/reference
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak
index af39120b2088..7f8e0eb0c02d 100644
--- a/x11-toolkits/gtk30/files/patch-ak
+++ b/x11-toolkits/gtk30/files/patch-ak
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-  $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.8 2007/12/01 05:56:33 marcus Exp $
-
 --- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
 +++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
 @@ -315,7 +315,7 @@
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk30/files/patch-gtk_gtksignal.h
new file mode 100644
index 000000000000..c687dec4009b
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-gtk_gtksignal.h
@@ -0,0 +1,13 @@
+--- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
++++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
+@@ -29,7 +29,9 @@
+ #ifndef __GTK_SIGNAL_H__
+ #define __GTK_SIGNAL_H__
+ 
+-#include <gtk/gtk.h>
++#include <gtk/gtkenums.h>
++#include <gtk/gtktypeutils.h>
++#include <gtk/gtkobject.h>
+ #include <gtk/gtkmarshal.h>
+ 
+ G_BEGIN_DECLS
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
deleted file mode 100644
index e0fd02d4fbac..000000000000
--- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/xdgmime/xdgmime.c.orig	Mon Nov  8 22:25:27 2004
-+++ gtk/xdgmime/xdgmime.c	Sat Nov 13 10:27:22 2004
-@@ -204,7 +204,7 @@
- 
-   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-   if (xdg_data_dirs == NULL)
--    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "/usr/local/share/";
- 
-   ptr = xdg_data_dirs;
- 
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
deleted file mode 100644
index b64106809ef6..000000000000
--- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/xdgmime/xdgmimecache.h.orig	2007-09-13 16:35:37.000000000 -0400
-+++ gtk/xdgmime/xdgmimecache.h	2007-09-14 00:59:43.000000000 -0400
-@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
- #define _xdg_mime_cache_list_mime_parents             XDG_ENTRY(cache_list_mime_parents)
- #define _xdg_mime_cache_mime_type_subclass            XDG_ENTRY(cache_mime_type_subclass)
- #define _xdg_mime_cache_unalias_mime_type             XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_is_valid_mime_type            XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal               XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal              XDG_ENTRY(cache_media_type_equal)
- 
- #endif
- 
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 99b4f04150ac..f916fc6fda4f 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -7,6 +7,10 @@ bin/gtk-update-icon-cache
 etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
 etc/gtk-2.0/im-multipress.conf
+include/gail-1.0/gail/gailwidget.h
+include/gail-1.0/libgail-util/gail-util.h
+include/gail-1.0/libgail-util/gailmisc.h
+include/gail-1.0/libgail-util/gailtextutil.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -21,7 +25,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
-include/gtk-2.0/gdk/gdkalias.h
+include/gtk-2.0/gdk/gdkapplaunchcontext.h
 include/gtk-2.0/gdk/gdkcairo.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
@@ -48,6 +52,7 @@ include/gtk-2.0/gdk/gdkrgb.h
 include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
 include/gtk-2.0/gdk/gdkspawn.h
+include/gtk-2.0/gdk/gdktestutils.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
@@ -114,7 +119,6 @@ include/gtk-2.0/gtk/gtkfilechooserdialog.h
 include/gtk-2.0/gtk/gtkfilechooserwidget.h
 include/gtk-2.0/gtk/gtkfilefilter.h
 include/gtk-2.0/gtk/gtkfilesel.h
-include/gtk-2.0/gtk/gtkfilesystem.h
 include/gtk-2.0/gtk/gtkfixed.h
 include/gtk-2.0/gtk/gtkfontbutton.h
 include/gtk-2.0/gtk/gtkfontsel.h
@@ -129,6 +133,7 @@ include/gtk-2.0/gtk/gtkhruler.h
 include/gtk-2.0/gtk/gtkhscale.h
 include/gtk-2.0/gtk/gtkhscrollbar.h
 include/gtk-2.0/gtk/gtkhseparator.h
+include/gtk-2.0/gtk/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkicontheme.h
 include/gtk-2.0/gtk/gtkiconview.h
@@ -158,6 +163,7 @@ include/gtk-2.0/gtk/gtkmenutoolbutton.h
 include/gtk-2.0/gtk/gtkmessagedialog.h
 include/gtk-2.0/gtk/gtkmisc.h
 include/gtk-2.0/gtk/gtkmodules.h
+include/gtk-2.0/gtk/gtkmountoperation.h
 include/gtk-2.0/gtk/gtknotebook.h
 include/gtk-2.0/gtk/gtkobject.h
 include/gtk-2.0/gtk/gtkoldeditable.h
@@ -198,6 +204,7 @@ include/gtk-2.0/gtk/gtkseparator.h
 include/gtk-2.0/gtk/gtkseparatormenuitem.h
 include/gtk-2.0/gtk/gtkseparatortoolitem.h
 include/gtk-2.0/gtk/gtksettings.h
+include/gtk-2.0/gtk/gtkshow.h
 include/gtk-2.0/gtk/gtksignal.h
 include/gtk-2.0/gtk/gtksizegroup.h
 include/gtk-2.0/gtk/gtksocket.h
@@ -208,6 +215,7 @@ include/gtk-2.0/gtk/gtkstock.h
 include/gtk-2.0/gtk/gtkstyle.h
 include/gtk-2.0/gtk/gtktable.h
 include/gtk-2.0/gtk/gtktearoffmenuitem.h
+include/gtk-2.0/gtk/gtktestutils.h
 include/gtk-2.0/gtk/gtktext.h
 include/gtk-2.0/gtk/gtktextbuffer.h
 include/gtk-2.0/gtk/gtktextbufferrichtext.h
@@ -226,6 +234,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolshell.h
 include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
@@ -258,6 +267,7 @@ include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
 include/gtk-unix-print-2.0/gtk/gtkprinter.h
 include/gtk-unix-print-2.0/gtk/gtkprintjob.h
 include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
+include/gtk-unix-print-2.0/gtk/gtkunixprint.h
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
@@ -303,9 +313,15 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
@@ -345,6 +361,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so
+lib/gtk-2.0/modules/libferret.a
+lib/gtk-2.0/modules/libferret.la
+lib/gtk-2.0/modules/libferret.so
+lib/gtk-2.0/modules/libgail.a
+lib/gtk-2.0/modules/libgail.la
+lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
+lib/libgailutil.la
+lib/libgailutil.so
+lib/libgailutil.so.18
 lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
@@ -361,6 +387,7 @@ lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
+libdata/pkgconfig/gail.pc
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -424,6 +451,8 @@ share/locale/ar/LC_MESSAGES/gtk20-properties.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
 share/locale/as/LC_MESSAGES/gtk20-properties.mo
 share/locale/as/LC_MESSAGES/gtk20.mo
+share/locale/ast/LC_MESSAGES/gtk20-properties.mo
+share/locale/ast/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20-properties.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo
@@ -518,6 +547,8 @@ share/locale/lt/LC_MESSAGES/gtk20-properties.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
 share/locale/lv/LC_MESSAGES/gtk20-properties.mo
 share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mai/LC_MESSAGES/gtk20-properties.mo
+share/locale/mai/LC_MESSAGES/gtk20.mo
 share/locale/mi/LC_MESSAGES/gtk20-properties.mo
 share/locale/mi/LC_MESSAGES/gtk20.mo
 share/locale/mk/LC_MESSAGES/gtk20-properties.mo
@@ -548,6 +579,8 @@ share/locale/pa/LC_MESSAGES/gtk20-properties.mo
 share/locale/pa/LC_MESSAGES/gtk20.mo
 share/locale/pl/LC_MESSAGES/gtk20-properties.mo
 share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/ps/LC_MESSAGES/gtk20-properties.mo
+share/locale/ps/LC_MESSAGES/gtk20.mo
 share/locale/pt/LC_MESSAGES/gtk20-properties.mo
 share/locale/pt/LC_MESSAGES/gtk20.mo
 share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
@@ -568,10 +601,10 @@ share/locale/sq/LC_MESSAGES/gtk20-properties.mo
 share/locale/sq/LC_MESSAGES/gtk20.mo
 share/locale/sr/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr/LC_MESSAGES/gtk20.mo
-share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/sr@Latn/LC_MESSAGES/gtk20.mo
 share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr@ije/LC_MESSAGES/gtk20.mo
+share/locale/sr@latin/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr@latin/LC_MESSAGES/gtk20.mo
 share/locale/sv/LC_MESSAGES/gtk20-properties.mo
 share/locale/sv/LC_MESSAGES/gtk20.mo
 share/locale/ta/LC_MESSAGES/gtk20-properties.mo
@@ -627,6 +660,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrm include/gtk-2.0/gdk-pixbuf
 @dirrm include/gtk-2.0/gdk
 @dirrm include/gtk-2.0
+@dirrm include/gail-1.0/libgail-util
+@dirrm include/gail-1.0/gail
+@dirrm include/gail-1.0
 @dirrm etc/gtk-2.0
 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules
 @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
@@ -634,11 +670,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/themes
 @dirrmtry lib/gtk-2.0/modules
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
+@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
 @dirrmtry lib/gtk-2.0
+@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES
@@ -653,12 +692,16 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @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/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
@@ -667,6 +710,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/io/LC_MESSAGES
@@ -685,9 +730,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/az_IR/LC_MESSAGES
 @dirrmtry share/locale/az_IR
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
-@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
-@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 6ad017bce438..ef71ec3fbd37 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,15 +3,14 @@
 # Whom:                Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/gtkmm24/Makefile,v 1.1 2007/12/02 00:20:21 mezz Exp $
+#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.42 2008/11/18 06:51:19 marcus Exp $
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.12.7
-PORTREVISION?=	1
+PORTVERSION=	2.14.3
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +22,8 @@ LATEST_LINK=	gtkmm24
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
-		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm
+		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
+		pangomm-1.4.1:${PORTSDIR}/x11-toolkits/pangomm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 75dd0b0d95cd..5c77592fc96f 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.12.7.tar.bz2) = ad199f4a392799134c128deab48fee30
-SHA256 (gnome2/gtkmm-2.12.7.tar.bz2) = 4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb
-SIZE (gnome2/gtkmm-2.12.7.tar.bz2) = 15198578
+MD5 (gnome2/gtkmm-2.14.3.tar.bz2) = 10039f35d7f815d47f926a13cefe65d6
+SHA256 (gnome2/gtkmm-2.14.3.tar.bz2) = 24b18105636cea1033658a0a5f7e86783d0e620590aa359a005ba64d055559a2
+SIZE (gnome2/gtkmm-2.14.3.tar.bz2) = 8667875
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index e405a27dcd87..fea6c20e19d0 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -340,6 +340,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/toggletoolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/toolshell_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragdest_p.h
@@ -414,6 +415,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/toggletoolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolitem.h
+include/gtkmm-%%API_VERSION%%/gtkmm/toolshell.h
 include/gtkmm-%%API_VERSION%%/gtkmm/tooltip.h
 include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h
 include/gtkmm-%%API_VERSION%%/gtkmm/treedragdest.h
@@ -437,60 +439,6 @@ include/gtkmm-%%API_VERSION%%/gtkmm/volumebutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/widget.h
 include/gtkmm-%%API_VERSION%%/gtkmm/window.h
 include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
-include/pangomm-1.4/pangomm.h
-include/pangomm-1.4/pangomm/attributes.h
-include/pangomm-1.4/pangomm/attriter.h
-include/pangomm-1.4/pangomm/attrlist.h
-include/pangomm-1.4/pangomm/cairofontmap.h
-include/pangomm-1.4/pangomm/color.h
-include/pangomm-1.4/pangomm/context.h
-include/pangomm-1.4/pangomm/coverage.h
-include/pangomm-1.4/pangomm/font.h
-include/pangomm-1.4/pangomm/fontdescription.h
-include/pangomm-1.4/pangomm/fontface.h
-include/pangomm-1.4/pangomm/fontfamily.h
-include/pangomm-1.4/pangomm/fontmap.h
-include/pangomm-1.4/pangomm/fontmetrics.h
-include/pangomm-1.4/pangomm/fontset.h
-include/pangomm-1.4/pangomm/glyph.h
-include/pangomm-1.4/pangomm/glyphstring.h
-include/pangomm-1.4/pangomm/init.h
-include/pangomm-1.4/pangomm/item.h
-include/pangomm-1.4/pangomm/language.h
-include/pangomm-1.4/pangomm/layout.h
-include/pangomm-1.4/pangomm/layoutiter.h
-include/pangomm-1.4/pangomm/layoutline.h
-include/pangomm-1.4/pangomm/layoutrun.h
-include/pangomm-1.4/pangomm/private/attributes_p.h
-include/pangomm-1.4/pangomm/private/attriter_p.h
-include/pangomm-1.4/pangomm/private/attrlist_p.h
-include/pangomm-1.4/pangomm/private/cairofontmap_p.h
-include/pangomm-1.4/pangomm/private/color_p.h
-include/pangomm-1.4/pangomm/private/context_p.h
-include/pangomm-1.4/pangomm/private/coverage_p.h
-include/pangomm-1.4/pangomm/private/font_p.h
-include/pangomm-1.4/pangomm/private/fontdescription_p.h
-include/pangomm-1.4/pangomm/private/fontface_p.h
-include/pangomm-1.4/pangomm/private/fontfamily_p.h
-include/pangomm-1.4/pangomm/private/fontmap_p.h
-include/pangomm-1.4/pangomm/private/fontmetrics_p.h
-include/pangomm-1.4/pangomm/private/fontset_p.h
-include/pangomm-1.4/pangomm/private/glyph_p.h
-include/pangomm-1.4/pangomm/private/glyphstring_p.h
-include/pangomm-1.4/pangomm/private/item_p.h
-include/pangomm-1.4/pangomm/private/language_p.h
-include/pangomm-1.4/pangomm/private/layout_p.h
-include/pangomm-1.4/pangomm/private/layoutiter_p.h
-include/pangomm-1.4/pangomm/private/layoutline_p.h
-include/pangomm-1.4/pangomm/private/layoutrun_p.h
-include/pangomm-1.4/pangomm/private/rectangle_p.h
-include/pangomm-1.4/pangomm/private/renderer_p.h
-include/pangomm-1.4/pangomm/private/tabarray_p.h
-include/pangomm-1.4/pangomm/rectangle.h
-include/pangomm-1.4/pangomm/renderer.h
-include/pangomm-1.4/pangomm/tabarray.h
-include/pangomm-1.4/pangomm/types.h
-include/pangomm-1.4/pangomm/wrap_init.h
 lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h
 lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h
 lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4
@@ -511,23 +459,15 @@ lib/libgtkmm-%%VERSION%%.a
 lib/libgtkmm-%%VERSION%%.la
 lib/libgtkmm-%%VERSION%%.so
 lib/libgtkmm-%%VERSION%%.so.1
-lib/libpangomm-1.4.a
-lib/libpangomm-1.4.la
-lib/libpangomm-1.4.so
-lib/libpangomm-1.4.so.1
 libdata/pkgconfig/atkmm-1.6.pc
 libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc
 libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc
-libdata/pkgconfig/pangomm-1.4.pc
 @dirrm lib/gtkmm-%%API_VERSION%%/proc/m4
 @dirrm lib/gtkmm-%%API_VERSION%%/proc
 @dirrm lib/gtkmm-%%API_VERSION%%/include
 @dirrm lib/gtkmm-%%API_VERSION%%
 @dirrm lib/gdkmm-%%API_VERSION%%/include
 @dirrm lib/gdkmm-%%API_VERSION%%
-@dirrm include/pangomm-1.4/pangomm/private
-@dirrm include/pangomm-1.4/pangomm
-@dirrm include/pangomm-1.4
 @dirrm include/gtkmm-%%API_VERSION%%/gtkmm/private
 @dirrm include/gtkmm-%%API_VERSION%%/gtkmm
 @dirrm include/gtkmm-%%API_VERSION%%
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 1b085e189032..1806369b7d15 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/x11-toolkits/gtksourceview2/Makefile,v 1.60 2008/03/10 13:49:44 ahze Exp $
+#   $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.67 2008/11/02 18:21:19 marcus Exp $
 #
 
 PORTNAME=	gtksourceview2
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -18,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A text widget that adds syntax highlighting to the GtkTextView widget
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index 33ce3c6dc88e..c53e9d4ef907 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.2.2.tar.gz) = 91f8743c73eeb3a4f49b96ce4a0ac42d
-SHA256 (gnome2/gtksourceview-2.2.2.tar.gz) = 9330de25198b1d22ca005f8571a8eb22a7074cdd039e63fcbe5b6900ec2acd64
-SIZE (gnome2/gtksourceview-2.2.2.tar.gz) = 1542932
+MD5 (gnome2/gtksourceview-2.4.1.tar.bz2) = 7b5902e00aafc573e56f1bac244b2673
+SHA256 (gnome2/gtksourceview-2.4.1.tar.bz2) = da955516b40ff8e9e6ca85731aca5a95fe4814d4d6815ec7924dbf2d9d4937f7
+SIZE (gnome2/gtksourceview-2.4.1.tar.bz2) = 948426
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
index ef181eb9f2b4..9a0140320448 100644
--- a/x11-toolkits/gtksourceview2/pkg-plist
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -31,6 +31,7 @@ share/gtksourceview-2.0/language-specs/def.lang
 share/gtksourceview-2.0/language-specs/desktop.lang
 share/gtksourceview-2.0/language-specs/diff.lang
 share/gtksourceview-2.0/language-specs/docbook.lang
+share/gtksourceview-2.0/language-specs/dot.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
@@ -81,6 +82,7 @@ share/gtksourceview-2.0/language-specs/vbnet.lang
 share/gtksourceview-2.0/language-specs/verilog.lang
 share/gtksourceview-2.0/language-specs/vhdl.lang
 share/gtksourceview-2.0/language-specs/xml.lang
+share/gtksourceview-2.0/language-specs/xslt.lang
 share/gtksourceview-2.0/language-specs/yacc.lang
 share/gtksourceview-2.0/styles/classic.xml
 share/gtksourceview-2.0/styles/kate.xml
@@ -119,6 +121,7 @@ share/locale/hu/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/id/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/it/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/ja/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/kn/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/ko/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/lt/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/lv/LC_MESSAGES/gtksourceview-2.0.mo
@@ -146,9 +149,10 @@ share/locale/sk/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/sl/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/sq/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/sr/LC_MESSAGES/gtksourceview-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/sv/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/ta/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/te/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/th/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/tr/LC_MESSAGES/gtksourceview-2.0.mo
 share/locale/uk/LC_MESSAGES/gtksourceview-2.0.mo
@@ -166,6 +170,10 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 7c359e19baa0..0d2ef1f50b22 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.64 2008/03/10 16:41:24 ahze Exp $
+#   $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.68 2008/09/22 12:44:50 kwm Exp $
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.22.0
-PORTREVISION?=	2
+PORTVERSION=	2.24.0
+PORTREVISION?=	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/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 6ba8647ba852..73dd82d79fa9 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome/libbonoboui-2.24.0.tar.bz2) = 2076638f9aa9565c12b2bc264ecc4f18
+SHA256 (gnome/libbonoboui-2.24.0.tar.bz2) = 1274822cc0cc519755b35148bedeacd969504393a5003ca4d99977a92518f61b
+SIZE (gnome/libbonoboui-2.24.0.tar.bz2) = 988715
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 589cb347ceb7..c7648291f0a0 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -90,6 +90,7 @@ 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/mai/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/mg/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/mk/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo
@@ -105,6 +106,7 @@ share/locale/oc/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ps/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ro/LC_MESSAGES/libbonoboui-2.0.mo
@@ -115,10 +117,11 @@ 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
 share/locale/sr/LC_MESSAGES/libbonoboui-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/te/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/th/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
@@ -143,12 +146,18 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @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/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
@@ -157,6 +166,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 92cefc13c685..4447b49a9ada 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.69 2007/10/17 21:36:14 mezz Exp $
+#   $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.71 2008/09/22 14:00:52 kwm Exp $
 #
 
 PORTNAME=	libgnomeprintui
-PORTVERSION=	2.18.2
-PORTREVISION=	2
+PORTVERSION=	2.18.3
 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/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index af2dcde754d4..f6a019ff616b 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprintui-2.18.2.tar.bz2) = 88b404e7b62bb9ad96b25908c1315dcd
-SHA256 (gnome2/libgnomeprintui-2.18.2.tar.bz2) = 38400994984c0d0bd86fff3b17cca89ea5c3a23f43d9db5840eb32b0b34d084e
-SIZE (gnome2/libgnomeprintui-2.18.2.tar.bz2) = 697697
+MD5 (gnome2/libgnomeprintui-2.18.3.tar.bz2) = f2c5796f15d6b6701bfa224d856098ce
+SHA256 (gnome2/libgnomeprintui-2.18.3.tar.bz2) = 4f7c75e54474a76eff41b6e3da15afadd2d5207a04bc82d85b728395563cf747
+SIZE (gnome2/libgnomeprintui-2.18.3.tar.bz2) = 711876
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index f93fadfc7359..0bbf04b7860c 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -56,6 +56,7 @@ share/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/fa/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/fi/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/fr/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/fur/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ga/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/gl/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/gu/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -86,6 +87,7 @@ share/locale/oc/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/or/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ps/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -96,7 +98,7 @@ share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/sq/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/sr@latin/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/te/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -120,14 +122,20 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@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
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 16a8afb51c39..8a23c20c90a8 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.116 2008/03/10 15:46:28 ahze Exp $
+#   $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.122 2008/09/22 12:50:50 kwm Exp $
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.22.1
-PORTREVISION?=	2
+PORTVERSION=	2.24.0
+PORTREVISION?=	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/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index da69cf608f40..836de795290d 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.22.1.tar.bz2) = 5a60405f006e873ba7bc97ec9c8e4c5d
-SHA256 (gnome2/libgnomeui-2.22.1.tar.bz2) = 7631bc19eab79412ec621e3bc98e94185d79ae59946990f54a09b80940385ad7
-SIZE (gnome2/libgnomeui-2.22.1.tar.bz2) = 1450063
+MD5 (gnome2/libgnomeui-2.24.0.tar.bz2) = 7d50e1fc4c1ee3c268b26e8dfe7e677b
+SHA256 (gnome2/libgnomeui-2.24.0.tar.bz2) = 9ecf81d3ad2e1ec0b371d720b37154e8b716af1cd464dbeb06232f8fa4c5e07d
+SIZE (gnome2/libgnomeui-2.24.0.tar.bz2) = 1468372
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 8a8f7d0e4b26..424ae344f36f 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -49,12 +49,6 @@ 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
 lib/libglade/2.0/libgnome.a
 lib/libglade/2.0/libgnome.la
 lib/libglade/2.0/libgnome.so
@@ -76,6 +70,7 @@ share/locale/bn_IN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/br/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/bs/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/crh/LC_MESSAGES/libgnomeui-2.0.mo
 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
@@ -111,6 +106,7 @@ share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/li/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/mai/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/mg/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/mi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
@@ -138,7 +134,7 @@ share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sr/LC_MESSAGES/libgnomeui-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo
@@ -157,7 +153,6 @@ share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
 share/pixmaps/gnome-about-logo.png
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/filesystems
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
 @dirrmtry share/locale/zu/LC_MESSAGES
@@ -172,6 +167,8 @@ share/pixmaps/gnome-about-logo.png
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
 @dirrmtry share/locale/si/LC_MESSAGES
@@ -190,6 +187,8 @@ share/pixmaps/gnome-about-logo.png
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -198,6 +197,8 @@ share/pixmaps/gnome-about-logo.png
 @dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 36b82e0d28c1..a04438039e09 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.14 2008/03/08 16:56:56 marcus Exp $
+#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.16 2008/09/22 11:36:49 kwm Exp $
 #
 
 PORTNAME=	libgnomeuimm
-PORTVERSION=	2.22.0
-PORTREVISION=	2
+PORTVERSION=	2.24.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 4692cdf98bc8..2c1080fc7656 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = e4caf43ee829200bef9ad87415ae39a5
+SHA256 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 7715ce5648ef7cdf231077fd4e9d8953b30ab70d31dec2efdaa6accd98a2e732
+SIZE (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 381746
diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile
index d10506755e20..48332043f615 100644
--- a/x11-toolkits/libgtksourceviewmm/Makefile
+++ b/x11-toolkits/libgtksourceviewmm/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libgtksourceviewmm/Makefile,v 1.2 2006/12/06 00:54:45 ahze Exp $
+#    $MCom: ports/x11-toolkits/libgtksourceviewmm/Makefile,v 1.4 2008/08/08 21:59:44 kwm Exp $
 
 PORTNAME=	libgtksourceviewmm
-PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTVERSION=	1.9.5
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 
@@ -19,11 +18,10 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtksourceview gnomeprefix gnomehack
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${WRKSRC}/gtksourceview/ \
-			`pkg-config --cflags gtkmm-2.4 gtksourceview-1.0`" \
-		LDFLAGS="-L${LOCALBAS}/lib \
-			`pkg-config --libs gtkmm-2.4 gtksourceview-1.0`"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBAS}/lib"
+CONFIGURE_ARGS=	--disable-docs
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libgtksourceviewmm/distinfo b/x11-toolkits/libgtksourceviewmm/distinfo
index 346393322f75..4fa18c8ec435 100644
--- a/x11-toolkits/libgtksourceviewmm/distinfo
+++ b/x11-toolkits/libgtksourceviewmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgtksourceviewmm-0.2.0.tar.bz2) = cf035031aeeaa3437ce814efa92a3bd6
-SHA256 (libgtksourceviewmm-0.2.0.tar.bz2) = 706c1831847fe619c67ebc2b71586923e89b11692ecf821c0339276744edeb2f
-SIZE (libgtksourceviewmm-0.2.0.tar.bz2) = 270578
+MD5 (libgtksourceviewmm-1.9.5.tar.bz2) = 5b907e66e08d913e700135cf3f968ecb
+SHA256 (libgtksourceviewmm-1.9.5.tar.bz2) = 10713d063844fdd735cd5e2db2d67bfb341160886e4bdd5f5e1c9eba03378072
+SIZE (libgtksourceviewmm-1.9.5.tar.bz2) = 419054
diff --git a/x11-toolkits/libgtksourceviewmm/pkg-plist b/x11-toolkits/libgtksourceviewmm/pkg-plist
index 52ef235c26f7..3c0e75581b39 100644
--- a/x11-toolkits/libgtksourceviewmm/pkg-plist
+++ b/x11-toolkits/libgtksourceviewmm/pkg-plist
@@ -1,34 +1,33 @@
-include/gtksourceviewmm-1.0/gtksourceviewmm/init.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcebuffer_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcelanguage_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcelanguagesmanager_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcemarker_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcestylescheme_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetag_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetagstyle_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetagtable_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourceview_p.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcebuffer.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcelanguage.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcelanguagesmanager.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcemarker.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcestylescheme.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetag.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetagstyle.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetagtable.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/sourceview.h
-include/gtksourceviewmm-1.0/gtksourceviewmm/wrap_init.h
-lib/gtksourceviewmm-1.0/include/gtksourceviewmmconfig.h
-lib/gtksourceviewmm-1.0/proc/m4/convert.m4
-lib/gtksourceviewmm-1.0/proc/m4/convert_gtksourceviewmm.m4
-lib/libgtksourceviewmm-1.0.la
-lib/libgtksourceviewmm-1.0.so
-lib/libgtksourceviewmm-1.0.so.1
-libdata/pkgconfig/libgtksourceviewmm-1.0.pc
-@dirrm lib/gtksourceviewmm-1.0/proc/m4
-@dirrm lib/gtksourceviewmm-1.0/proc
-@dirrm lib/gtksourceviewmm-1.0/include
-@dirrm lib/gtksourceviewmm-1.0
-@dirrm include/gtksourceviewmm-1.0/gtksourceviewmm/private
-@dirrm include/gtksourceviewmm-1.0/gtksourceviewmm
-@dirrm include/gtksourceviewmm-1.0
+include/gtksourceviewmm-2.0/gtksourceviewmm.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/init.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcebuffer_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourceiter_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcelanguage_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcelanguagemanager_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcemark_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcestyle_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcestylescheme_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcestyleschememanager_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourceview_p.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourcebuffer.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourceiter.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourcelanguage.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourcelanguagemanager.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourcemark.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourcestyle.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourcestylescheme.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourcestyleschememanager.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/sourceview.h
+include/gtksourceviewmm-2.0/gtksourceviewmm/wrap_init.h
+lib/gtksourceviewmm-2.0/include/gtksourceviewmmconfig.h
+lib/gtksourceviewmm-2.0/proc/m4/convert.m4
+lib/gtksourceviewmm-2.0/proc/m4/convert_gtksourceviewmm.m4
+lib/libgtksourceviewmm-2.0.la
+lib/libgtksourceviewmm-2.0.so
+lib/libgtksourceviewmm-2.0.so.2
+libdata/pkgconfig/gtksourceviewmm-2.0.pc
+@dirrm lib/gtksourceviewmm-2.0/proc/m4
+@dirrm lib/gtksourceviewmm-2.0/proc
+@dirrm lib/gtksourceviewmm-2.0/include
+@dirrm include/gtksourceviewmm-2.0/gtksourceviewmm/private
+@dirrm include/gtksourceviewmm-2.0/gtksourceviewmm
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 20a3282e63a2..dd74382215a3 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.106 2008/03/10 23:48:53 ahze Exp $
+#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.114 2008/11/25 17:24:09 mezz Exp $
 #
 
 PORTNAME=	libwnck
-PORTVERSION=	2.22.3
+PORTVERSION=	2.24.2
 PORTREVISION?=	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
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index e11fdcef8432..6306502f25d3 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.22.3.tar.bz2) = 12cf787efa0b9d95bc53613bcc7d958e
-SHA256 (gnome2/libwnck-2.22.3.tar.bz2) = b013fb5f702b4e182399ffb714451307822cad2ba310e0e7565761319f33d436
-SIZE (gnome2/libwnck-2.22.3.tar.bz2) = 687875
+MD5 (gnome2/libwnck-2.24.2.tar.bz2) = 1c939b1722579e5b7adc37068e77d72a
+SHA256 (gnome2/libwnck-2.24.2.tar.bz2) = 35c12f983e64c88c37c261eb6b55b7c59a5ef4dbb04525162f0753ea8e9127f2
+SIZE (gnome2/libwnck-2.24.2.tar.bz2) = 693227
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 2b85d43521af..bcc92275f72a 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -26,6 +26,7 @@ share/locale/bn/LC_MESSAGES/libwnck.mo
 share/locale/bn_IN/LC_MESSAGES/libwnck.mo
 share/locale/bs/LC_MESSAGES/libwnck.mo
 share/locale/ca/LC_MESSAGES/libwnck.mo
+share/locale/ca@valencia/LC_MESSAGES/libwnck.mo
 share/locale/cs/LC_MESSAGES/libwnck.mo
 share/locale/cy/LC_MESSAGES/libwnck.mo
 share/locale/da/LC_MESSAGES/libwnck.mo
@@ -84,7 +85,7 @@ share/locale/sk/LC_MESSAGES/libwnck.mo
 share/locale/sl/LC_MESSAGES/libwnck.mo
 share/locale/sq/LC_MESSAGES/libwnck.mo
 share/locale/sr/LC_MESSAGES/libwnck.mo
-share/locale/sr@Latn/LC_MESSAGES/libwnck.mo
+share/locale/sr@latin/LC_MESSAGES/libwnck.mo
 share/locale/sv/LC_MESSAGES/libwnck.mo
 share/locale/ta/LC_MESSAGES/libwnck.mo
 share/locale/te/LC_MESSAGES/libwnck.mo
@@ -105,6 +106,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -121,6 +124,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 7ba96a6ccdb9..8cf3b149f472 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.118 2008/03/10 17:44:38 ahze Exp $
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.133 2008/12/18 02:44:05 mezz Exp $
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.20.5
+PORTVERSION=	1.22.4
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME \
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 6fcf712eca6a..45e017171aff 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.20.5.tar.bz2) = 052b60a12f6b2eb4f251ab961f2b2b84
-SHA256 (gnome2/pango-1.20.5.tar.bz2) = 86f5a94bad18a24c32d6c95f4aad0de643189471825d07e1c1bcaf7cc5a8fab2
-SIZE (gnome2/pango-1.20.5.tar.bz2) = 1420306
+MD5 (gnome2/pango-1.22.4.tar.bz2) = 7c3f3748052799746d73c6d3a0cc1205
+SHA256 (gnome2/pango-1.22.4.tar.bz2) = ff47d7ed8360ebef5fa4b8d3ccf45e014bc8793743bca2a96635a3c34eeaa534
+SIZE (gnome2/pango-1.22.4.tar.bz2) = 1496168
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 86ba73dc53f8..83c249c736ee 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -3,6 +3,7 @@ bin/pango-querymodules
 etc/pango/pango.modules
 %%X11%%etc/pango/pangox.aliases
 include/pango-1.0/pango/pango-attributes.h
+include/pango-1.0/pango/pango-bidi-type.h
 include/pango-1.0/pango/pango-break.h
 include/pango-1.0/pango/pango-context.h
 include/pango-1.0/pango/pango-coverage.h
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
new file mode 100644
index 000000000000..d1ddb461a5e6
--- /dev/null
+++ b/x11-toolkits/pangomm/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:   pangomm
+# Date created:        23 July 2008
+# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.7 2008/11/10 19:57:21 kwm Exp $
+#
+
+PORTNAME=	pangomm
+PORTVERSION=	2.14.1
+PORTREVISION?=	0
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	C++ wrapper for Pango
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
+		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pango
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-demos \
+		--disable-docs \
+		--disable-examples \
+		--enable-static=yes \
+		--with-sigc-prefix=${LOCALBASE}
+
+PLIST_SUB=	VERSION="2.4" API_VERSION="1.4"
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
+		${WRKSRC}/Makefile.in
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo
new file mode 100644
index 000000000000..650cc75a9861
--- /dev/null
+++ b/x11-toolkits/pangomm/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/pangomm-2.14.1.tar.bz2) = c67228ea93dd977394d2872b61754b53
+SHA256 (gnome2/pangomm-2.14.1.tar.bz2) = d7724d878242f7313086e23f774f5ae021f6ff8d0bd393d6c704ad89362c3557
+SIZE (gnome2/pangomm-2.14.1.tar.bz2) = 984848
diff --git a/x11-toolkits/pangomm/pkg-descr b/x11-toolkits/pangomm/pkg-descr
new file mode 100644
index 000000000000..1fec3f2b76be
--- /dev/null
+++ b/x11-toolkits/pangomm/pkg-descr
@@ -0,0 +1,3 @@
+C++ wrapper for Pango.
+
+WWW: http://gtkmm.sourceforge.net/
diff --git a/x11-toolkits/pangomm/pkg-plist b/x11-toolkits/pangomm/pkg-plist
new file mode 100644
index 000000000000..08c681f69138
--- /dev/null
+++ b/x11-toolkits/pangomm/pkg-plist
@@ -0,0 +1,67 @@
+include/pangomm-%%API_VERSION%%/pangomm.h
+include/pangomm-%%API_VERSION%%/pangomm/attributes.h
+include/pangomm-%%API_VERSION%%/pangomm/attriter.h
+include/pangomm-%%API_VERSION%%/pangomm/attrlist.h
+include/pangomm-%%API_VERSION%%/pangomm/cairofontmap.h
+include/pangomm-%%API_VERSION%%/pangomm/color.h
+include/pangomm-%%API_VERSION%%/pangomm/context.h
+include/pangomm-%%API_VERSION%%/pangomm/coverage.h
+include/pangomm-%%API_VERSION%%/pangomm/font.h
+include/pangomm-%%API_VERSION%%/pangomm/fontdescription.h
+include/pangomm-%%API_VERSION%%/pangomm/fontface.h
+include/pangomm-%%API_VERSION%%/pangomm/fontfamily.h
+include/pangomm-%%API_VERSION%%/pangomm/fontmap.h
+include/pangomm-%%API_VERSION%%/pangomm/fontmetrics.h
+include/pangomm-%%API_VERSION%%/pangomm/fontset.h
+include/pangomm-%%API_VERSION%%/pangomm/glyph.h
+include/pangomm-%%API_VERSION%%/pangomm/glyphstring.h
+include/pangomm-%%API_VERSION%%/pangomm/init.h
+include/pangomm-%%API_VERSION%%/pangomm/item.h
+include/pangomm-%%API_VERSION%%/pangomm/language.h
+include/pangomm-%%API_VERSION%%/pangomm/layout.h
+include/pangomm-%%API_VERSION%%/pangomm/layoutiter.h
+include/pangomm-%%API_VERSION%%/pangomm/layoutline.h
+include/pangomm-%%API_VERSION%%/pangomm/layoutrun.h
+include/pangomm-%%API_VERSION%%/pangomm/private/attributes_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/attriter_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/attrlist_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/cairofontmap_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/color_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/context_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/coverage_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/font_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontdescription_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontface_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontfamily_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontmap_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontmetrics_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/fontset_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/glyph_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/glyphstring_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/item_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/language_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layout_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layoutiter_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layoutline_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/layoutrun_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/rectangle_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/renderer_p.h
+include/pangomm-%%API_VERSION%%/pangomm/private/tabarray_p.h
+include/pangomm-%%API_VERSION%%/pangomm/rectangle.h
+include/pangomm-%%API_VERSION%%/pangomm/renderer.h
+include/pangomm-%%API_VERSION%%/pangomm/tabarray.h
+include/pangomm-%%API_VERSION%%/pangomm/types.h
+include/pangomm-%%API_VERSION%%/pangomm/wrap_init.h
+lib/libpangomm-%%API_VERSION%%.a
+lib/libpangomm-%%API_VERSION%%.la
+lib/libpangomm-%%API_VERSION%%.so
+lib/libpangomm-%%API_VERSION%%.so.1
+lib/pangomm-%%API_VERSION%%/proc/m4/convert.m4
+lib/pangomm-%%API_VERSION%%/proc/m4/convert_pango.m4
+libdata/pkgconfig/pangomm-%%API_VERSION%%.pc
+@dirrm lib/pangomm-%%API_VERSION%%/proc/m4
+@dirrm lib/pangomm-%%API_VERSION%%/proc
+@dirrm lib/pangomm-%%API_VERSION%%
+@dirrm include/pangomm-%%API_VERSION%%/pangomm/private
+@dirrm include/pangomm-%%API_VERSION%%/pangomm
+@dirrm include/pangomm-%%API_VERSION%%
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 154b38e0fe41..f2de7e8508c8 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.72 2008/03/09 21:58:25 mezz Exp $
+#   $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.79 2008/12/20 05:39:21 marcus Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.22.0
-PORTREVISION=	2
+PORTVERSION=	2.24.1
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,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.10:${PORTSDIR}/multimedia/totem-pl-parser \
+		totem-plparser.12:${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
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index ccb42e48dd79..42b6dc6c2fea 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.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
+MD5 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 3eac6b859bff98148b021c9d11224ca5
+SHA256 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 2f10ec51126493b88f5c2e3336a9cacca740bc25fc9b8b2d871a21b21b5e8748
+SIZE (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 621325
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
index 05db58a4c083..de4572f7febf 100644
--- a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
+++ b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
@@ -8,13 +8,3 @@
  #include <arpa/inet.h>
  
  
-@@ -1316,8 +1317,8 @@ build_siglist(void)
- 
- 	for(i = 0; i < len; ++i)
- 	{
--		p = &glibtop_sys_siglist[i];
- 		PyObject* d;
-+		p = &glibtop_sys_siglist[i];
- 
- 		d = PyDict_New();
- 		my_dict_add_and_decref(d, "number", PyI_L(p->number));
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 917df6d24666..655c04591ba7 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.43 2008/02/05 13:25:18 kwm Exp $
+#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.45 2008/10/21 14:16:43 kwm Exp $
 #
 
 PORTNAME=	gnome
 PORTVERSION=	2.19.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs
new file mode 100644
index 000000000000..b0b5dae6237e
--- /dev/null
+++ b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs
@@ -0,0 +1,67 @@
+--- gdl/gdl.defs.orig	2007-06-05 14:52:30.000000000 +0000
++++ gdl/gdl.defs	2008-10-21 15:47:07.000000000 +0000
+@@ -81,17 +81,6 @@
+   (gtype-id "GDL_TYPE_DOCK_TABLABEL")
+ )
+ 
+-(ifdef HAVE_GDL_0_7
+-
+-(define-object Icons
+-  (in-module "Gdl")
+-  (parent "GObject")
+-  (c-name "GdlIcons")
+-  (gtype-id "GDL_TYPE_ICONS")
+-)
+-
+-) ; ifdef HAVE_GDL_0_7
+-
+ ;; Enumerations and flags ...
+ 
+ (ifdef HAVE_GDL_0_7
+@@ -924,46 +913,3 @@
+   (return-type "none")
+ )
+ 
+-;; From gdl-icons.h
+-
+-(ifdef HAVE_GDL_0_7
+-
+-(define-function gdl_icons_new
+-  (is-constructor-of "GdlIcons")
+-  (c-name "gdl_icons_new")
+-  (return-type "GdlIcons*")
+-  (parameters
+-    '("int" "icon_size")
+-  )
+-)
+-
+-(define-function gdl_icons_get_type
+-  (c-name "gdl_icons_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-method get_folder_icon
+-  (of-object "GdlIcons")
+-  (c-name "gdl_icons_get_folder_icon")
+-  (return-type "GdkPixbuf*")
+-)
+-
+-(define-method get_uri_icon
+-  (of-object "GdlIcons")
+-  (c-name "gdl_icons_get_uri_icon")
+-  (return-type "GdkPixbuf*")
+-  (parameters
+-    '("const-char*" "uri")
+-  )
+-)
+-
+-(define-method get_mime_icon
+-  (of-object "GdlIcons")
+-  (c-name "gdl_icons_get_mime_icon")
+-  (return-type "GdkPixbuf*")
+-  (parameters
+-    '("const-char*" "mime_type")
+-  )
+-)
+-
+-) ; ifdef HAVE_GDL_0_7
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override
new file mode 100644
index 000000000000..16e67fe1efc5
--- /dev/null
+++ b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override
@@ -0,0 +1,10 @@
+--- gdl/gdl.override.orig	2007-06-05 14:52:30.000000000 +0000
++++ gdl/gdl.override	2008-10-21 15:47:07.000000000 +0000
+@@ -6,7 +6,6 @@ headers
+ #include <pygtk/pygtk.h>
+ #include <gdl/gdl-dock.h>
+ #include <gdl/libgdltypebuiltins.h>
+-#include <gdl/gdl-icons.h>
+ #ifndef HAVE_GDL_0_7
+ # include <gdl/gdl-dock-bar.h>
+ #endif
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index f9d3a7786eef..c65979fa2da9 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/x11-toolkits/py-gnome2/Makefile,v 1.49 2008/03/09 21:47:30 mezz Exp $
+#   $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.52 2008/09/22 12:16:45 kwm Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.22.1
+PORTVERSION=	2.22.3
 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 13244d959b1b..f93a875bb83a 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.22.1.tar.bz2) = 02054115dc86617da2a80eb87a1f988b
-SHA256 (gnome2/gnome-python-2.22.1.tar.bz2) = 559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01
-SIZE (gnome2/gnome-python-2.22.1.tar.bz2) = 552363
+MD5 (gnome2/gnome-python-2.22.3.tar.bz2) = ab12d94954a57de39b25eb7903d8429c
+SHA256 (gnome2/gnome-python-2.22.3.tar.bz2) = a1763ef40aa0fc152e1afe6be6b01d69ba305273bd4bd44cad018da42d1bb559
+SIZE (gnome2/gnome-python-2.22.3.tar.bz2) = 588459
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 94267b33cb03..8660cd385cab 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					marc@informatik.uni-bremen.de
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.54 2007/09/16 17:26:18 ahze Exp $
+#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.58 2008/09/27 01:53:01 mezz Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.12.1
+PORTVERSION=	2.13.0
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtk-${PORTVERSION}
@@ -27,7 +27,7 @@ RUN_DEPENDS=	${PYNUMERIC} \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget libglade2
+USE_GNOME=	gnomehack libglade2
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 68bb84b1c509..f866dc2bb7b2 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.12.1.tar.bz2) = a816346d750d61e3fa67a200e4292694
-SHA256 (gnome2/pygtk-2.12.1.tar.bz2) = 4100ed4bf295b03106308f1cfb9931cc22910401dab785f8bd3af9935f1fe13d
-SIZE (gnome2/pygtk-2.12.1.tar.bz2) = 2175955
+MD5 (gnome2/pygtk-2.13.0.tar.bz2) = e1513921bfd3790b456899c483fceaea
+SHA256 (gnome2/pygtk-2.13.0.tar.bz2) = 80c5b788a4e7a92349ebfa6494848fcb81f57099609df1ace313458808a58418
+SIZE (gnome2/pygtk-2.13.0.tar.bz2) = 2130260
diff --git a/x11-toolkits/py-gtk2/files/patch-Makefile.in b/x11-toolkits/py-gtk2/files/patch-Makefile.in
index b9cedaf23921..1ddb1d6b990b 100644
--- a/x11-toolkits/py-gtk2/files/patch-Makefile.in
+++ b/x11-toolkits/py-gtk2/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Sep  5 02:02:53 2006
-+++ Makefile.in	Tue Sep  5 02:06:11 2006
-@@ -292,7 +292,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = 1.7
- @BUILD_GTK_TRUE@GTK_SUBDIR = gtk
--SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
-+SUBDIRS = codegen . $(GTK_SUBDIR) examples
- PLATFORM_VERSION = 2.0
- CLEANFILES = atk.c pango.c pangocairo.c
- EXTRA_DIST = \
+--- Makefile.in.orig	2008-09-01 08:50:06.000000000 +0000
++++ Makefile.in	2008-09-01 08:51:03.000000000 +0000
+@@ -124,7 +124,7 @@
+ DATA = $(defs_DATA) $(pkgconfig_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = . gtk examples tests docs
++DIST_SUBDIRS = . gtk examples
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
diff --git a/x11-toolkits/py-gtk2/files/patch-doc_Makefile.in b/x11-toolkits/py-gtk2/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..857b4fa66e7a
--- /dev/null
+++ b/x11-toolkits/py-gtk2/files/patch-doc_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	2008-09-03 16:07:35.000000000 +0000
++++ docs/Makefile.in	2008-09-03 16:07:55.000000000 +0000
+@@ -812,7 +812,7 @@
+ 	html/unixprint-functions.html
+ 
+ CSS_FILES = $(PYGOBJECT_PYGDOCS)/style.css
+-TARGET_DIR = $(datadir)/gtk-doc/html/pygtk
++TARGET_DIR = $(datadir)/doc/py-gtk
+ CSSdir = $(TARGET_DIR)
+ EXTRA_DIST = \
+ 	cursors icons			\
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 05099ad5b9bf..9dffd29cb82d 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -76,9 +76,15 @@ lib/pygtk/2.0/demos/statusicon.pyo
 lib/pygtk/2.0/demos/stock_browser.py
 lib/pygtk/2.0/demos/stock_browser.pyc
 lib/pygtk/2.0/demos/stock_browser.pyo
+lib/pygtk/2.0/demos/textscroll.py
+lib/pygtk/2.0/demos/textscroll.pyc
+lib/pygtk/2.0/demos/textscroll.pyo
 lib/pygtk/2.0/demos/textview.py
 lib/pygtk/2.0/demos/textview.pyc
 lib/pygtk/2.0/demos/textview.pyo
+lib/pygtk/2.0/demos/tooltip.py
+lib/pygtk/2.0/demos/tooltip.pyc
+lib/pygtk/2.0/demos/tooltip.pyo
 lib/pygtk/2.0/demos/tree_store.py
 lib/pygtk/2.0/demos/tree_store.pyc
 lib/pygtk/2.0/demos/tree_store.pyo
@@ -121,6 +127,467 @@ lib/pygtk/2.0/pygtk-demo.pyo
 libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%DOCSDIR%%/MAPPING
 %%PORTDOCS%%%%DOCSDIR%%/THREADS
+%%PORTDOCS%%%%DOCSDIR%%/atk-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/atk-constants.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkaction.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkcomponent.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkdocument.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkeditabletext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkgobjectaccessible.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkhyperlink.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkhypertext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkimage.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkimplementor.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atknoopobject.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atknoopobjectfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkobject.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkobjectfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkrectangle.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkregistry.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkrelation.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkrelationset.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkselection.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkstateset.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkstreamablecontent.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atktable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atktext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-atkvalue.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkatom.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkcairocontext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkcolor.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkcolormap.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkdevice.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkdisplay.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkdisplaymanager.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkdragcontext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkdrawable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkevent.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkgc.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkimage.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkkeymap.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkpangorenderer.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbufanimation.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbufanimationiter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbufloader.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixmap.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkrectangle.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkregion.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkscreen.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkvisual.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gdkwindow.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gladexml.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkaboutdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccelgroup.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccellabel.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccelmap.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccessible.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkaction.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkactiongroup.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkadjustment.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkalignment.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkarrow.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkaspectframe.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkassistant.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkbin.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkborder.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkbox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkbuildable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkbuilder.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkbuttonbox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcalendar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcelleditable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcelllayout.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderer.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendereraccel.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderercombo.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendererpixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendererprogress.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendererspin.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderertext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderertoggle.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellview.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcheckbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcheckmenuitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkclipboard.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcolorbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcolorselection.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcolorselectiondialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcombo.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcombobox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcomboboxentry.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcontainer.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkcurve.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkdrawingarea.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkeditable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkentry.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkentrycompletion.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkeventbox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkexpander.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooser.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooserbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooserdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooserwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilefilter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfileselection.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfixed.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfontbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfontselection.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkfontselectiondialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkframe.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkgammacurve.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhandlebox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhbox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhbuttonbox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhpaned.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhruler.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhscale.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhscrollbar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkhseparator.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconset.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconsource.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkicontheme.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconview.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkimage.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkimagemenuitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkimcontext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkimcontextsimple.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkimmulticontext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkinputdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkinvisible.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkitemfactory.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtklabel.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtklayout.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtklinkbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkliststore.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenubar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenuitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenushell.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenutoolbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkmessagedialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkmisc.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtknotebook.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkobject.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkoptionmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkpagesetup.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkpagesetupunixdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkpaned.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkpapersize.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkplug.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintcontext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprinter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintjob.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintoperation.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintoperationpreview.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintsettings.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintunixdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkprogressbar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkradioaction.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkradiobutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkradiomenuitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkradiotoolbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrange.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrcstyle.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentaction.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchooser.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchooserdialog.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchoosermenu.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchooserwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentmanager.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkrequisition.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkruler.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkscale.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkscalebutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkscrollbar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkscrolledwindow.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkselectiondata.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkseparator.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkseparatormenuitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkseparatortoolitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtksettings.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtksizegroup.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtksocket.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkspinbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkstatusbar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkstatusicon.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkstyle.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktearoffmenuitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktextattributes.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktextbuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktextchildanchor.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktextiter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktextmark.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktexttag.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktexttagtable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktextview.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktoggleaction.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktogglebutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktoggletoolbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktoolbar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktoolbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktoolitem.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktooltip.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktooltips.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreedragdest.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreedragsource.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeiter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreemodel.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreemodelfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreemodelsort.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreerowreference.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeselection.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreesortable.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreestore.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeview.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeviewcolumn.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkuimanager.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvbox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvbuttonbox.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkviewport.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvolumebutton.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvpaned.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvruler.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvscale.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvscrollbar.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkvseparator.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkwindow.html
+%%PORTDOCS%%%%DOCSDIR%%/class-gtkwindowgroup.html
+%%PORTDOCS%%%%DOCSDIR%%/class-hierarchy.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangoattribute.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangoattriterator.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangoattrlist.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangocairocairocontext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangocairocairofontmap.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangocolor.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangocontext.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofont.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofontdescription.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofontface.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofontfamily.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofontmap.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofontmetrics.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofontset.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangofontsetsimple.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangoglyphstring.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangolanguage.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangolayout.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangolayoutiter.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangolayoutline.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangorenderer.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pangotabarray.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pygtkgenericcellrenderer.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pygtkgenerictreemodel.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pygtktreemodelrow.html
+%%PORTDOCS%%%%DOCSDIR%%/class-pygtktreemodelrowiter.html
+%%PORTDOCS%%%%DOCSDIR%%/cursors/X_cursor.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/based_arrow_down.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/based_arrow_up.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/boat.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/bogosity.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_left_corner.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_right_corner.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_side.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_tee.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/box_spiral.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/center_ptr.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/circle.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/clock.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/coffee_mug.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/cross.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/cross_reverse.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/crosshair.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/diamond_cross.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/dot.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/dotbox.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/double_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/draft_large.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/draft_small.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/draped_box.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/exchange.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/fleur.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/gobbler.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/gumby.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/hand1.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/hand2.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/heart.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/icon.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/iron_cross.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/left_ptr.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/left_side.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/left_tee.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/leftbutton.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/ll_angle.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/lr_angle.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/man.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/middlebutton.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/mouse.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/pencil.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/pirate.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/question_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/right_ptr.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/right_side.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/right_tee.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/rightbutton.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/rtl_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sailboat.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_down_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_h_double_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_left_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_right_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_up_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_v_double_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/shuttle.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/sizing.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/spider.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/spraycan.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/star.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/target.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/tcross.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/top_left_arrow.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/top_left_corner.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/top_right_corner.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/top_side.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/top_tee.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/trek.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/ul_angle.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/umbrella.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/ur_angle.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/watch.png
+%%PORTDOCS%%%%DOCSDIR%%/cursors/xterm.png
+%%PORTDOCS%%%%DOCSDIR%%/gdk-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/gdk-constants.html
+%%PORTDOCS%%%%DOCSDIR%%/gdk-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/glade-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/gtk-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/gtk-constants.html
+%%PORTDOCS%%%%DOCSDIR%%/gtk-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/gtk-stock-items.html
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_about_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_add_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_center_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_justify_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_left_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_right_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_apply_20.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_bottom_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_broken_image_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_cancel_20.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_cdrom_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_clear_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_close_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_color_picker_25.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_colorselector_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_connect_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_convert_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_copy_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_cut_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_authentication_48.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_error_48.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_info_48.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_question_48.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_warning_48.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_directory_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_disconnect_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dnd_32.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dnd_multiple_32.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_down_arrow_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_edit_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_exec_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_exit_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_file_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_first_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_font_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_fullscreen_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_harddisk_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_help_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_home_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_index_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_info_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_jump_to_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_jump_to_rtl_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_last_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_leave_fullscreen_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_left_arrow_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_forward_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_next_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_pause_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_play_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_play_rtl_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_previous_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_record_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_rewind_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_stop_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_network_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_new_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_no_20.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_ok_20.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_open_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_paste_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_preferences_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_print_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_print_preview_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_properties_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_redo_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_redo_rtl_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_refresh_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_remove_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_revert_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_revert_rtl_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_right_arrow_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_save_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_save_as_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_search_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_search_replace_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_sort_ascending_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_sort_descending_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_spellcheck_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_stop_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_bold_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_indent_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_italic_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_strikethrough_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_underline_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_unindent_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_top_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_trash_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undelete_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undelete_rtl_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undo_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undo_rtl_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_up_arrow_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_yes_20.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_1_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_fit_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_in_24.png
+%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_out_24.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/pango-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pango-constants.html
+%%PORTDOCS%%%%DOCSDIR%%/pango-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/pango-markup-language.html
+%%PORTDOCS%%%%DOCSDIR%%/pangocairo-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pangocairo-constants.html
+%%PORTDOCS%%%%DOCSDIR%%/pangocairo-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtk-introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtk-reference-format.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtk.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/unixprint-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/unixprint-constants.html
+%%PORTDOCS%%%%DOCSDIR%%/unixprint-functions.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
@@ -134,6 +601,7 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/editable-interface.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/properties.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/signal.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/application.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/bin.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/customtreemodel.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/filechooser.py
@@ -195,7 +663,9 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/sizegroup.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/statusicon.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/stock_browser.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/textscroll.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/textview.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/tooltip.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/tree_store.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/treemodel.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/ui_manager.py
@@ -209,52 +679,11 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple/scribble.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple/simple.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple/tooltip.py
-share/pygtk/2.0/codegen/__init__.py
-share/pygtk/2.0/codegen/__init__.pyc
-share/pygtk/2.0/codegen/__init__.pyo
-share/pygtk/2.0/codegen/argtypes.py
-share/pygtk/2.0/codegen/argtypes.pyc
-share/pygtk/2.0/codegen/argtypes.pyo
-share/pygtk/2.0/codegen/codegen.py
-share/pygtk/2.0/codegen/codegen.pyc
-share/pygtk/2.0/codegen/codegen.pyo
-share/pygtk/2.0/codegen/createdefs.py
-share/pygtk/2.0/codegen/createdefs.pyc
-share/pygtk/2.0/codegen/createdefs.pyo
-share/pygtk/2.0/codegen/definitions.py
-share/pygtk/2.0/codegen/definitions.pyc
-share/pygtk/2.0/codegen/definitions.pyo
-share/pygtk/2.0/codegen/defsparser.py
-share/pygtk/2.0/codegen/defsparser.pyc
-share/pygtk/2.0/codegen/defsparser.pyo
-share/pygtk/2.0/codegen/docextract.py
-share/pygtk/2.0/codegen/docextract.pyc
-share/pygtk/2.0/codegen/docextract.pyo
-share/pygtk/2.0/codegen/docgen.py
-share/pygtk/2.0/codegen/docgen.pyc
-share/pygtk/2.0/codegen/docgen.pyo
-share/pygtk/2.0/codegen/h2def.py
-share/pygtk/2.0/codegen/h2def.pyc
-share/pygtk/2.0/codegen/h2def.pyo
-share/pygtk/2.0/codegen/mergedefs.py
-share/pygtk/2.0/codegen/mergedefs.pyc
-share/pygtk/2.0/codegen/mergedefs.pyo
-share/pygtk/2.0/codegen/mkskel.py
-share/pygtk/2.0/codegen/mkskel.pyc
-share/pygtk/2.0/codegen/mkskel.pyo
-share/pygtk/2.0/codegen/override.py
-share/pygtk/2.0/codegen/override.pyc
-share/pygtk/2.0/codegen/override.pyo
-share/pygtk/2.0/codegen/reversewrapper.py
-share/pygtk/2.0/codegen/reversewrapper.pyc
-share/pygtk/2.0/codegen/reversewrapper.pyo
-share/pygtk/2.0/codegen/scmexpr.py
-share/pygtk/2.0/codegen/scmexpr.pyc
-share/pygtk/2.0/codegen/scmexpr.pyo
 share/pygtk/2.0/defs/atk-types.defs
 share/pygtk/2.0/defs/atk.defs
 share/pygtk/2.0/defs/gdk-2.10.defs
 share/pygtk/2.0/defs/gdk-2.12.defs
+share/pygtk/2.0/defs/gdk-2.14.defs
 share/pygtk/2.0/defs/gdk-base-types.defs
 share/pygtk/2.0/defs/gdk-base.defs
 share/pygtk/2.0/defs/gdk-types.defs
@@ -263,6 +692,8 @@ share/pygtk/2.0/defs/gtk-2.10-types.defs
 share/pygtk/2.0/defs/gtk-2.10.defs
 share/pygtk/2.0/defs/gtk-2.12-types.defs
 share/pygtk/2.0/defs/gtk-2.12.defs
+share/pygtk/2.0/defs/gtk-2.14-types.defs
+share/pygtk/2.0/defs/gtk-2.14.defs
 share/pygtk/2.0/defs/gtk-base-types.defs
 share/pygtk/2.0/defs/gtk-base.defs
 share/pygtk/2.0/defs/gtk-extrafuncs.defs
@@ -275,7 +706,6 @@ share/pygtk/2.0/defs/pango.defs
 share/pygtk/2.0/defs/pangocairo.defs
 share/pygtk/2.0/defs/pangocairo.override
 @dirrm share/pygtk/2.0/defs
-@dirrm share/pygtk/2.0/codegen
 @dirrm share/pygtk/2.0
 @dirrm share/pygtk
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simple
@@ -289,10 +719,14 @@ share/pygtk/2.0/defs/pangocairo.override
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/glade
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/atk
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/cursors
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/
 @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/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 188908e646b1..0606876c2ea6 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -3,13 +3,12 @@
 # Whom:					Mezz <mezz@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.10 2008/03/10 15:18:35 ahze Exp $
+#   $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.14 2008/09/21 06:34:35 kwm Exp $
 #
 
 PORTNAME=	gtksourceview
-PORTVERSION=	2.2.0
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits gnome python
+PORTVERSION=	2.4.0
+CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +19,7 @@ COMMENT=	A python bindings for the version 2 of the GtkSourceView library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget gtksourceview2 pygtk2
+USE_GNOME=	gnomehack gnomeprefix gtksourceview2 pygtk2
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docs
diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo
index f96d4b90fe41..daf8d55238f3 100644
--- a/x11-toolkits/py-gtksourceview/distinfo
+++ b/x11-toolkits/py-gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (pygtksourceview-2.2.0.tar.bz2) = 5dd0a9aa99168f989ed04123a65077e4
-SHA256 (pygtksourceview-2.2.0.tar.bz2) = 457484cf4b6c5c18ba4bcd9d35d5879f3a85e6dbf37f07ba4cfa6c20e6271963
-SIZE (pygtksourceview-2.2.0.tar.bz2) = 267402
+MD5 (pygtksourceview-2.4.0.tar.bz2) = 436e2ec467035a8cd174b794932e4cdc
+SHA256 (pygtksourceview-2.4.0.tar.bz2) = 437fb779bc0bd9a43806ee7b3a406a1329800e54489cd9579ea0a101870df791
+SIZE (pygtksourceview-2.4.0.tar.bz2) = 271360
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 469f7389f798..3eb38350af11 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.86 2008/03/10 23:44:02 ahze Exp $
+#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.91 2008/09/22 23:42:39 kwm Exp $
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.16.14
-PORTREVISION?=	1
+PORTVERSION=	0.17.4
+PORTREVISION?=	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
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 6bcdda3b1978..f703509a9b03 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.16.14.tar.bz2) = 9df3e35b81b209952ac1cf7904f7b620
-SHA256 (gnome2/vte-0.16.14.tar.bz2) = 40cf321980d3139c8f084e818504e1366be81bed817eeeec9021257e04c1c0db
-SIZE (gnome2/vte-0.16.14.tar.bz2) = 1120379
+MD5 (gnome2/vte-0.17.4.tar.bz2) = ec6cb2668db7146eae7cfc48af98f3ed
+SHA256 (gnome2/vte-0.17.4.tar.bz2) = 50ae10aea7fa99c9ae296031782c18ac15663e84eb6ecd94cd0a18c7843987d2
+SIZE (gnome2/vte-0.17.4.tar.bz2) = 1084847
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
index ec700b9c90f7..70091c3aa2f7 100644
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
@@ -1,14 +1,22 @@
---- gnome-pty-helper/configure.orig	2007-07-29 17:28:10.000000000 -0400
-+++ gnome-pty-helper/configure	2007-07-29 17:29:30.000000000 -0400
-@@ -8408,6 +8408,7 @@ ECHO_C!$ECHO_C$ac_delim
- ECHO_N!$ECHO_N$ac_delim
- ECHO_T!$ECHO_T$ac_delim
- LIBS!$LIBS$ac_delim
+--- gnome-pty-helper/configure.orig	2008-09-08 19:30:02.000000000 -0400
++++ gnome-pty-helper/configure	2008-09-08 19:31:21.000000000 -0400
+@@ -673,6 +673,7 @@ AMTAR
+ am__tar
+ am__untar
+ CC
++BSD_PTHREAD_LIBS
+ CFLAGS
+ LDFLAGS
+ CPPFLAGS
+@@ -8434,6 +8435,7 @@ AMTAR!$AMTAR$ac_delim
+ am__tar!$am__tar$ac_delim
+ am__untar!$am__untar$ac_delim
+ CC!$CC$ac_delim
 +BSD_PTHREAD_LIBS!$BSD_PTHREAD_LIBS$ac_delim
- build_alias!$build_alias$ac_delim
- host_alias!$host_alias$ac_delim
- target_alias!$target_alias$ac_delim
-@@ -8470,7 +8471,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ CFLAGS!$CFLAGS$ac_delim
+ LDFLAGS!$LDFLAGS$ac_delim
+ CPPFLAGS!$CPPFLAGS$ac_delim
+@@ -8470,7 +8472,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c
deleted file mode 100644
index d903dbbee059..000000000000
--- a/x11-toolkits/vte/files/patch-src_keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/keymap.c.orig	Tue Oct 22 17:42:20 2002
-+++ src/keymap.c	Tue Oct 22 17:42:33 2002
-@@ -18,6 +18,7 @@
- 
- #ident "$Id: patch-src_keymap.c,v 1.5 2004/11/01 04:45:09 marcus Exp $"
- #include "../config.h"
-+#include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
- #include <glib.h>
diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c
deleted file mode 100644
index da0f42b81a3c..000000000000
--- a/x11-toolkits/vte/files/patch-src_pty.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pty.c.orig	Tue Feb 13 16:24:15 2007
-+++ src/pty.c	Tue Feb 13 16:29:15 2007
-@@ -271,6 +271,7 @@ _vte_pty_run_on_pty (struct vte_pty_chil
- 		     GPid *pid, GError **error)
- {
- 	gboolean ret = TRUE;
-+	extern char **environ;
- 	GError *local_error = NULL;
- 
- 	if (command != NULL) {
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 5d20e62c2262..15cb7dfbb283 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -3,6 +3,8 @@ include/vte/pty.h
 include/vte/reaper.h
 include/vte/vte.h
 include/vte/vteaccess.h
+include/vte/vtetypebuiltins.h
+include/vte/vteversion.h
 lib/libvte.a
 lib/libvte.la
 lib/libvte.so
@@ -87,7 +89,7 @@ share/locale/sk/LC_MESSAGES/vte.mo
 share/locale/sl/LC_MESSAGES/vte.mo
 share/locale/sq/LC_MESSAGES/vte.mo
 share/locale/sr/LC_MESSAGES/vte.mo
-share/locale/sr@Latn/LC_MESSAGES/vte.mo
+share/locale/sr@latin/LC_MESSAGES/vte.mo
 share/locale/sv/LC_MESSAGES/vte.mo
 share/locale/ta/LC_MESSAGES/vte.mo
 share/locale/te/LC_MESSAGES/vte.mo
@@ -114,6 +116,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
author	marcus <marcus@FreeBSD.org>	2009-01-10 13:22:13 +0800
committer	marcus <marcus@FreeBSD.org>	2009-01-10 13:22:13 +0800
commit	6d8ed8f7c7511223163de715a97ffc04bf6fada9 (patch)
tree	40dc015efe383243b0880df377f73ee250da7de7 /x11-toolkits
parent	c7f342a8d7b82e85b9625c4403600fc20ce41da6 (diff)
download	freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.gz freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.zst freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.zip