38 files changed, 231 insertions, 123 deletions

diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 3819445a6d9e..046302a84dc7 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -3,10 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-toolkits/bakery/Makefile,v 1.8 2006/09/10 00:51:16 mezz Exp $
 #
 
 PORTNAME=	bakery
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
@@ -24,9 +26,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index 5ad7006d4826..f3f664dbbef3 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -49,8 +49,6 @@ share/locale/vi/LC_MESSAGES/bakery.mo
 share/locale/uk/LC_MESSAGES/bakery.mo
 share/locale/zh_CN/LC_MESSAGES/bakery.mo
 share/locale/zh_TW/LC_MESSAGES/bakery.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
 @dirrm include/bakery-%%API_VERSION%%/bakery/View
 @dirrm include/bakery-%%API_VERSION%%/bakery/Utilities
 @dirrm include/bakery-%%API_VERSION%%/bakery/Document
@@ -60,3 +58,21 @@ share/locale/zh_TW/LC_MESSAGES/bakery.mo
 @dirrm include/bakery-%%API_VERSION%%/bakery/App
 @dirrm include/bakery-%%API_VERSION%%/bakery
 @dirrm include/bakery-%%API_VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index e28b99c9bbfc..0ea1bd841aa0 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	easygtk
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sobomax
diff --git a/x11-toolkits/easygtk/files/patch-Makefile b/x11-toolkits/easygtk/files/patch-Makefile
index f1797cb26c20..a47ac184106b 100644
--- a/x11-toolkits/easygtk/files/patch-Makefile
+++ b/x11-toolkits/easygtk/files/patch-Makefile
@@ -4,8 +4,8 @@
 -CFLAGS = -Wall -O -I. -I/usr/X11R6/include -I/usr/lib/glib/include -I/usr/X11R6/include/X11 -DUSE_IMLIB -DUSE_GNOME -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/X11R6/include -I/usr/lib/glib/include 
 -LIBS = -L. -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXext -lX11 -lm -lgdk_imlib -L/usr/lib -lImlib -ljpeg -ltiff -lungif -lpng -lz -lm -lXext -L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -I/usr/include/glib -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl 
 -CC = gcc
-+GNOME_CFLAGS != $(X11BASE)/bin/gnome-config --cflags gnomeui
-+GNOME_LIBS != $(X11BASE)/bin/gnome-config --libs gnomeui
++GNOME_CFLAGS != $(LOCALBASE)/bin/gnome-config --cflags gnomeui
++GNOME_LIBS != $(LOCALBASE)/bin/gnome-config --libs gnomeui
 +CFLAGS += -I. -DUSE_IMLIB -DUSE_GNOME $(GNOME_CFLAGS)
 +LIBS = $(GNOME_LIBS)
 +CC ?= gcc
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 7b868dbd26db..cbbf35a03e45 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,10 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.4 2006/09/10 00:51:16 mezz Exp $
 #
 
 PORTNAME=	gdl
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -15,11 +17,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Components intended to be shared between GNOME development tools
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 392114d26f7c..faf1a0b70644 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -64,3 +64,25 @@ share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
 @dirrm %%DATADIR%%
 @dirrm include/libgdl-1.0/gdl
 @dirrm include/libgdl-1.0
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 326efdb569f9..005bf3fd2ec4 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/gtk12/Makefile,v 1.3 2006/10/09 19:31:53 ahze Exp $
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
-PORTREVISION=	15
+PORTREVISION=	17
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
@@ -16,10 +16,10 @@ DISTNAME=	gtk+-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_PERL5=	yes
 USE_GNOME=	glib12
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12 --with-native-locale \
 		--with-xinput=xfree
diff --git a/x11-toolkits/gtk12/files/patch-gtk+.pc.in b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
index 6ef64656dbc5..d9ab159ec758 100644
--- a/x11-toolkits/gtk12/files/patch-gtk+.pc.in
+++ b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- gtk+.pc.in	2002/06/10 15:32:34	1.1
 +++ gtk+.pc.in	2002/06/10 15:32:40
 @@ -7,5 +7,5 @@
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index cd82a7f61b8e..30ebe17aaee8 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Marc Recht <marc@informatik.uni-bremen.de>
 #
 # $FreeBSD$
+#    $MCom: ports/x11-toolkits/gtkglarea2/Makefile,v 1.2 2006/09/10 00:51:17 mezz Exp $
 
 PORTNAME=	gtkglarea
 PORTVERSION=	1.99.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtkglarea/1.99
@@ -17,12 +18,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An OpenGL widget for the GTK+2 GUI toolkit
 
 LATEST_LINK=	gtkglarea2
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gtk20
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-lib-GL
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 1999a1e29a7d..247c893b0e36 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/gtkmm12/Makefile,v 1.2 2006/09/10 00:51:17 mezz Exp $
 
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtkmm/1.2
@@ -20,11 +20,10 @@ LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome \
 		--with-sigc-prefix=${LOCALBASE}
diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile
index 026ec2bc4a8e..181ee815841a 100644
--- a/x11-toolkits/gtkmm20-reference/Makefile
+++ b/x11-toolkits/gtkmm20-reference/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index ab5a09757626..7fa612e887a7 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/gtkmm20/Makefile,v 1.11 2006/09/10 00:51:17 mezz Exp $
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -27,9 +27,8 @@ LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack lthack gtk20
 CONFIGURE_ARGS=	--enable-static=yes \
 		--with-sigc-prefix=${LOCALBASE}
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index 98eb6c409b89..186f1f3dec97 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index fdd2b8f73eb6..eed9bdca8398 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.8 2005/10/20 16:16:50 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.20 2006/08/22 03:45:28 marcus Exp $
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.8.8
+PORTVERSION=	2.10.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -22,15 +22,17 @@ LATEST_LINK=	gtkmm24
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+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
 USE_GCC=	3.4
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gtk20
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-demos \
 		--disable-docs \
 		--disable-examples \
@@ -42,6 +44,8 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|demo[$$][(]EXEEXT[)]|gtkmm-demo$$(EXEEXT)|g' \
+	    	${WRKSRC}/demos/gtk-demo/Makefile.in
 
 .include <bsd.port.mk>
 
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index c5fdc67d91c7..ca6061cbedff 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.8.8.tar.bz2) = 319a7847f67c5099a78afb495e148143
-SHA256 (gnome2/gtkmm-2.8.8.tar.bz2) = e86b42f59d9928ed73435a0f33ac3334be2a87a9371bc1ba09e834996a8bb292
-SIZE (gnome2/gtkmm-2.8.8.tar.bz2) = 6203479
+MD5 (gnome2/gtkmm-2.10.1.tar.bz2) = d661420297e7486a0e0f715f352b4100
+SHA256 (gnome2/gtkmm-2.10.1.tar.bz2) = 855c2b44c472b9c85ededa96ed3082917da3162941032acd716ec2505eba5696
+SIZE (gnome2/gtkmm-2.10.1.tar.bz2) = 7259967
diff --git a/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in b/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in
deleted file mode 100644
index 7422f5718de3..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdk/gdkmm/Makefile.in.orig	Fri Apr 14 17:13:13 2006
-+++ gdk/gdkmm/Makefile.in	Fri Apr 14 17:13:31 2006
-@@ -329,8 +329,7 @@
- 
- @PLATFORM_WIN32_FALSE@no_undefined = 
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols
--@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs = 
--@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-+win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
- 
- # Only export lines that do not contain _GLOBAL_
- # ?! is "negative lookahead" - it stops looking on the line if it finds the regex.
diff --git a/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in b/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in
deleted file mode 100644
index 9823a9db77d0..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/gtkmm/Makefile.in.orig	Fri Apr 14 17:14:20 2006
-+++ gtk/gtkmm/Makefile.in	Fri Apr 14 17:14:41 2006
-@@ -425,8 +425,7 @@
- 
- @PLATFORM_WIN32_FALSE@no_undefined = 
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols
--@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs = 
--@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-+win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
- 
- # Only export lines that do not contain _GLOBAL_
- # ?! is "negative lookahead" - it stops looking on the line if it finds the regex.
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 9df2d7989273..b04bd7c370da 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,3 +1,4 @@
+bin/gtkmm-demo
 include/atkmm-1.6/atkmm.h
 include/atkmm-1.6/atkmm/action.h
 include/atkmm-1.6/atkmm/component.h
@@ -106,6 +107,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/adjustment.h
 include/gtkmm-%%API_VERSION%%/gtkmm/alignment.h
 include/gtkmm-%%API_VERSION%%/gtkmm/arrow.h
 include/gtkmm-%%API_VERSION%%/gtkmm/aspectframe.h
+include/gtkmm-%%API_VERSION%%/gtkmm/assistant.h
 include/gtkmm-%%API_VERSION%%/gtkmm/base.h
 include/gtkmm-%%API_VERSION%%/gtkmm/bin.h
 include/gtkmm-%%API_VERSION%%/gtkmm/box.h
@@ -116,9 +118,11 @@ include/gtkmm-%%API_VERSION%%/gtkmm/celleditable.h
 include/gtkmm-%%API_VERSION%%/gtkmm/celllayout.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderer.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderer_generation.h
+include/gtkmm-%%API_VERSION%%/gtkmm/cellrendereraccel.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderercombo.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererpixbuf.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererprogress.h
+include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererspin.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertoggle.h
 include/gtkmm-%%API_VERSION%%/gtkmm/cellview.h
@@ -166,7 +170,9 @@ include/gtkmm-%%API_VERSION%%/gtkmm/invisible.h
 include/gtkmm-%%API_VERSION%%/gtkmm/item.h
 include/gtkmm-%%API_VERSION%%/gtkmm/label.h
 include/gtkmm-%%API_VERSION%%/gtkmm/layout.h
+include/gtkmm-%%API_VERSION%%/gtkmm/linkbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/liststore.h
+include/gtkmm-%%API_VERSION%%/gtkmm/listviewtext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/main.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menu.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menu_elems.h
@@ -179,8 +185,18 @@ include/gtkmm-%%API_VERSION%%/gtkmm/misc.h
 include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h
 include/gtkmm-%%API_VERSION%%/gtkmm/object.h
 include/gtkmm-%%API_VERSION%%/gtkmm/optionmenu.h
+include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h
+include/gtkmm-%%API_VERSION%%/gtkmm/pagesetupunixdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/paned.h
+include/gtkmm-%%API_VERSION%%/gtkmm/papersize.h
 include/gtkmm-%%API_VERSION%%/gtkmm/plug.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printcontext.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printer.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printjob.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printoperation.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printoperationpreview.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printsettings.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printunixdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/aboutdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/accelgroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/accellabel_p.h
@@ -190,6 +206,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/adjustment_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/alignment_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/arrow_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/aspectframe_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/assistant_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/bin_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/box_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/button_p.h
@@ -198,9 +215,11 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/calendar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/celleditable_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/celllayout_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderer_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendereraccel_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderercombo_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererpixbuf_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererprogress_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererspin_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertext_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertoggle_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/cellview_p.h
@@ -246,6 +265,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/invisible_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/item_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/label_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/layout_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/linkbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/liststore_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/main_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menu_p.h
@@ -258,8 +278,18 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/optionmenu_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetupunixdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/paned_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/papersize_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/plug_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printcontext_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printer_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printjob_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printoperation_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printoperationpreview_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printsettings_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printunixdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/progressbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/radioaction_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/radiobutton_p.h
@@ -267,6 +297,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/radiomenuitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/radiotoolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/range_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/rc_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooser_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserdialog_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchoosermenu_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserwidget_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentfilter_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentinfo_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentmanager_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/ruler_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scale_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollbar_p.h
@@ -280,6 +317,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/sizegroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/socket_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/spinbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/statusbar_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/statusicon_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/stockitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/style_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/table_p.h
@@ -325,6 +363,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/radiomenuitem.h
 include/gtkmm-%%API_VERSION%%/gtkmm/radiotoolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/range.h
 include/gtkmm-%%API_VERSION%%/gtkmm/rc.h
+include/gtkmm-2.4/gtkmm/recentchooser.h
+include/gtkmm-2.4/gtkmm/recentchooserdialog.h
+include/gtkmm-2.4/gtkmm/recentchoosermenu.h
+include/gtkmm-2.4/gtkmm/recentchooserwidget.h
+include/gtkmm-2.4/gtkmm/recentfilter.h
+include/gtkmm-2.4/gtkmm/recentinfo.h
+include/gtkmm-2.4/gtkmm/recentmanager.h
 include/gtkmm-%%API_VERSION%%/gtkmm/ruler.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scale.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrollbar.h
@@ -339,6 +384,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/sizegroup.h
 include/gtkmm-%%API_VERSION%%/gtkmm/socket.h
 include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/statusbar.h
+include/gtkmm-2.4/gtkmm/statusicon.h
 include/gtkmm-%%API_VERSION%%/gtkmm/stock.h
 include/gtkmm-%%API_VERSION%%/gtkmm/stockid.h
 include/gtkmm-%%API_VERSION%%/gtkmm/stockitem.h
@@ -386,6 +432,7 @@ 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
@@ -408,6 +455,7 @@ 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
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 026ec2bc4a8e..181ee815841a 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index ab5a09757626..7fa612e887a7 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/gtkmm20/Makefile,v 1.11 2006/09/10 00:51:17 mezz Exp $
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -27,9 +27,8 @@ LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack lthack gtk20
 CONFIGURE_ARGS=	--enable-static=yes \
 		--with-sigc-prefix=${LOCALBASE}
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index f53dfa6763de..f63e7236f65b 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/gtkscintilla/Makefile,v 1.1 2006/10/04 15:42:01 ahze Exp $
 
 PORTNAME=	gtkscintilla
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	moleskine
@@ -18,7 +18,6 @@ COMMENT=	A wrapper for the Scintilla editing component
 
 LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 60bb20060f4c..6e9ffc23ee12 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Matt Braithwaite <mab@red-bean.com>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/guile-gtk/Makefile,v 1.2 2006/09/10 00:51:17 mezz Exp $
 
 PORTNAME=	guile-gtk
 PORTVERSION=	0.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,11 +17,11 @@ COMMENT=	Guile binding library for GTK+
 
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gdkpixbuf libglade
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-gtkgl=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 4d59d80ec874..107c6f8a9f33 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk2hs
 PORTVERSION=	0.9.10
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@ MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A GTK2 Binding for Haskell
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		${X11BASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla
+		${LOCALBASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GNOME=	gtk20 libglade2 gtksourceview gconf2
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index 595b2265f1d4..d1ea59d1ccb8 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	inti
 PORTVERSION=	1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	inti
@@ -29,6 +29,10 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|_gtk_window_get_group|gtk_window_get_group|' \
+	    	${WRKSRC}/inti/gtk/window.cc
+
 post-configure:
 	@${TOUCH} ${WRKSRC}/inti-config.h.in
 
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index d4ba8f20cd88..415072b80698 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxfce4gui
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -23,7 +23,6 @@ LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util
 
 USE_GNOME=	gtk20 gnomehack
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index e49c01e399fa..e97eca71fc44 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	lablgtk2
 PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \
 		http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
@@ -43,7 +43,7 @@ PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
-.if (exists(${LOCALBASE}/bin/lablgl) && exists(${X11BASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL)
+.if (exists(${LOCALBASE}/bin/lablgl) && exists(${LOCALBASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL)
 CONFIGURE_ARGS+=	--with-gl
 BUILD_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 RUN_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+=	--without-gl
 PLIST_SUB+=	GL="@comment "
 .endif
 
-.if (exists(${X11BASE}/libdata/pkgconfig/libglade-2.0.pc)) || defined(WITH_GLADE)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc)) || defined(WITH_GLADE)
 CONFIGURE_ARGS+=	--with-glade
 USE_GNOME+=	libglade2
 WITH_GLADE=	yes
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=	--without-glade
 PLIST_SUB+=	GLADE="@comment "
 .endif
 
-.if (exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)) || defined(WITH_GNOMEUI)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc)) || defined(WITH_GNOMEUI)
 CONFIGURE_ARGS+=	--with-gnomeui
 USE_GNOME+=	libgnomeui
 WITH_GNOMEUI=	yes
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=	--without-gnomeui
 PLIST_SUB+=	GNOMEUI="@comment "
 .endif
 
-.if (exists(${X11BASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)) || defined(WITH_GNOMECANVAS)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)) || defined(WITH_GNOMECANVAS)
 CONFIGURE_ARGS+=	--with-gnomecanvas
 USE_GNOME+=	libgnomecanvas
 PLIST_SUB+=	GNOMECANVAS=""
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--without-gnomecanvas
 PLIST_SUB+=	GNOMECANVAS="@comment "
 .endif
 
-.if (exists(${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc)) || defined(WITH_RSVG)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc)) || defined(WITH_RSVG)
 CONFIGURE_ARGS+=	--with-rsvg
 USE_GNOME+=	librsvg2
 WITH_RSVG=	yes
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+=	--without-rsvg
 PLIST_SUB+=	RSVG="@comment "
 .endif
 
-.if (exists(${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)) || defined(WITH_GNOMEPANEL)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)) || defined(WITH_GNOMEPANEL)
 CONFIGURE_ARGS+=	--with-panel
 USE_GNOME+=	gnomepanel
 WITH_PANEL=	yes
@@ -105,7 +105,7 @@ CONFIGURE_ARGS+=	--without-panel
 PLIST_SUB+=	PANEL="@comment "
 .endif
 
-.if (exists(${X11BASE}/libdata/pkgconfig/gtkspell-2.0.pc)) || defined(WITH_GTKSPELL)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/gtkspell-2.0.pc)) || defined(WITH_GTKSPELL)
 LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 
 CONFIGURE_ARGS+=	--with-gtkspell
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 6cce9fce5fc2..089a00f73d94 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	py-gnome
 PORTVERSION=	1.4.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
@@ -26,7 +26,7 @@ USE_PYTHON=	yes
 USE_GNOME=	gtkhtml gnometarget
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
-		--with-gnome-config=${X11BASE}/bin/gnome-config		\
+		--with-gnome-config=${LOCALBASE}/bin/gnome-config		\
 		--with-gtkhtml
 
 EG_SRC_DIR=	${WRKSRC}/pygnome/examples
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index ea685065c142..f3d223429171 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/py-gtkscintilla/Makefile,v 1.1 2006/10/07 15:53:59 ahze Exp $
 
 PORTNAME=	py-gtkscintilla
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	moleskine
diff --git a/x11-toolkits/py-gtkscintilla/files/patch-aa b/x11-toolkits/py-gtkscintilla/files/patch-aa
index 77de76125add..d0a8b14ed2ff 100644
--- a/x11-toolkits/py-gtkscintilla/files/patch-aa
+++ b/x11-toolkits/py-gtkscintilla/files/patch-aa
@@ -19,7 +19,7 @@
 +GTK_LDFLAGS != $(GTK_CONFIG) --libs
 +GTK_CFLAGS != $(GTK_CONFIG) --cflags
 +LDFLAGS = -pthread -shared $(GTK_LDFLAGS) -lgtkscintilla
-+CFLAGS += -D_THREAD_SAFE -fPIC $(GTK_CFLAGS) -I$(PYTHON_INCLUDE) -I${X11BASE}/include/scintilla
++CFLAGS += -D_THREAD_SAFE -fPIC $(GTK_CFLAGS) -I$(PYTHON_INCLUDE) -I${LOCALBASE}/include/scintilla
  
  all: _gtkscintillamodule.so
  
diff --git a/x11-toolkits/qtpixmap/Makefile b/x11-toolkits/qtpixmap/Makefile
index d80b905e3462..9493433992a1 100644
--- a/x11-toolkits/qtpixmap/Makefile
+++ b/x11-toolkits/qtpixmap/Makefile
@@ -3,10 +3,12 @@
 # Whom:					arved
 #
 # $FreeBSD$
+#    $MCom: ports/x11-toolkits/qtpixmap/Makefile,v 1.2 2006/09/30 01:16:13 mezz Exp $
+#
 
 PORTNAME=	qtpixmap
 PORTVERSION=	0.28
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.cpdrummond.freeuk.com/
 DISTNAME=	QtPixmap-${PORTVERSION}
@@ -15,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modifed GTK pixmap engine to obtain Theme information from Qt
 
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/7043-//}
 
diff --git a/x11-toolkits/qtpixmap/pkg-plist b/x11-toolkits/qtpixmap/pkg-plist
index 56d180510b38..383126f8ac63 100644
--- a/x11-toolkits/qtpixmap/pkg-plist
+++ b/x11-toolkits/qtpixmap/pkg-plist
@@ -1,4 +1,4 @@
 %%GTK1%%lib/gtk/themes/engines/libqtpixmap.la
 %%GTK1%%lib/gtk/themes/engines/libqtpixmap.so
-lib/gtk-2.0/2.4.0/engines/libqtpixmap.la
-lib/gtk-2.0/2.4.0/engines/libqtpixmap.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtpixmap.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtpixmap.so
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 23c7b85143e6..54715fef16ae 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/rep-gtk/Makefile,v 1.1 2006/07/18 16:49:16 ahze Exp $
 
 PORTNAME=	rep-gtk
 PORTVERSION=	0.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/rep-gtk/0.15
@@ -20,7 +20,6 @@ LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
 
 PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index b5f55180732a..312bc4990cb7 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/rep-gtk2/Makefile,v 1.8 2006/07/18 16:50:28 ahze Exp $
 
 PORTNAME=	rep-gtk2
 PORTVERSION=	0.18
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +21,7 @@ LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
 
 PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libglade2
 WANT_GNOME=	yes
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index f200738b9b82..fa544879d50c 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
 
 PORTNAME=	scintilla
 PORTVERSION=	1.71
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -19,7 +20,7 @@ COMMENT=	A full-featured free source code editing component for GTK+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 MAKEFILE=	makefile
diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile
index ec635fe73947..cd97ff2f906b 100644
--- a/x11-toolkits/swt31/Makefile
+++ b/x11-toolkits/swt31/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swt
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel java
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200509290840
@@ -51,15 +52,12 @@ DISTNAME=	swt-${PORTVERSION}-gtk-linux-x86
 .endif
 
 .if !defined(WITHOUT_MOZILLA)
+USE_GECKO=	firefox mozilla seamonkey xulrunner
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 PLIST_FILES+=	lib/libswt-mozilla-gtk-%%BUILD%%.so
 MAKE_MOZILLA=	make_mozilla
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla"
-BROWSER=	${WITH_MOZILLA}
-BUILD_DEPENDS+=	${BROWSER}:${PORTSDIR}/www/${BROWSER}
-.else
-BUILD_DEPENDS+=	mozilla:${PORTSDIR}/www/mozilla
-BROWSER=	mozilla
-.endif
+BROWSER=	${GECKO}
+MAKE_ENV+=	GECKO_CONFIG="${GECKO_CONFIG}"
 .else
 BROWSER=
 MAKE_MOZILLA=
@@ -78,7 +76,8 @@ MAKE_ENV+=	BROWSER="${BROWSER}" \
 		MAKE_GNOME=${MAKE_GNOME} \
 		MAKE_MOZILLA=${MAKE_MOZILLA} \
 		MAKE_CAIRO=${MAKE_CAIRO} \
-		MACHINE_ARCH=${MACHINE_ARCH}
+		MACHINE_ARCH=${MACHINE_ARCH} \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 post-extract:
 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
diff --git a/x11-toolkits/swt31/files/patch-build.sh b/x11-toolkits/swt31/files/patch-build.sh
index 26d351c751f9..9a0767cf0f7c 100644
--- a/x11-toolkits/swt31/files/patch-build.sh
+++ b/x11-toolkits/swt31/files/patch-build.sh
@@ -1,6 +1,6 @@
---- build.sh.orig	Wed May  4 19:44:42 2005
-+++ build.sh	Wed Jan  4 08:43:08 2006
-@@ -100,6 +100,34 @@
+--- build.sh.orig	Wed May  4 19:45:04 2005
++++ build.sh	Sat Sep 30 20:54:52 2006
+@@ -100,6 +100,32 @@
  				;;	
  		esac
  		;;
@@ -9,10 +9,8 @@
 +		CXX=%%CXX%%
 +		LD=%%CC%%
 +		XTEST_LIB_PATH=$X11BASE/lib
-+		GECKO_I=${X11BASE}/include/${BROWSER}
-+		GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
-+		GECKO_L=${X11BASE}/lib/${BROWSER}
-+		GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz"
++		GECKO_INCLUDES="`${GECKO_CONFIG} --cflags gtkmozembed` -I${LOCALBASE}/include/nspr"
++		GECKO_LIBS="`${GECKO_CONFIG} --libs gtkmozembed` -L${LOCALBASE}/lib"
 +		case $MODEL in
 +			"amd64")
 +				AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
@@ -35,7 +33,7 @@
  	"SunOS")
  		CC=gcc
  		LD=gcc
-@@ -126,6 +154,6 @@
+@@ -126,6 +152,6 @@
  	;;
  esac
  
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 733f98fbe798..eb114972717c 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.4.2
-PORTREVISION?=	10
+PORTREVISION?=	11
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp b/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp
new file mode 100644
index 000000000000..2de14ab24295
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp
@@ -0,0 +1,44 @@
+--- src/generic/dcpsg.cpp.orig	Fri Sep 29 19:57:20 2006
++++ src/generic/dcpsg.cpp	Fri Sep 29 19:58:00 2006
+@@ -1146,7 +1146,7 @@
+   FILE *file;
+ };
+ 
+-static int paps_move_to( FT_Vector* to,
++static int paps_move_to( const FT_Vector* to,
+ 			 void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1156,7 +1156,7 @@
+   return 0;
+ }
+ 
+-static int paps_line_to( FT_Vector*  to,
++static int paps_line_to( const FT_Vector*  to,
+ 			 void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1166,8 +1166,8 @@
+   return 0;
+ }
+ 
+-static int paps_conic_to( FT_Vector*  control,
+-			  FT_Vector*  to,
++static int paps_conic_to( const FT_Vector*  control,
++			  const FT_Vector*  to,
+ 			  void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1179,9 +1179,9 @@
+   return 0;
+ }
+ 
+-static int paps_cubic_to( FT_Vector*  control1,
+-			  FT_Vector*  control2,
+-			  FT_Vector*  to,
++static int paps_cubic_to( const FT_Vector*  control1,
++			  const FT_Vector*  control2,
++			  const FT_Vector*  to,
+ 			  void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;