Fix PLIST differences due to the version of python that's installed

Breakage pointed out by wiz@

3 files changed, 72 insertions, 6 deletions

diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 17688fef067..902d6db2ec1 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2009/01/10 20:17:31 adrianp Exp $
+# $NetBSD: Makefile,v 1.57 2009/01/10 23:13:44 adrianp Exp $
 #
 
 DISTNAME=	pygtk-2.13.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.13/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,14 +22,22 @@ PKGCONFIG_OVERRIDE+=	pygtk-2.0.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 USE_TOOLS+=	gmake pkg-config
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
-PYTHON_VERSIONS_ACCEPTED=	24 25
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 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_SRC+=	${PKGDIR}/PLIST.python25
+.endif
+
+post-build:
+	${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
+
 .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 3ed90dcc5f9..1123e788b79 100644
--- a/x11/py-gtk2/PLIST
+++ b/x11/py-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/01/10 20:17:31 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/01/10 23:13:44 adrianp Exp $
 bin/pygtk-codegen-2.0
 bin/pygtk-demo
 lib/pkgconfig/pygtk-2.0.pc
@@ -568,12 +568,13 @@ 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
-@dirrm share/pygtk/2.0/defs
-@dirrm share/pygtk/2.0
+@unexec ${RMDIR} %D/share/pygtk/2.0/defs 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/pygtk/2.0 2>/dev/null || ${TRUE}
 @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 lib/pygtk/2.0/demos/images
 @dirrm lib/pygtk/2.0/demos
diff --git a/x11/py-gtk2/PLIST.python25 b/x11/py-gtk2/PLIST.python25
new file mode 100644
index 00000000000..9ce89f21f09
--- /dev/null
+++ b/x11/py-gtk2/PLIST.python25
@@ -0,0 +1,57 @@
+@comment $NetBSD: PLIST.python25,v 1.1 2009/01/10 23:13:44 adrianp Exp $
+include/pygtk-2.0/pygtk/pygtk.h
+${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/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
+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
+@unexec ${RMDIR} %D/include/pygtk-2.0/pygtk 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/include/pygtk-2.0 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${PYSITELIB}/gtk-2.0/gtk 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${PYSITELIB}/gtk-2.0 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/pygtk/2.0/defs 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/pygtk/2.0 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/pygtk 2>/dev/null || ${TRUE}