--- a/components/gdb/gdb.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/gdb/gdb.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,30 +18,27 @@
 #
 # 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:/developer/debug/gdb@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/developer/debug/gdb@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GDB 7.6"
-set name=pkg.description value='GDB, the GNU Debugger, is a source-level debugger for Ada, C, C++, Objective-C, Pascal and many other languages.  GDB allows you to see what is going on inside another program while it executes, or what another program was doing at the moment it crashed.'
-set name=com.oracle.info.description value='GDB, the GNU Debugger'
+set name=pkg.description \
+    value="GDB, the GNU Debugger, is a source-level debugger for Ada, C, C++, Objective-C, Pascal and many other languages.  GDB allows you to see what is going on inside another program while it executes, or what another program was doing at the moment it crashed."
+set name=com.oracle.info.description value="GDB, the GNU Debugger"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/System"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/System
+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=LSARC/2009/492
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/492
-
-file usr/bin/$(MACH64)/gdb path=/usr/bin/gdb
+file usr/bin/$(MACH64)/gdb path=usr/bin/gdb
 file path=usr/bin/gdbtui mode=0555
 file path=usr/include/gdb/jit-reader.h
-
 file path=usr/share/gdb/python/gdb/__init__.py
-file path=usr/share/gdb/python/gdb/printing.py
-file path=usr/share/gdb/python/gdb/prompt.py
-file path=usr/share/gdb/python/gdb/types.py
 file path=usr/share/gdb/python/gdb/command/__init__.py
 file path=usr/share/gdb/python/gdb/command/explore.py
 file path=usr/share/gdb/python/gdb/command/pretty_printers.py
@@ -49,13 +46,14 @@
 file path=usr/share/gdb/python/gdb/command/type_printers.py
 file path=usr/share/gdb/python/gdb/function/__init__.py
 file path=usr/share/gdb/python/gdb/function/strfns.py
-
+file path=usr/share/gdb/python/gdb/printing.py
+file path=usr/share/gdb/python/gdb/prompt.py
+file path=usr/share/gdb/python/gdb/types.py
+file path=usr/share/gdb/syscalls/amd64-solaris.xml variant.arch=i386
 file path=usr/share/gdb/syscalls/gdb-syscalls.dtd
 file path=usr/share/gdb/syscalls/i386-solaris.xml variant.arch=i386
-file path=usr/share/gdb/syscalls/amd64-solaris.xml variant.arch=i386
 file path=usr/share/gdb/syscalls/sparc-solaris.xml variant.arch=sparc
 file path=usr/share/gdb/syscalls/sparc64-solaris.xml variant.arch=sparc
-
 file path=usr/share/info/annotate.info
 file path=usr/share/info/gdb.info
 file path=usr/share/info/gdb.info-1
@@ -69,7 +67,6 @@
 file path=usr/share/info/gdbint.info-1
 file path=usr/share/info/gdbint.info-2
 file path=usr/share/info/stabs.info
-
 file path=usr/share/locale/da/LC_MESSAGES/bfd.mo
 file path=usr/share/locale/da/LC_MESSAGES/opcodes.mo
 file path=usr/share/locale/de/LC_MESSAGES/opcodes.mo
@@ -100,9 +97,8 @@
 file path=usr/share/locale/vi/LC_MESSAGES/opcodes.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/bfd.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/opcodes.mo
-
 file path=usr/share/man/man1/gdb.1
 link path=usr/share/man/man1/gdbtui.1 target=gdb.1
+license gdb.license \
+    license="GPLv2, LGPLv2, GPLv3, LGPLv3, FDLv1.1, FDLv1.2, FDLv1.3"
 
-license gdb.license license="GPLv2, LGPLv2, GPLv3, LGPLv3, FDLv1.1, FDLv1.2, FDLv1.3"
-