8 files changed, 10 insertions, 50 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 058ca497c8b7..b476e968af4a 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTVERSION=	2.0.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
@@ -38,7 +37,8 @@ USE_GNOMENG=	yes
 USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ARGS=	--enable-static \
+		--with-xinput=xfree
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -47,10 +47,6 @@ PLIST_SUB=	GTK_VERSION="2.0.0"
 
 MAN1=		gdk-pixbuf-csource.1
 
-.if defined(WITH_XINPUT)
-CONFIGURE_ARGS+=	--with-xinput=xfree
-.endif
-
 post-extract:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 31204d5fdc85..e289dc9500c9 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.8.tar.bz2) = 3f2fdc357494b9733175d6a7bbf5d786
+MD5 (gnome2/gtk+-2.0.9.tar.bz2) = 9827bca97fc09ff62b75579614dcfeb2
diff --git a/x11-toolkits/gtk20/files/patch-gdk_x11_gdkwindow-x11.c b/x11-toolkits/gtk20/files/patch-gdk_x11_gdkwindow-x11.c
deleted file mode 100644
index 404e798d5bce..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk_x11_gdkwindow-x11.c
+++ /dev/null
@@ -1,17 +0,0 @@
-This is a temporary patch.  It is already in GNOME CVS, and will be merged in
-the next gtk+-2.0.x release.  More details on what this patch fixes can be
-found at:
-
-http://bugzilla.gnome.org/show_bug.cgi?id=94806
-
---- gdk/x11/gdkwindow-x11.c.orig	Sat Nov 16 19:25:15 2002
-+++ gdk/x11/gdkwindow-x11.c	Sat Nov 16 19:26:16 2002
-@@ -202,6 +202,8 @@
-                             &window_attributes);
-       drawable_impl->colormap =
-         gdk_colormap_lookup (window_attributes.colormap);
-+      if (drawable_impl->colormap)
-+	g_object_ref (drawable_impl->colormap);
-     }
-   
-   return drawable_impl->colormap;
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 3398f38e82b3..dcec2bf62431 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -222,6 +222,7 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
+share/locale/am/LC_MESSAGES/gtk20.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/be/LC_MESSAGES/gtk20.mo
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 058ca497c8b7..b476e968af4a 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTVERSION=	2.0.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
@@ -38,7 +37,8 @@ USE_GNOMENG=	yes
 USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ARGS=	--enable-static \
+		--with-xinput=xfree
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -47,10 +47,6 @@ PLIST_SUB=	GTK_VERSION="2.0.0"
 
 MAN1=		gdk-pixbuf-csource.1
 
-.if defined(WITH_XINPUT)
-CONFIGURE_ARGS+=	--with-xinput=xfree
-.endif
-
 post-extract:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 31204d5fdc85..e289dc9500c9 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.8.tar.bz2) = 3f2fdc357494b9733175d6a7bbf5d786
+MD5 (gnome2/gtk+-2.0.9.tar.bz2) = 9827bca97fc09ff62b75579614dcfeb2
diff --git a/x11-toolkits/gtk30/files/patch-gdk_x11_gdkwindow-x11.c b/x11-toolkits/gtk30/files/patch-gdk_x11_gdkwindow-x11.c
deleted file mode 100644
index 404e798d5bce..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk_x11_gdkwindow-x11.c
+++ /dev/null
@@ -1,17 +0,0 @@
-This is a temporary patch.  It is already in GNOME CVS, and will be merged in
-the next gtk+-2.0.x release.  More details on what this patch fixes can be
-found at:
-
-http://bugzilla.gnome.org/show_bug.cgi?id=94806
-
---- gdk/x11/gdkwindow-x11.c.orig	Sat Nov 16 19:25:15 2002
-+++ gdk/x11/gdkwindow-x11.c	Sat Nov 16 19:26:16 2002
-@@ -202,6 +202,8 @@
-                             &window_attributes);
-       drawable_impl->colormap =
-         gdk_colormap_lookup (window_attributes.colormap);
-+      if (drawable_impl->colormap)
-+	g_object_ref (drawable_impl->colormap);
-     }
-   
-   return drawable_impl->colormap;
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 3398f38e82b3..dcec2bf62431 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -222,6 +222,7 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
+share/locale/am/LC_MESSAGES/gtk20.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/be/LC_MESSAGES/gtk20.mo