--- a/components/python/mako/mako-PYVER.p5m	Fri Aug 02 14:40:12 2013 -0600
+++ b/components/python/mako/mako-PYVER.p5m	Fri Aug 02 13:37:04 2013 -0700
@@ -21,28 +21,21 @@
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/python-2/mako-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/python-2/mako-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Template library written in Python"
-set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
+set name=pkg.description \
+    value="Mako is a template library written in Python. It provides a familiar, non-XML syntax which compiles into Python modules for maximum performance. Mako's syntax and API borrow from the best ideas of many others, including Django templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded Python (i.e., Python Server Page) language, which refines the familiar ideas of componentized layout and inheritance to produce one of the most straightforward and flexible models available while also maintaining close ties to Python calling and scoping semantics."
 set name=com.oracle.info.description value="the Mako Python template library"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=com.oracle.info.tpno value=10020
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Mike Bayer <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.upstream value="Mike Bayer <[email protected]>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2011/263
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2011/263
-
-license mako.copyright license=MIT
-
-# force a dependency on the Python runtime
-depend fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
-       pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the mako package
-depend fmri=library/python-2/mako@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
+#
 file path=usr/lib/python$(PYVER)/vendor-packages/Mako-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/Mako-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/Mako-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -71,3 +64,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mako/runtime.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mako/template.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mako/util.py
+#
+license LICENSE license=MIT
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the mako package
+depend type=require \
+    fmri=library/python-2/mako@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)