--- a/components/ncftp/ncftp.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/ncftp/ncftp.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,44 +18,33 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 <transform file path=usr.*/man/.+ -> default mangler.man.modified-date "April 20, 2011">
-set name=pkg.fmri value=pkg:/network/ftp/ncftp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/network/ftp/ncftp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="NcFTP - client application implementing FTP"
 set name=com.oracle.info.description value="the ncftp file transfer application"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2000/488
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license ncftp.license license='Artistic'
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/sfw
-dir path=usr/sfw/bin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/ncftp
+hardlink path=usr/bin/ncftpbatch target=ncftpspooler
 file path=usr/bin/ncftpbookmarks
 file path=usr/bin/ncftpget
 file path=usr/bin/ncftpls
 file path=usr/bin/ncftpput
 file path=usr/bin/ncftpspooler
-file path=usr/share/man/man1/ncftp.1
-file path=usr/share/man/man1/ncftpbatch.1
-file path=usr/share/man/man1/ncftpget.1
-file path=usr/share/man/man1/ncftpls.1
-file path=usr/share/man/man1/ncftpput.1
-file path=usr/share/man/man1/ncftpspooler.1
-hardlink path=usr/bin/ncftpbatch target=ncftpspooler
+dir  path=usr/sfw
+dir  path=usr/sfw/bin
 link path=usr/sfw/bin/ncftp target=../../bin/ncftp
 link path=usr/sfw/bin/ncftpbatch target=../../bin/ncftpbatch
 link path=usr/sfw/bin/ncftpbookmarks target=../../bin/ncftpbookmarks
@@ -63,7 +52,15 @@
 link path=usr/sfw/bin/ncftpls target=../../bin/ncftpls
 link path=usr/sfw/bin/ncftpput target=../../bin/ncftpput
 link path=usr/sfw/bin/ncftpspooler target=../../bin/ncftpspooler
-
-legacy	pkg=SUNWncft \
-	name="NcFTP - client application implementing FTP" \
-	desc="NcFTP ncftp - File Transfer Protocol (FTP)"
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+file path=usr/share/man/man1/ncftp.1
+file path=usr/share/man/man1/ncftpbatch.1
+file path=usr/share/man/man1/ncftpget.1
+file path=usr/share/man/man1/ncftpls.1
+file path=usr/share/man/man1/ncftpput.1
+file path=usr/share/man/man1/ncftpspooler.1
+legacy pkg=SUNWncft desc="NcFTP ncftp - File Transfer Protocol (FTP)" \
+    name="NcFTP - client application implementing FTP"
+license ncftp.license license=Artistic