--- a/components/proftpd/proftpd.p5m	Fri May 15 09:41:56 2015 -0700
+++ b/components/proftpd/proftpd.p5m	Tue May 19 02:34:35 2015 -0700
@@ -18,82 +18,46 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # PSARC/2011/088
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/service/network/ftp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="FTP Server and Utilities"
 set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=pkg.summary value="FTP Server and Utilities"
-set name=info.classification value="org.opensolaris.category.2008:System/Core"
+set name=info.classification value=org.opensolaris.category.2008:System/Core
 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/2011/088
+set name=org.opensolaris.arc-caseid value=PSARC/2011/088
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=etc
-dir path=etc/security
-dir path=etc/security/auth_attr.d
-dir path=etc/security/prof_attr.d
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest
-dir path=lib/svc/manifest/network
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/proftpd
-dir path=usr/lib
-dir path=usr/lib/help
-dir path=usr/lib/help/auths
-dir path=usr/lib/help/auths/locale
-dir path=usr/lib/help/auths/locale/C
-dir path=usr/lib/inet
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/proftpd
-dir path=usr/sbin
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/proftpd
-dir path=usr/share/doc/proftpd/modules
-dir path=usr/share/locale
-dir path=usr/share/locale/bg_BG
-dir path=usr/share/locale/bg_BG/LC_MESSAGES
-dir path=usr/share/locale/en_US
-dir path=usr/share/locale/en_US/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/ko
-dir path=usr/share/locale/ko/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/zh_CN
-dir path=usr/share/locale/zh_CN/LC_MESSAGES
-dir path=usr/share/locale/zh_TW
-dir path=usr/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man4
-dir path=usr/share/man/man5
-dir path=usr/share/man/man8
+dir  path=etc
 file proftpd.conf path=etc/proftpd.conf mode=0644 preserve=true
-file auth_service-network-ftpd path=etc/security/auth_attr.d/service-network-ftpd
-file prof_service-network-ftpd path=etc/security/prof_attr.d/service-network-ftpd
+dir  path=etc/security
+dir  path=etc/security/auth_attr.d
+file auth_service-network-ftpd \
+    path=etc/security/auth_attr.d/service-network-ftpd
+dir  path=etc/security/prof_attr.d
+file prof_service-network-ftpd \
+    path=etc/security/prof_attr.d/service-network-ftpd
+dir  path=lib
+dir  path=lib/svc
+dir  path=lib/svc/manifest
+dir  path=lib/svc/manifest/network
 file ftp.xml path=lib/svc/manifest/network/ftp.xml
+dir  path=lib/svc/method
 file svc-ftp path=lib/svc/method/svc-ftp
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/ftpcount
 file path=usr/bin/ftpdctl
 file path=usr/bin/ftptop
 file path=usr/bin/ftpwho
 file path=usr/bin/prxs
+file dtrace/example.d path=usr/demo/dtrace/ftp.d
+dir  path=usr/include
+dir  path=usr/include/proftpd
 file path=usr/include/proftpd/auth.h
 file path=usr/include/proftpd/bindings.h
 file path=usr/include/proftpd/buildstamp.h
@@ -151,65 +115,106 @@
 file path=usr/include/proftpd/var.h
 file path=usr/include/proftpd/version.h
 file path=usr/include/proftpd/xferlog.h
+dir  path=usr/lib
+file dtrace/ftp.d path=usr/lib/dtrace/ftp.d
+dir  path=usr/lib/help
+dir  path=usr/lib/help/auths
+dir  path=usr/lib/help/auths/locale
+dir  path=usr/lib/help/auths/locale/C
 file ManageFTP.html path=usr/lib/help/auths/locale/C/ManageFTP.html
+dir  path=usr/lib/inet
 file usr/sbin/proftpd path=usr/lib/inet/proftpd
+dir  path=usr/lib/pkgconfig
 file path=usr/lib/pkgconfig/proftpd.pc
+dir  path=usr/lib/proftpd
 file path=usr/lib/proftpd/mod_auth_gss.so
 file path=usr/lib/proftpd/mod_facl.so
 file path=usr/lib/proftpd/mod_gss.so
 file path=usr/lib/proftpd/mod_tls.so
 file path=usr/lib/proftpd/mod_wrap.so
+dir  path=usr/sbin
 file ftprestart.sh path=usr/sbin/ftprestart
 file path=usr/sbin/ftpscrub
 file path=usr/sbin/ftpshut
-file proftpd_migration.txt path=usr/share/doc/proftpd/proftpd_migration.txt
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/proftpd
 file doc/Configuration.html path=usr/share/doc/proftpd/Configuration.html
-file doc/modules/mod_auth_file.html path=usr/share/doc/proftpd/modules/mod_auth_file.html
-file doc/modules/mod_auth_pam.html path=usr/share/doc/proftpd/modules/mod_auth_pam.html
-file doc/modules/mod_ctrls.html path=usr/share/doc/proftpd/modules/mod_ctrls.html
-file doc/modules/mod_delay.html path=usr/share/doc/proftpd/modules/mod_delay.html
+dir  path=usr/share/doc/proftpd/modules
+file doc/modules/mod_auth_file.html \
+    path=usr/share/doc/proftpd/modules/mod_auth_file.html
+file doc/modules/mod_auth_pam.html \
+    path=usr/share/doc/proftpd/modules/mod_auth_pam.html
+file doc/modules/mod_ctrls.html \
+    path=usr/share/doc/proftpd/modules/mod_ctrls.html
+file doc/modules/mod_delay.html \
+    path=usr/share/doc/proftpd/modules/mod_delay.html
 file doc/modules/mod_dso.html path=usr/share/doc/proftpd/modules/mod_dso.html
 file doc/modules/mod_facl.html path=usr/share/doc/proftpd/modules/mod_facl.html
-file doc/modules/mod_facts.html path=usr/share/doc/proftpd/modules/mod_facts.html
-file doc/modules/mod_ident.html path=usr/share/doc/proftpd/modules/mod_ident.html
+file doc/modules/mod_facts.html \
+    path=usr/share/doc/proftpd/modules/mod_facts.html
+file doc/contrib/mod_gss.html path=usr/share/doc/proftpd/modules/mod_gss.html
+file doc/modules/mod_ident.html \
+    path=usr/share/doc/proftpd/modules/mod_ident.html
 file doc/modules/mod_lang.html path=usr/share/doc/proftpd/modules/mod_lang.html
-file doc/contrib/mod_gss.html path=usr/share/doc/proftpd/modules/mod_gss.html
 file doc/contrib/mod_tls.html path=usr/share/doc/proftpd/modules/mod_tls.html
 file doc/contrib/mod_wrap.html path=usr/share/doc/proftpd/modules/mod_wrap.html
+file proftpd_migration.txt path=usr/share/doc/proftpd/proftpd_migration.txt
+dir  path=usr/share/locale
+dir  path=usr/share/locale/bg_BG
+dir  path=usr/share/locale/bg_BG/LC_MESSAGES
 file path=usr/share/locale/bg_BG/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/en_US
+dir  path=usr/share/locale/en_US/LC_MESSAGES
 file path=usr/share/locale/en_US/LC_MESSAGES/proftpd.mo
-file usr/share/locale/fr_FR/LC_MESSAGES/proftpd.mo path=usr/share/locale/fr/LC_MESSAGES/proftpd.mo
-file usr/share/locale/it_IT/LC_MESSAGES/proftpd.mo path=usr/share/locale/it/LC_MESSAGES/proftpd.mo
-file usr/share/locale/ja_JP/LC_MESSAGES/proftpd.mo path=usr/share/locale/ja/LC_MESSAGES/proftpd.mo
-file usr/share/locale/ko_KR/LC_MESSAGES/proftpd.mo path=usr/share/locale/ko/LC_MESSAGES/proftpd.mo
-file usr/share/locale/ru_RU/LC_MESSAGES/proftpd.mo path=usr/share/locale/ru/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
+file usr/share/locale/fr_FR/LC_MESSAGES/proftpd.mo \
+    path=usr/share/locale/fr/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/it
+dir  path=usr/share/locale/it/LC_MESSAGES
+file usr/share/locale/it_IT/LC_MESSAGES/proftpd.mo \
+    path=usr/share/locale/it/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/ja
+dir  path=usr/share/locale/ja/LC_MESSAGES
+file usr/share/locale/ja_JP/LC_MESSAGES/proftpd.mo \
+    path=usr/share/locale/ja/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/ko
+dir  path=usr/share/locale/ko/LC_MESSAGES
+file usr/share/locale/ko_KR/LC_MESSAGES/proftpd.mo \
+    path=usr/share/locale/ko/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
+file usr/share/locale/ru_RU/LC_MESSAGES/proftpd.mo \
+    path=usr/share/locale/ru/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/zh_CN
+dir  path=usr/share/locale/zh_CN/LC_MESSAGES
 file path=usr/share/locale/zh_CN/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/locale/zh_TW
+dir  path=usr/share/locale/zh_TW/LC_MESSAGES
 file path=usr/share/locale/zh_TW/LC_MESSAGES/proftpd.mo
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/ftpcount.1
 file path=usr/share/man/man1/ftptop.1
 file path=usr/share/man/man1/ftpwho.1
+dir  path=usr/share/man/man4
+dir  path=usr/share/man/man5
 file path=usr/share/man/man5/proftpd.conf.5
 file path=usr/share/man/man5/xferlog.5
+dir  path=usr/share/man/man8
 file path=usr/share/man/man8/ftpdctl.8
 file path=usr/share/man/man8/ftpscrub.8
 file path=usr/share/man/man8/ftpshut.8
 file path=usr/share/man/man8/proftpd.8
-
-group groupname="ftp" gid=21
-
-legacy	pkg=SUNWftpu \
-    name="FTP Server, (Usr)" \
-    desc="FTP Server and Utilities"
-
+group groupname=ftp gid=21
+user username=ftp ftpuser=false gcos-field="FTPD Reserved UID" group=ftp uid=21
+legacy pkg=SUNWftpu desc="FTP Server and Utilities" name="FTP Server, (Usr)"
 license proftpd.license license="GPLv2 (mod_gss)" \
     com.oracle.info.description="the ProFPTD GSS Engine" \
-    com.oracle.info.name=mod_gss \
-    com.oracle.info.tpno=13480 \
+    com.oracle.info.name=mod_gss com.oracle.info.tpno=13480 \
     com.oracle.info.version=1.3.6
 license proftpd.license license="GPLv2 (proftpd)" \
     com.oracle.info.description="the ProFTPD server and utilities" \
-    com.oracle.info.name=proftpd \
-    com.oracle.info.tpno=17783 \
+    com.oracle.info.name=proftpd com.oracle.info.tpno=17783 \
     com.oracle.info.version=1.3.5
-
-user ftpuser=false gcos-field="FTPD Reserved UID" username="ftp" uid=21 group="ftp"