--- a/components/ksh93/source-demo-ksh.p5m	Thu Jul 05 10:31:21 2012 -0700
+++ b/components/ksh93/source-demo-ksh.p5m	Mon Jul 09 08:44:23 2012 +0100
@@ -18,41 +18,11 @@
 #
 # CDDL HEADER END
 #
-
-#
 # Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
-# The man pages are all at the top of a "files" directory; setting the hash to
-# point to the files therein.
-<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<\1> >
-# Bypassing the mangler for these files because they are pre-Solarified.
-<transform file path=usr/share/man/.+$ -> add mangler.bypass true >
-set name=pkg.fmri \
-    value=pkg:/source/demo/ksh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description value="Source code to demonstrate the KornShell"
-set name=pkg.summary value="KornShell demos"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream \
-    value="AT&T Software Technology (AST) OpenSource Software Collection"
-set name=info.upstream-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/002
+set name=pkg.fmri value=pkg:/source/demo/[email protected]
+set name=pkg.renamed value=true
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr group=sys
-dir path=usr/demo
-dir path=usr/demo/ksh
-dir path=usr/demo/ksh/fun
-dir path=usr/share/man/ja_JP.UTF-8/man1
-dir path=usr/share/man/man1
-file $(MACH64)/fun/dirs path=usr/demo/ksh/fun/dirs mode=0755 preserve=true
-file $(MACH64)/fun/popd path=usr/demo/ksh/fun/popd mode=0755 preserve=true
-file $(MACH64)/fun/pushd path=usr/demo/ksh/fun/pushd mode=0755 preserve=true
-file $(MACH64)/fun/title path=usr/demo/ksh/fun/title mode=0755 preserve=true
-file dirs.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/dirs.1
-file popd.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/popd.1
-file pushd.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/pushd.1
-file path=usr/share/man/man1/dirs.1
-file path=usr/share/man/man1/popd.1
-file path=usr/share/man/man1/pushd.1
-license ksh93.license license=CPL
+depend fmri=pkg:/source/demo/[email protected] type=require
+