--- a/components/rdiff-backup/rdiff-backup.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/rdiff-backup/rdiff-backup.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,40 +18,36 @@
 #
 # 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 uncommitted>
-
-set name=pkg.fmri value=pkg:/backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Local/remote mirror and incremental backup utility"
 set name=com.oracle.info.description value="the rdiff-backup file utility"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/272
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/272
-
-license rdiff-backup.copyright license="GPLv2"
-
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)
-dir path=usr/share/man
-dir path=usr/share/man/man1
-
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)
 file CHANGELOG path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/CHANGELOG
 file COPYING path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/COPYING
 file FAQ.html path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/FAQ.html
 file README path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/README
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file rdiff-backup-statistics.1 path=usr/share/man/man1/rdiff-backup-statistics.1
 file rdiff-backup.1 path=usr/share/man/man1/rdiff-backup.1
-
-depend fmri=backup/rdiff-backup-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-depend fmri=backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
+license rdiff-backup.copyright license=GPLv2
+depend type=conditional \
+    fmri=backup/rdiff-backup-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26
+depend type=conditional \
+    fmri=backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27