--- a/components/emacs/gnu-emacs.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/emacs/gnu-emacs.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,24 +18,23 @@
 #
 # 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:/editor/gnu-emacs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/editor/gnu-emacs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs core"
-set name=pkg.description value="GNU emacs core, runtime support for the emacs binary packages"
+set name=pkg.description \
+    value="GNU emacs core, runtime support for the emacs binary packages"
 set name=com.oracle.info.description value="GNU emacs core"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Editors
 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/2008/494
+set name=org.opensolaris.arc-caseid value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-license emacs.license license="GPLv3"
-
 
 
 file path=usr/bin/ebrowse
@@ -46,16 +45,13 @@
 file path=usr/gnu/bin/etags
 file path=usr/gnu/share/man/man1/ctags.1
 file path=usr/gnu/share/man/man1/etags.1
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/hexl \
-	mode=0555
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/movemail \
-	mode=0555
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/profile \
-	mode=0555
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/rcs2log \
-	mode=0555
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/update-game-score \
-	mode=0555
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/hexl mode=0555
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/movemail mode=0555
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/profile mode=0555
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/rcs2log mode=0555
+file \
+    path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/update-game-score \
+    mode=0555
 file path=usr/share/applications/emacs.desktop
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/AUTHORS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/CENSORSHIP
@@ -2509,22 +2505,21 @@
 file path=usr/share/info/wisent.info
 file path=usr/share/info/woman.info
 file path=usr/share/man/man1/ebrowse.1
-file path=usr/share/man/man1/emacs.1 \
-	mangler.man.stability=committed
+file path=usr/share/man/man1/emacs.1 mangler.man.stability=committed
 file path=usr/share/man/man1/emacsclient.1
 file path=usr/share/man/man1/grep-changelog.1
+license emacs.license license=GPLv3
+
+# The rgrep command uses GNU-find specific options, so we patch Solaris emacs
+# to use GNU find. As this functionality is relatively core, ensure that
+# installing emacs also brings in the package containing GNU find.
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/find
 
 # This package provides everything needed to run emacs except for the
 # actual emacs binary. Although the /usr/bin/emacs shell script is prepared
 # for the case where no binary is present, that's not a useful configuration.
 # Therefore, require at least one of the binary supplying packages.
 
-depend type=require-any \
-	fmri=pkg:/editor/gnu-emacs/gnu-emacs-gtk \
-	fmri=pkg:/editor/gnu-emacs/gnu-emacs-x11 \
-	fmri=pkg:/editor/gnu-emacs/gnu-emacs-no-x11
-
-# The rgrep command uses GNU-find specific options, so we patch Solaris emacs
-# to use GNU find. As this functionality is relatively core, ensure that
-# installing emacs also brings in the package containing GNU find.
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/find 
+depend type=require-any fmri=pkg:/editor/gnu-emacs/gnu-emacs-gtk \
+    fmri=pkg:/editor/gnu-emacs/gnu-emacs-no-x11 \
+    fmri=pkg:/editor/gnu-emacs/gnu-emacs-x11