--- a/components/emacs/gnu-emacs-gtk.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/emacs/gnu-emacs-gtk.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,32 +18,32 @@
 #
 # 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/gnu-emacs-gtk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/editor/gnu-emacs/gnu-emacs-gtk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs with X11 support (GTK toolkit)"
-set name=com.oracle.info.description value="GNU emacs with X11 support (GTK toolkit)"
+set name=com.oracle.info.description \
+    value="GNU emacs with X11 support (GTK toolkit)"
 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/emacs-gtk
 hardlink path=usr/bin/emacs-gtk-$(COMPONENT_VERSION) target=emacs-gtk
 file path=usr/share/man/man1/emacs-gtk.1
+license emacs.license license=GPLv3
 
 
 # This package requires the emacs core package to be installed. To help
 # pkgdepend find that relationship without hardwiring an fmri, specify
 # a dependency on a file known to always be present in the core package,
 # and allow pkgdepend to generate the fmri.
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/emacs \
-	pkg.debug.reason=usr/bin/emacs-gtk type=require 
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacs \
+    pkg.debug.reason=usr/bin/emacs-gtk