3 files changed, 9 insertions, 16 deletions

diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 198ece31922e..1bfae42d0113 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/pygtk/2.0
+MASTER_SITE_SUBDIR=	sources/pygtk/2.2
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtk-${PORTVERSION}
 DIST_SUBDIR=	gnome2
@@ -17,7 +16,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of Python bindings for GTK
 
-LIB_DEPENDS=	gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2
 RUN_DEPENDS=	${PYNUMERIC}
 
 USE_BZIP2=	yes
@@ -35,7 +33,7 @@ CONFLICTS=	py*-gtk-0*
 # Use the same way as the Python port to determine if we want
 # threading support.
 #
-LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
+LIBC_R!=	/sbin/ldconfig -r | grep "c_r|pthread" || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-thread
 CFLAGS+=		${PTHREAD_CFLAGS}
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index b1ac006c776e..ea197c152f34 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/pygtk-2.0.0.tar.bz2) = 14db9cfffe31f6df0351bd5fec69f606
+MD5 (gnome2/pygtk-2.2.0.tar.bz2) = 992122f8a61c266aeb1b7b35be9c4be1
+SIZE (gnome2/pygtk-2.2.0.tar.bz2) = 553761
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index c4feb8c6b09a..77bf151ad6fe 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -2,6 +2,9 @@ bin/pygtk-codegen-2.0
 include/pygtk-2.0/pygobject.h
 include/pygtk-2.0/pygtk/pygtk.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/atk.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyc
@@ -10,10 +13,6 @@ include/pygtk-2.0/pygtk/pygtk.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/dsextras.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/dsextras.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/dsextras.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gl.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyc
@@ -27,10 +26,6 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/doc/py-gtk/MAPPING
 %%PORTDOCS%%share/doc/py-gtk/THREADS
 %%PORTDOCS%%share/examples/py-gtk/atk/atk-demo.py
-%%PORTDOCS%%share/examples/py-gtk/gl/README
-%%PORTDOCS%%share/examples/py-gtk/gl/cone.py
-%%PORTDOCS%%share/examples/py-gtk/gl/dots.py
-%%PORTDOCS%%share/examples/py-gtk/gl/gears.py
 %%PORTDOCS%%share/examples/py-gtk/glade/README
 %%PORTDOCS%%share/examples/py-gtk/glade/glade-demo.py
 %%PORTDOCS%%share/examples/py-gtk/glade/test.glade
@@ -79,6 +74,7 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/stock_browser.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/toolbar.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/treemodel.py
+%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/gtk-logo-rgb.gif
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/pygtk-demo.py
 %%PORTDOCS%%share/examples/py-gtk/simple/README
 %%PORTDOCS%%share/examples/py-gtk/simple/dnd.py
@@ -130,7 +126,6 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/pygtk/2.0/defs/gtk-extrafuncs.defs
 %%PORTDOCS%%share/pygtk/2.0/defs/gtk-types.defs
 %%PORTDOCS%%share/pygtk/2.0/defs/gtk.defs
-%%PORTDOCS%%share/pygtk/2.0/defs/gtkgl.defs
 %%PORTDOCS%%share/pygtk/2.0/defs/libglade.defs
 %%PORTDOCS%%share/pygtk/2.0/defs/pango-types.defs
 %%PORTDOCS%%share/pygtk/2.0/defs/pango.defs
@@ -146,7 +141,6 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%@dirrm share/examples/py-gtk/ide
 %%PORTDOCS%%@dirrm share/examples/py-gtk/gobject
 %%PORTDOCS%%@dirrm share/examples/py-gtk/glade
-%%PORTDOCS%%@dirrm share/examples/py-gtk/gl
 %%PORTDOCS%%@dirrm share/examples/py-gtk/atk
 %%PORTDOCS%%@dirrm share/examples/py-gtk
 %%PORTDOCS%%@dirrm share/doc/py-gtk