--- a/components/libxml2/libxml2.p5m	Mon Dec 15 11:16:57 2014 -0800
+++ b/components/libxml2/libxml2.p5m	Fri Dec 12 04:00:07 2014 -0800
@@ -26,7 +26,7 @@
     value=pkg:/library/libxml2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XML library"
 set name=com.oracle.info.description value="the XML library"
-set name=com.oracle.info.tpno value=17981
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -110,10 +110,10 @@
 link path=usr/lib/libxml2.so.2 target=../../lib/libxml2.so.2
 link path=usr/lib/llib-lxml2.ln target=../../lib/llib-lxml2.ln
 
-depend fmri=library/python-2/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-26 \
     type=conditional
 
-depend fmri=library/python-2/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-27 \
     type=conditional