--- a/components/lcms/lcms.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/lcms/lcms.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,22 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The Little Color Management System"
 set name=pkg.description \
     value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=pkg.summary value="The Little Color Management System"
 set name=com.oracle.info.description value="the Little Color Management System"
 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)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/071
+set name=org.opensolaris.arc-caseid value=PSARC/2008/071
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 #
@@ -46,9 +45,14 @@
 file usr/bin/$(MACH64)/wtpt path=usr/bin/wtpt
 file path=usr/include/lcms/icc34.h
 file path=usr/include/lcms/lcms.h
+#
+link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
 file path=usr/lib/$(MACH64)/liblcms.so.1.0.19
 file path=usr/lib/$(MACH64)/llib-llcms.ln
 file path=usr/lib/$(MACH64)/pkgconfig/lcms.pc
+link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
 file path=usr/lib/liblcms.so.1.0.19
 file path=usr/lib/llib-llcms
 file path=usr/lib/llib-llcms.ln
@@ -61,16 +65,9 @@
 file path=usr/share/man/man1/wtpt.1
 #
 license lcms.license license=MIT
-#
-link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
-link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
-link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
-link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
-
-depend fmri=library/python/lcms-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python/lcms-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+depend type=conditional \
+    fmri=library/python/lcms-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=library/python/lcms-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27