--- a/components/lcms/lcms.p5m	Fri Oct 15 16:14:01 2010 -0500
+++ b/components/lcms/lcms.p5m	Fri Oct 15 16:15:38 2010 -0500
@@ -29,6 +29,7 @@
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set variant.arch=$(ARCH)
 license COPYING license="LCMS"
 dir path=usr
 dir path=usr/bin
@@ -58,10 +59,10 @@
 file path=usr/bin/wtpt variant.arch=$(ARCH)
 file path=usr/include/lcms/icc34.h
 file path=usr/include/lcms/lcms.h
-file path=usr/lib/$(MACH64)/liblcms.la variant.arch=$(ARCH)
+#file path=usr/lib/$(MACH64)/liblcms.la variant.arch=$(ARCH)
 file path=usr/lib/$(MACH64)/liblcms.so.1.0.19 variant.arch=$(ARCH)
 file path=usr/lib/$(MACH64)/pkgconfig/lcms.pc variant.arch=$(ARCH)
-file path=usr/lib/liblcms.la variant.arch=$(ARCH)
+#file path=usr/lib/liblcms.la variant.arch=$(ARCH)
 file path=usr/lib/liblcms.so.1.0.19 variant.arch=$(ARCH)
 file path=usr/lib/pkgconfig/lcms.pc
 file path=usr/share/man/man1/icc2ps.1
@@ -75,11 +76,11 @@
     variant.arch=$(ARCH)
 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=pkg:/image/library/[email protected] type=require
-depend fmri=pkg:/image/library/[email protected] type=require
-depend fmri=pkg:/library/[email protected] type=require
-depend fmri=pkg:/system/library/[email protected] type=require
-depend fmri=pkg:/system/[email protected] type=require
+depend fmri=pkg:/image/library/libjpeg type=require
+depend fmri=pkg:/image/library/libtiff type=require
+depend fmri=pkg:/library/zlib type=require
+depend fmri=pkg:/system/library/math type=require
+depend fmri=pkg:/system/library type=require