3 files changed, 99 insertions, 21 deletions

diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index bc567da524d7..6e46e0f74b09 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.4.1
+PORTVERSION=	2.6.0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/pygtk/2.4
+MASTER_SITE_SUBDIR=	sources/pygtk/2.6
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtk-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index b93164aedbe2..6dbb891d4e82 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/pygtk-2.4.1.tar.bz2) = a926ffbc8cb3e0b7ddbfdbccd879a28d
-SIZE (gnome2/pygtk-2.4.1.tar.bz2) = 714469
+MD5 (gnome2/pygtk-2.6.0.tar.bz2) = 45e870beec4dd384d4c6397df7fbaecd
+SIZE (gnome2/pygtk-2.6.0.tar.bz2) = 729250
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 1a48c0375df5..7d139723aff4 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -1,6 +1,91 @@
 bin/pygtk-codegen-2.0
+bin/pygtk-demo
 include/pygtk-2.0/pygobject.h
 include/pygtk-2.0/pygtk/pygtk.h
+lib/pygtk/2.0/demos/__init__.py
+lib/pygtk/2.0/demos/__init__.pyc
+lib/pygtk/2.0/demos/__init__.pyo
+lib/pygtk/2.0/demos/appwindow.py
+lib/pygtk/2.0/demos/appwindow.pyc
+lib/pygtk/2.0/demos/appwindow.pyo
+lib/pygtk/2.0/demos/buttonbox.py
+lib/pygtk/2.0/demos/buttonbox.pyc
+lib/pygtk/2.0/demos/buttonbox.pyo
+lib/pygtk/2.0/demos/changedisplay.py
+lib/pygtk/2.0/demos/changedisplay.pyc
+lib/pygtk/2.0/demos/changedisplay.pyo
+lib/pygtk/2.0/demos/colorsel.py
+lib/pygtk/2.0/demos/colorsel.pyc
+lib/pygtk/2.0/demos/colorsel.pyo
+lib/pygtk/2.0/demos/dialogs.py
+lib/pygtk/2.0/demos/dialogs.pyc
+lib/pygtk/2.0/demos/dialogs.pyo
+lib/pygtk/2.0/demos/dnd.py
+lib/pygtk/2.0/demos/dnd.pyc
+lib/pygtk/2.0/demos/dnd.pyo
+lib/pygtk/2.0/demos/dndpixmap.py
+lib/pygtk/2.0/demos/dndpixmap.pyc
+lib/pygtk/2.0/demos/dndpixmap.pyo
+lib/pygtk/2.0/demos/editable_cells.py
+lib/pygtk/2.0/demos/editable_cells.pyc
+lib/pygtk/2.0/demos/editable_cells.pyo
+lib/pygtk/2.0/demos/entry_completion.py
+lib/pygtk/2.0/demos/entry_completion.pyc
+lib/pygtk/2.0/demos/entry_completion.pyo
+lib/pygtk/2.0/demos/expander.py
+lib/pygtk/2.0/demos/expander.pyc
+lib/pygtk/2.0/demos/expander.pyo
+lib/pygtk/2.0/demos/hypertext.py
+lib/pygtk/2.0/demos/hypertext.pyc
+lib/pygtk/2.0/demos/hypertext.pyo
+lib/pygtk/2.0/demos/images.py
+lib/pygtk/2.0/demos/images.pyc
+lib/pygtk/2.0/demos/images.pyo
+lib/pygtk/2.0/demos/images/alphatest.png
+lib/pygtk/2.0/demos/images/apple-red.png
+lib/pygtk/2.0/demos/images/background.jpg
+lib/pygtk/2.0/demos/images/floppybuddy.gif
+lib/pygtk/2.0/demos/images/gnome-applets.png
+lib/pygtk/2.0/demos/images/gnome-calendar.png
+lib/pygtk/2.0/demos/images/gnome-foot.png
+lib/pygtk/2.0/demos/images/gnome-gimp.png
+lib/pygtk/2.0/demos/images/gnome-gmush.png
+lib/pygtk/2.0/demos/images/gnome-gsame.png
+lib/pygtk/2.0/demos/images/gnu-keys.png
+lib/pygtk/2.0/demos/images/gtk-logo-rgb.gif
+lib/pygtk/2.0/demos/list_store.py
+lib/pygtk/2.0/demos/list_store.pyc
+lib/pygtk/2.0/demos/list_store.pyo
+lib/pygtk/2.0/demos/menu.py
+lib/pygtk/2.0/demos/menu.pyc
+lib/pygtk/2.0/demos/menu.pyo
+lib/pygtk/2.0/demos/panes.py
+lib/pygtk/2.0/demos/panes.pyc
+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/sizegroup.py
+lib/pygtk/2.0/demos/sizegroup.pyc
+lib/pygtk/2.0/demos/sizegroup.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/textview.py
+lib/pygtk/2.0/demos/textview.pyc
+lib/pygtk/2.0/demos/textview.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
+lib/pygtk/2.0/demos/treemodel.py
+lib/pygtk/2.0/demos/treemodel.pyc
+lib/pygtk/2.0/demos/treemodel.pyo
+lib/pygtk/2.0/demos/ui_manager.py
+lib/pygtk/2.0/demos/ui_manager.pyc
+lib/pygtk/2.0/demos/ui_manager.pyo
+lib/pygtk/2.0/pygtk-demo.py
+lib/pygtk/2.0/pygtk-demo.pyc
+lib/pygtk/2.0/pygtk-demo.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/atk.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
@@ -22,6 +107,7 @@ include/pygtk-2.0/pygtk/pygtk.h
 %%PYTHON_SITELIBDIR%%/pygtk.py
 %%PYTHON_SITELIBDIR%%/pygtk.pyc
 %%PYTHON_SITELIBDIR%%/pygtk.pyo
+libdata/pkgconfig/pygobject-2.0.pc
 libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/doc/py-gtk/MAPPING
 %%PORTDOCS%%share/doc/py-gtk/THREADS
@@ -69,27 +155,18 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/examples/py-gtk/neil/question.xpm
 %%PORTDOCS%%share/examples/py-gtk/pango/utf8-demo.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/__init__.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/__init__.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/appwindow.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/appwindow.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/buttonbox.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/buttonbox.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/changedisplay.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/colorsel.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/colorsel.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dialogs.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dialogs.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dnd.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dnd.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dndpixmap.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/dndpixmap.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/editable_cells.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/editable_cells.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/entry_completion.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/expander.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/hypertext.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images/alphatest.png
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images/apple-red.png
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images/background.jpg
@@ -102,24 +179,18 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images/gnome-gsame.png
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images/gnu-keys.png
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/images/gtk-logo-rgb.gif
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/itemfactory.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/list_store.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/list_store.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/menu.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/menu.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/panes.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/panes.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/pixbufs.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/sizegroup.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/sizegroup.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/stock_browser.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/stock_browser.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/textview.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/toolbar.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/tree_store.py
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/treemodel.py
-%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/treemodel.pyc
 %%PORTDOCS%%share/examples/py-gtk/pygtk-demo/demos/ui_manager.py
+%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/pygtk-demo
+%%PORTDOCS%%share/examples/py-gtk/pygtk-demo/pygtk-demo.in
 %%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
@@ -161,6 +232,9 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%share/pygtk/2.0/codegen/override.py
 %%PORTDOCS%%share/pygtk/2.0/codegen/override.pyc
 %%PORTDOCS%%share/pygtk/2.0/codegen/override.pyo
+%%PORTDOCS%%share/pygtk/2.0/codegen/reversewrapper.py
+%%PORTDOCS%%share/pygtk/2.0/codegen/reversewrapper.pyc
+%%PORTDOCS%%share/pygtk/2.0/codegen/reversewrapper.pyo
 %%PORTDOCS%%share/pygtk/2.0/codegen/scmexpr.py
 %%PORTDOCS%%share/pygtk/2.0/codegen/scmexpr.pyc
 %%PORTDOCS%%share/pygtk/2.0/codegen/scmexpr.pyo
@@ -193,5 +267,9 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%@dirrm share/doc/py-gtk
 @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