--- a/components/lcms/Makefile	Wed Aug 25 11:58:58 2010 -0700
+++ b/components/lcms/Makefile	Thu Sep 02 11:07:22 2010 -0500
@@ -22,8 +22,6 @@
 #
 include ../../make-rules/shared-macros.mk
 
-PATH=/usr/bin:/usr/gnu/bin
-
 COMPONENT_NAME=		lcms
 COMPONENT_VERSION=	1.19
 IPS_PKG_NAME=		library/lcms
@@ -39,6 +37,9 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+CONFIGURE_OPTIONS +=	--disable-static
+CONFIGURE_OPTIONS +=	--includedir=/usr/include/lcms
+
 PKGMOGRIFY_TRANSFORMS +=	$(WS_TOP)/transforms/archive-libraries-drop
 PKGMOGRIFY_TRANSFORMS +=	$(WS_TOP)/transforms/libtool-drop
 
@@ -51,3 +52,82 @@
 install:	$(INSTALL_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+
+REQUIRED_TOOL +=	/sbin/uname
+REQUIRED_TOOL +=	/usr/bin/arch
+REQUIRED_TOOL +=	/usr/bin/basename
+REQUIRED_TOOL +=	/usr/bin/bash
+REQUIRED_TOOL +=	/usr/bin/chmod
+REQUIRED_TOOL +=	/usr/bin/cp
+REQUIRED_TOOL +=	/usr/bin/diff
+REQUIRED_TOOL +=	/usr/bin/dirname
+REQUIRED_TOOL +=	/usr/bin/echo
+REQUIRED_TOOL +=	/usr/bin/env
+REQUIRED_TOOL +=	/usr/bin/expr
+REQUIRED_TOOL +=	/usr/bin/find
+REQUIRED_TOOL +=	/usr/bin/ggrep
+REQUIRED_TOOL +=	/usr/bin/gmake
+REQUIRED_TOOL +=	/usr/bin/grep
+REQUIRED_TOOL +=	/usr/bin/gsed
+REQUIRED_TOOL +=	/usr/bin/gtar
+REQUIRED_TOOL +=	/usr/bin/gzip 
+REQUIRED_TOOL +=	/usr/bin/hostname
+REQUIRED_TOOL +=	/usr/bin/ksh93
+REQUIRED_TOOL +=	/usr/bin/ld
+REQUIRED_TOOL +=	/usr/bin/ln
+REQUIRED_TOOL +=	/usr/bin/ls
+REQUIRED_TOOL +=	/usr/bin/make
+REQUIRED_TOOL +=	/usr/bin/mkdir
+REQUIRED_TOOL +=	/usr/bin/mv
+REQUIRED_TOOL +=	/usr/bin/nm
+REQUIRED_TOOL +=	/usr/bin/rm
+REQUIRED_TOOL +=	/usr/bin/rmdir
+REQUIRED_TOOL +=	/usr/bin/sed
+REQUIRED_TOOL +=	/usr/bin/sort
+REQUIRED_TOOL +=	/usr/bin/strip
+REQUIRED_TOOL +=	/usr/bin/touch
+REQUIRED_TOOL +=	/usr/bin/tr
+REQUIRED_TOOL +=	/usr/gnu/bin/as
+REQUIRED_TOOL +=	/usr/gnu/bin/echo
+REQUIRED_TOOL +=	/usr/gnu/bin/mkdir
+REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/cc
+REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/CC
+
+REQUIRED_FILE +=	/lib/$(MACH64)/libc.so
+REQUIRED_FILE +=	/lib/$(MACH64)/libm.so
+REQUIRED_FILE +=	/lib/$(MACH64)/libz.so
+REQUIRED_FILE +=	/lib/libc.so
+REQUIRED_FILE +=	/lib/libm.so
+REQUIRED_FILE +=	/lib/libz.so
+REQUIRED_FILE +=	/usr/include/assert.h
+REQUIRED_FILE +=	/usr/include/ctype.h
+REQUIRED_FILE +=	/usr/include/dlfcn.h
+REQUIRED_FILE +=	/usr/include/errno.h
+REQUIRED_FILE +=	/usr/include/float.h
+REQUIRED_FILE +=	/usr/include/jconfig.h
+REQUIRED_FILE +=	/usr/include/jerror.h
+REQUIRED_FILE +=	/usr/include/jmorecfg.h
+REQUIRED_FILE +=	/usr/include/jpeglib.h
+REQUIRED_FILE +=	/usr/include/limits.h
+REQUIRED_FILE +=	/usr/include/math.h
+REQUIRED_FILE +=	/usr/include/stdarg.h
+REQUIRED_FILE +=	/usr/include/stdbool.h
+REQUIRED_FILE +=	/usr/include/stdint.h
+REQUIRED_FILE +=	/usr/include/stdio.h
+REQUIRED_FILE +=	/usr/include/stdlib.h
+REQUIRED_FILE +=	/usr/include/string.h
+REQUIRED_FILE +=	/usr/include/sys/param.h
+REQUIRED_FILE +=	/usr/include/sys/stat.h
+REQUIRED_FILE +=	/usr/include/sys/types.h
+REQUIRED_FILE +=	/usr/include/tiff.h
+REQUIRED_FILE +=	/usr/include/tiffio.h
+REQUIRED_FILE +=	/usr/include/time.h
+REQUIRED_FILE +=	/usr/include/unistd.h
+REQUIRED_FILE +=	/usr/include/wchar.h
+REQUIRED_FILE +=	/usr/include/zconf.h
+REQUIRED_FILE +=	/usr/include/zlib.h
+REQUIRED_FILE +=	/usr/lib/$(MACH64)/libjpeg.so
+REQUIRED_FILE +=	/usr/lib/$(MACH64)/libtiff.so
+REQUIRED_FILE +=	/usr/lib/libjpeg.so
+REQUIRED_FILE +=	/usr/lib/libtiff.so