[pkgsrc/trunk]: pkgsrc/x11/py-gtk2 Fix PLIST differences due to the version o...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7377481db3e3
branches:  trunk
changeset: 552852:7377481db3e3
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Jan 10 23:13:44 2009 +0000

description:
Fix PLIST differences due to the version of python that's installed
Breakage pointed out by wiz@

diffstat:

 x11/py-gtk2/Makefile       |  14 ++++++++--
 x11/py-gtk2/PLIST          |   7 +++--
 x11/py-gtk2/PLIST.python25 |  57 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 6 deletions(-)

diffs (125 lines):

diff -r c9c361ec33c1 -r 7377481db3e3 x11/py-gtk2/Makefile
--- a/x11/py-gtk2/Makefile      Sat Jan 10 22:22:22 2009 +0000
+++ b/x11/py-gtk2/Makefile      Sat Jan 10 23:13:44 2009 +0000
@@ -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 @@
 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 -r c9c361ec33c1 -r 7377481db3e3 x11/py-gtk2/PLIST
--- a/x11/py-gtk2/PLIST Sat Jan 10 22:22:22 2009 +0000
+++ b/x11/py-gtk2/PLIST Sat Jan 10 23:13:44 2009 +0000
@@ -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.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 -r c9c361ec33c1 -r 7377481db3e3 x11/py-gtk2/PLIST.python25
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-gtk2/PLIST.python25        Sat Jan 10 23:13:44 2009 +0000
@@ -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}