--- a/pkg/manifests/x11-library-libxcb.p5m	Fri May 20 21:05:21 2011 -0700
+++ b/pkg/manifests/x11-library-libxcb.p5m	Mon May 23 12:14:08 2011 -0700
@@ -29,6 +29,9 @@
 <transform file path=usr/share/doc/libxcb/tutorial/.*\.html$ -> default facet.devel true>
 <transform file path=usr/share/doc/libxcb/.*\.css$ -> default facet.devel true>
 <transform file path=usr/share/doc/libxcb/tutorial/.*\.css$ -> default facet.devel true>
+# Autogenerate *.pyc manifest entries for each *.py file
+<transform file path=.*\.py$ -> emit file path=%(path)c>
+
 
 set name=pkg.fmri value=pkg:/x11/library/libxcb@__version:libxcb__
 set name=pkg.description \
@@ -40,9 +43,9 @@
 dir path=usr/lib
 dir path=usr/lib/pkgconfig
 dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/xcbgen
+dir path=usr/lib/python$(PYTHON_PATH_VERSION)
+dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages
+dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen
 dir path=usr/lib/$(ARCH64)/pkgconfig
 dir path=usr/share
 dir path=usr/share/doc
@@ -256,24 +259,12 @@
 file path=usr/share/xcb/xv.xml
 file path=usr/share/xcb/xcb.xsd
 #
-file path=usr/lib/python2.6/vendor-packages/xcbgen/error.py
-file path=usr/lib/python2.6/vendor-packages/xcbgen/error.pyc
-file path=usr/lib/python2.6/vendor-packages/xcbgen/error.pyo
-file path=usr/lib/python2.6/vendor-packages/xcbgen/expr.py
-file path=usr/lib/python2.6/vendor-packages/xcbgen/expr.pyc
-file path=usr/lib/python2.6/vendor-packages/xcbgen/expr.pyo
-file path=usr/lib/python2.6/vendor-packages/xcbgen/__init__.py
-file path=usr/lib/python2.6/vendor-packages/xcbgen/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/xcbgen/__init__.pyo
-file path=usr/lib/python2.6/vendor-packages/xcbgen/matcher.py
-file path=usr/lib/python2.6/vendor-packages/xcbgen/matcher.pyc
-file path=usr/lib/python2.6/vendor-packages/xcbgen/matcher.pyo
-file path=usr/lib/python2.6/vendor-packages/xcbgen/state.py
-file path=usr/lib/python2.6/vendor-packages/xcbgen/state.pyc
-file path=usr/lib/python2.6/vendor-packages/xcbgen/state.pyo
-file path=usr/lib/python2.6/vendor-packages/xcbgen/xtypes.py
-file path=usr/lib/python2.6/vendor-packages/xcbgen/xtypes.pyc
-file path=usr/lib/python2.6/vendor-packages/xcbgen/xtypes.pyo
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/__init__.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/error.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/expr.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/matcher.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/state.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/xtypes.py
 # 
 depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
 # pkg-config dependency from xcb.pc