4 files changed, 41 insertions, 8 deletions

diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 2979db884d65..098861892360 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					marc@informatik.uni-bremen.de
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.38 2006/04/13 07:52:43 bland Exp $
+#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.49 2006/10/03 20:52:30 ahze Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.8.6
+PORTVERSION=	2.10.2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,10 +19,10 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of Python bindings for GTK
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
+		${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject
 RUN_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
+		${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -32,6 +32,7 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-lintl"
+CONFIGURE_ARGS=	--disable-docs
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/py-gtk
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 28d9eb4c7da4..bad2a99afb8d 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.8.6.tar.bz2) = c69c2e5e86a8f21a5773df20e265fc3a
-SHA256 (gnome2/pygtk-2.8.6.tar.bz2) = dee1ec46a43bf624f1ff796903bd2d49e65c1cc8396385f46bf1489817bd6e60
-SIZE (gnome2/pygtk-2.8.6.tar.bz2) = 756885
+MD5 (gnome2/pygtk-2.10.2.tar.bz2) = 743ee3d0cbd9e63a50cdf382c28557da
+SHA256 (gnome2/pygtk-2.10.2.tar.bz2) = 5c77ddba034ea810db357a9ac496e79dcbf5d6ce173860174f29af9836e3b5e7
+SIZE (gnome2/pygtk-2.10.2.tar.bz2) = 1977651
diff --git a/x11-toolkits/py-gtk2/files/patch-Makefile.in b/x11-toolkits/py-gtk2/files/patch-Makefile.in
new file mode 100644
index 000000000000..b9cedaf23921
--- /dev/null
+++ b/x11-toolkits/py-gtk2/files/patch-Makefile.in
@@ -0,0 +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 = \
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index ec1c7df6c566..2c6e6c9735e4 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -64,6 +64,9 @@ lib/pygtk/2.0/demos/panes.pyo
 lib/pygtk/2.0/demos/pixbufs.py
 lib/pygtk/2.0/demos/pixbufs.pyc
 lib/pygtk/2.0/demos/pixbufs.pyo
+lib/pygtk/2.0/demos/print_editor.py
+lib/pygtk/2.0/demos/print_editor.pyc
+lib/pygtk/2.0/demos/print_editor.pyo
 lib/pygtk/2.0/demos/sizegroup.py
 lib/pygtk/2.0/demos/sizegroup.pyc
 lib/pygtk/2.0/demos/sizegroup.pyo
@@ -92,14 +95,22 @@ lib/pygtk/2.0/pygtk-demo.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.pyo
 %%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/deprecation.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pango.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pango.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.la
@@ -117,12 +128,14 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%EXAMPLESDIR%%/glade/glade-demo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/glade/test.glade
 %%PORTDOCS%%%%EXAMPLESDIR%%/glade/test2.glade
+%%PORTDOCS%%%%EXAMPLESDIR%%/gobject/editable-interface.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/properties.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/signal.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/bin.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/filechooser.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/scrollable.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/sizegroup.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/testprint.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/uimanager.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/widget.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/ide/README
@@ -173,6 +186,7 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/menu.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/panes.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/pixbufs.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/print_editor.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/sizegroup.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/stock_browser.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/textview.py
@@ -230,11 +244,18 @@ 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-base-types.defs
+share/pygtk/2.0/defs/gdk-base.defs
 share/pygtk/2.0/defs/gdk-types.defs
 share/pygtk/2.0/defs/gdk.defs
-share/pygtk/2.0/defs/gtk-extrafuncs.defs
+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-base-types.defs
+share/pygtk/2.0/defs/gtk-base.defs
 share/pygtk/2.0/defs/gtk-types.defs
 share/pygtk/2.0/defs/gtk.defs
+share/pygtk/2.0/defs/gtkunixprint.defs
 share/pygtk/2.0/defs/libglade.defs
 share/pygtk/2.0/defs/pango-types.defs
 share/pygtk/2.0/defs/pango.defs