Actually, use the PLIST_VARS framework as opposed to adding a new PLIST file

3 files changed, 53 insertions, 64 deletions

diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 902d6db2ec1..7d2e40be925 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2009/01/10 23:13:44 adrianp Exp $
+# $NetBSD: Makefile,v 1.58 2009/01/11 00:13:44 adrianp Exp $
 #
 
 DISTNAME=	pygtk-2.13.0
@@ -22,7 +22,7 @@ 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
+PLIST_VARS+=	py25
 
 PYTHON_VERSIONS_ACCEPTED=	25 24
 
@@ -32,12 +32,9 @@ BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.15.3
 .include "../../lang/python/application.mk"
 
 .if ${PYTHON_VERSION_DEFAULT} == "25"
-PLIST_SRC+=	${PKGDIR}/PLIST.python25
+PLIST.py25=	yes
 .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 1123e788b79..a592702b44d 100644
--- a/x11/py-gtk2/PLIST
+++ b/x11/py-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/01/10 23:13:44 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/01/11 00:13:44 adrianp Exp $
 bin/pygtk-codegen-2.0
 bin/pygtk-demo
 lib/pkgconfig/pygtk-2.0.pc
@@ -568,6 +568,55 @@ 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}
 @unexec ${RMDIR} %D/share/pygtk 2>/dev/null || ${TRUE}
diff --git a/x11/py-gtk2/PLIST.python25 b/x11/py-gtk2/PLIST.python25
deleted file mode 100644
index 9ce89f21f09..00000000000
--- a/x11/py-gtk2/PLIST.python25
+++ /dev/null
@@ -1,57 +0,0 @@
-@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}