diff -r 447ee8f869db -r 67bdf73b3b85 components/desktop/colord-gtk/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/colord-gtk/Makefile	Tue Aug 23 18:19:17 2016 -0700
@@ -0,0 +1,99 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =            64_and_32
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		colord-gtk
+COMPONENT_VERSION=	0.1.26
+COMPONENT_PROJECT_URL=	http://www.freedesktop.org/software/colord/
+COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.xz
+COMPONENT_ARCHIVE_HASH= \
+	sha256:28d00b7f157ea3e2ea5315387b2660fde82faba16674861c50465e55d61a3e45
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/releases/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			25613
+
+TEST_TARGET = $(NO_TESTS)
+
+# Needs gobject-introspection, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/common.mk
+
+# Assumes GNU xgettext in PATH
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+# We should only need gtk3 support.
+CONFIGURE_OPTIONS += --disable-gtk2
+# Documentation target is busted; also requires docbook2man.
+CONFIGURE_OPTIONS += --disable-gtk-doc
+CONFIGURE_OPTIONS += --disable-schemas-compile
+CONFIGURE_OPTIONS += --disable-static
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --enable-shared
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-vala
+CONFIGURE_OPTIONS += --with-pic
+
+# Delete this when build servers are installed with an updated colord
+COLORD_BASE = $(WS_COMPONENTS)/desktop/colord/build/prototype/$(MACH)
+PKG_CONFIG_PATHS.32 += $(COLORD_BASE)/usr/lib/pkgconfig/
+PKG_CONFIG_PATHS.64 += $(COLORD_BASE)/usr/lib/$(MACH64)/pkgconfig/
+PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
+
+LD_OPTIONS.32 += -L $(COLORD_BASE)/usr/lib 
+LD_OPTIONS.64 += -L $(COLORD_BASE)/usr/lib/$(MACH64)
+LD_OPTIONS += $(LD_OPTIONS.$(BITS))
+
+COMPONENT_BUILD_ENV  += \
+libdir=$(COLORD_BASE)/usr/lib
+
+COMPONENT_BUILD_ENV  += \
+	XDG_DATA_DIRS="$(COLORD_BASE)/usr/share:/usr/share"
+
+CPPFLAGS += -I$(COLORD_BASE)/usr/include/colord-1
+
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(BUILD_DIR_32)/libcolord-gtk/.libs:$(COLORD_BASE)$(USRLIB.$(BITS))"
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(BUILD_DIR_64)/libcolord-gtk/.libs:$(COLORD_BASE)$(USRLIB.$(BITS))"
+
+# The dependency isn't installed, so add it manually since pkgdepend 
+# can't resolve them yet: 15708323
+DEPENDED += $(WS_TOP)/components/desktop/colord/build/manifest-$(MACH)-colord.depend
+
+# Temporary until dependencies are all on build machines
+REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../colord/Makefile)
+#end Delete
+
+
+REQUIRED_PACKAGES += developer/vala
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += service/image/colord