update to 2.6.1

that's a major update, too much to list individual changes

3 files changed, 104 insertions, 10 deletions

diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 8a16369e1c9..13dcaf1d79d 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:12 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/04/26 20:28:24 drochner Exp $
 #
 
-DISTNAME=	pygtk-2.4.1
+DISTNAME=	pygtk-2.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
 CATEGORIES=	x11 python
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
@@ -15,9 +15,10 @@ CONFLICTS=	${PYPKGPREFIX}-gtk<0.6.10
 
 PY_PATCHPLIST=	YES
 USE_LIBTOOL=	YES
-PKGCONFIG_OVERRIDE+=	pygtk-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	pygtk-2.0.pc.in pygobject-2.0.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
+USE_GNU_TOOLS+=	make
 
 PYTHON_VERSIONS_ACCEPTED=	24 23
 
diff --git a/x11/py-gtk2/PLIST b/x11/py-gtk2/PLIST
index 173bb66c6ae..74a97318970 100644
--- a/x11/py-gtk2/PLIST
+++ b/x11/py-gtk2/PLIST
@@ -1,8 +1,94 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:10:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/04/26 20:28:24 drochner Exp $
 bin/pygtk-codegen-2.0
+bin/pygtk-demo
 include/pygtk-2.0/pygobject.h
 include/pygtk-2.0/pygtk/pygtk.h
+lib/pkgconfig/pygobject-2.0.pc
 lib/pkgconfig/pygtk-2.0.pc
+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
 ${PYSITELIB}/gtk-2.0/atk.la
 ${PYSITELIB}/gtk-2.0/dsextras.py
 ${PYSITELIB}/gtk-2.0/dsextras.pyc
@@ -57,6 +143,9 @@ share/pygtk/2.0/codegen/mkskel.pyo
 share/pygtk/2.0/codegen/override.py
 share/pygtk/2.0/codegen/override.pyc
 share/pygtk/2.0/codegen/override.pyo
+share/pygtk/2.0/codegen/reversewrapper.py
+share/pygtk/2.0/codegen/reversewrapper.pyc
+share/pygtk/2.0/codegen/reversewrapper.pyo
 share/pygtk/2.0/codegen/scmexpr.py
 share/pygtk/2.0/codegen/scmexpr.pyc
 share/pygtk/2.0/codegen/scmexpr.pyo
@@ -73,8 +162,12 @@ share/pygtk/2.0/defs/pango.defs
 @dirrm share/pygtk/2.0/defs
 @dirrm share/pygtk/2.0/codegen
 @dirrm share/pygtk/2.0
-@unexec ${RMDIR} %D/share/pygtk 2>/dev/null || ${TRUE}
+@dirrm share/pygtk
 @dirrm ${PYSITELIB}/gtk-2.0/gtk
 @dirrm ${PYSITELIB}/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
diff --git a/x11/py-gtk2/distinfo b/x11/py-gtk2/distinfo
index 033ae15e719..a95c57c831a 100644
--- a/x11/py-gtk2/distinfo
+++ b/x11/py-gtk2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 17:36:18 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/04/26 20:28:24 drochner Exp $
 
-SHA1 (pygtk-2.4.1.tar.bz2) = c0a24fd4a67e0fd58a7e5ceb00f5e8c0231cdd88
-RMD160 (pygtk-2.4.1.tar.bz2) = 5c381aec4342c4a1ddb1f0282c3a59e4b6610c6f
-Size (pygtk-2.4.1.tar.bz2) = 714469 bytes
+SHA1 (pygtk-2.6.1.tar.bz2) = a34cedeaeb9e794c9d3a2ce2b35387382b985a3a
+RMD160 (pygtk-2.6.1.tar.bz2) = 75c88308bda1c9c245b8e1d618e61b8b62d84ddb
+Size (pygtk-2.6.1.tar.bz2) = 729460 bytes