--- a/components/python/tox/tox-PYVER.p5m	Thu Apr 16 01:36:32 2015 -0700
+++ b/components/python/tox/tox-PYVER.p5m	Mon Apr 20 12:35:51 2015 -0700
@@ -18,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -27,7 +29,7 @@
 set name=pkg.description \
     value="Tox as is a generic virtualenv management and test command line tool you can use for: checking your package installs correctly with different Python versions and interpreters; running your tests in each of the environments; configuring your test tool of choice; acting as a frontend to Continuous Integration servers, greatly reducing boilerplate and merging CI and shell-based testing."
 set name=com.oracle.info.description value="the Python tox module"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -46,8 +48,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/tox-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/tox-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/tox-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/tox-$(COMPONENT_VERSION)-py$(PYVER).egg-info/zip-safe
 file path=usr/lib/python$(PYVER)/vendor-packages/tox/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/tox/__main__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/tox/_cmdline.py
 file path=usr/lib/python$(PYVER)/vendor-packages/tox/_config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/tox/_exception.py
@@ -55,10 +57,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/tox/_quickstart.py
 file path=usr/lib/python$(PYVER)/vendor-packages/tox/_venv.py
 file path=usr/lib/python$(PYVER)/vendor-packages/tox/_verlib.py
+file path=usr/lib/python$(PYVER)/vendor-packages/tox/interpreters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/tox/result.py
+file path=usr/lib/python$(PYVER)/vendor-packages/tox/vendor/__init__.py
 license tox.license license="GPLv2 BSD, MIT, PSF"
 
 # force a dependency on argparse; pkgdepend work is needed to flush this out.
-$(PYTHON_2.6_ONLY)depend type=require fmri=library/python-2/argparse-26
+depend type=require fmri=library/python-2/argparse-26
 
 # force a dependency on py; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/py-$(PYV)