--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/cantarell-fonts/Makefile	Fri Jun 10 23:10:15 2016 -0700
@@ -0,0 +1,44 @@
+#
+# 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=             NO_ARCH
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		cantarell-fonts
+COMPONENT_VERSION=	0.0.18
+COMPONENT_ARCHIVE_HASH= \
+    sha256:f84df2ca44fa9266fdffd2b8de1adeff60eb7e7c9ec8e338a229b3126aabb977
+COMPONENT_BUGDB=        gnome/themes
+
+TPNO=			25260
+
+TEST_TARGET= $(NO_TESTS)
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+CONFIGURE_OPTIONS += --with-fontdir=$(USRSHARETTFONTSDIR)/cantarell
+
+REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += library/perl-5/xml-parser-522

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/cantarell-fonts/cantarell-fonts.p5m	Fri Jun 10 23:10:15 2016 -0700
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/system/font/truetype/cantarell@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="humanist sans-serif font family"
+set name=com.oracle.info.description value=$(COMPONENT_NAME)
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification value=org.opensolaris.category.2008:System/Fonts
+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/2016/375
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=etc/fonts/conf.d/31-cantarell.conf \
+    target=../../../usr/share/fontconfig/conf.avail/31-cantarell.conf
+file path=usr/share/fontconfig/conf.avail/31-cantarell.conf
+file path=usr/share/fonts/TrueType/cantarell/Cantarell-Bold.otf
+file path=usr/share/fonts/TrueType/cantarell/Cantarell-Regular.otf
+license COPYING license=OFLv1.1
+depend type=require fmri=system/library/fontconfig

--- a/transforms/actuators	Fri Jun 10 13:42:39 2016 -0700
+++ b/transforms/actuators	Fri Jun 10 23:10:15 2016 -0700
@@ -30,7 +30,7 @@
 # Fonts and font configuration
 <transform file path=etc/fonts/conf\.(avail|d)/.+ -> \
     default restart_fmri svc:/application/font/fc-cache:default>
-<transform file path=usr/share/font/.+ -> \
+<transform file path=usr/share/fonts/.+ -> \
     default restart_fmri svc:/application/font/fc-cache:default>
 
 # OpenGL selection scripts