Back out what happened in the last days -- the Python extension is

installed for Python-2.4 as for Python-2.5. If not, there is a
different problem.

2 files changed, 47 insertions, 61 deletions

diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 7d2e40be925..2b602804d2f 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2009/01/11 00:13:44 adrianp Exp $
+# $NetBSD: Makefile,v 1.59 2009/01/14 13:05:31 drochner Exp $
 #
 
 DISTNAME=	pygtk-2.13.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.13/}
 EXTRACT_SUFX=	.tar.bz2
@@ -31,10 +31,6 @@ BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.15.3
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 
-.if ${PYTHON_VERSION_DEFAULT} == "25"
-PLIST.py25=	yes
-.endif
-
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
diff --git a/x11/py-gtk2/PLIST b/x11/py-gtk2/PLIST
index a592702b44d..9daf171b835 100644
--- a/x11/py-gtk2/PLIST
+++ b/x11/py-gtk2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.19 2009/01/11 00:13:44 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/01/14 13:05:31 drochner Exp $
 bin/pygtk-codegen-2.0
 bin/pygtk-demo
+include/pygtk-2.0/pygtk/pygtk.h
 lib/pkgconfig/pygtk-2.0.pc
 lib/pygtk/2.0/demos/__init__.py
 lib/pygtk/2.0/demos/__init__.pyc
@@ -99,6 +100,24 @@ 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/gtk/__init__.py
+${PYSITELIB}/gtk-2.0/gtk/__init__.pyc
+${PYSITELIB}/gtk-2.0/gtk/__init__.pyo
+${PYSITELIB}/gtk-2.0/gtk/_gtk.la
+${PYSITELIB}/gtk-2.0/gtk/_lazyutils.py
+${PYSITELIB}/gtk-2.0/gtk/_lazyutils.pyc
+${PYSITELIB}/gtk-2.0/gtk/_lazyutils.pyo
+${PYSITELIB}/gtk-2.0/gtk/compat.py
+${PYSITELIB}/gtk-2.0/gtk/compat.pyc
+${PYSITELIB}/gtk-2.0/gtk/compat.pyo
+${PYSITELIB}/gtk-2.0/gtk/deprecation.py
+${PYSITELIB}/gtk-2.0/gtk/deprecation.pyc
+${PYSITELIB}/gtk-2.0/gtk/deprecation.pyo
+${PYSITELIB}/gtk-2.0/gtk/glade.la
+${PYSITELIB}/gtk-2.0/gtk/keysyms.py
+${PYSITELIB}/gtk-2.0/gtk/keysyms.pyc
+${PYSITELIB}/gtk-2.0/gtk/keysyms.pyo
+${PYSITELIB}/gtk-2.0/gtkunixprint.la
 ${PYSITELIB}/gtk-2.0/pango.la
 ${PYSITELIB}/gtk-2.0/pangocairo.la
 share/gtk-doc/html/pygtk/atk-class-reference.html
@@ -564,70 +583,41 @@ share/gtk-doc/html/pygtk/unixprint-constants.html
 share/gtk-doc/html/pygtk/unixprint-functions.html
 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-2.12.defs
+share/pygtk/2.0/defs/gdk-2.14.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-2.10-types.defs
+share/pygtk/2.0/defs/gtk-2.10.defs
+share/pygtk/2.0/defs/gtk-2.12-types.defs
+share/pygtk/2.0/defs/gtk-2.12.defs
+share/pygtk/2.0/defs/gtk-2.14-types.defs
+share/pygtk/2.0/defs/gtk-2.14.defs
+share/pygtk/2.0/defs/gtk-base-types.defs
+share/pygtk/2.0/defs/gtk-base.defs
+share/pygtk/2.0/defs/gtk-extrafuncs.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
 share/pygtk/2.0/defs/pangocairo.defs
 share/pygtk/2.0/defs/pangocairo.override
-${PLIST.py25}include/pygtk-2.0/pygtk/pygtk.h
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/__init__.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/__init__.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/__init__.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/_gtk.la
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/_lazyutils.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/_lazyutils.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/_lazyutils.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/compat.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/compat.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/compat.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/deprecation.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/deprecation.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/deprecation.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/glade.la
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/keysyms.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/keysyms.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/keysyms.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/compat.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/compat.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/compat.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/deprecation.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/deprecation.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/deprecation.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/glade.la
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/keysyms.py
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/keysyms.pyc
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtk/keysyms.pyo
-${PLIST.py25}${PYSITELIB}/gtk-2.0/gtkunixprint.la
-${PLIST.py25}share/pygtk/2.0/defs/gdk-2.10.defs
-${PLIST.py25}share/pygtk/2.0/defs/gdk-2.12.defs
-${PLIST.py25}share/pygtk/2.0/defs/gdk-2.14.defs
-${PLIST.py25}share/pygtk/2.0/defs/gdk-base-types.defs
-${PLIST.py25}share/pygtk/2.0/defs/gdk-base.defs
-${PLIST.py25}share/pygtk/2.0/defs/gdk-types.defs
-${PLIST.py25}share/pygtk/2.0/defs/gdk.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-2.10-types.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-2.10.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-2.12-types.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-2.12.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-2.14-types.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-2.14.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-base-types.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-base.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-extrafuncs.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk-types.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtk.defs
-${PLIST.py25}share/pygtk/2.0/defs/gtkunixprint.defs
-${PLIST.py25}share/pygtk/2.0/defs/libglade.defs
-@unexec ${RMDIR} %D/share/pygtk/2.0/defs 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/pygtk/2.0 2>/dev/null || ${TRUE}
+@dirrm share/pygtk/2.0/defs
+@dirrm share/pygtk/2.0
 @unexec ${RMDIR} %D/share/pygtk 2>/dev/null || ${TRUE}
 @dirrm share/gtk-doc/html/pygtk/icons
 @dirrm share/gtk-doc/html/pygtk/cursors
 @dirrm share/gtk-doc/html/pygtk
-@unexec ${RMDIR} %D/${PYSITELIB}/gtk-2.0/gtk 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/${PYSITELIB}/gtk-2.0 2>/dev/null || ${TRUE}
+@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
-@unexec ${RMDIR} %D/include/pygtk-2.0/pygtk 2>/dev/null || ${TRUE}
+@dirrm include/pygtk-2.0/pygtk
 @unexec ${RMDIR} %D/include/pygtk-2.0 2>/dev/null || ${TRUE}