--- a/components/flex/flexruntime.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/flex/flexruntime.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,28 +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.
 #
 
-set name=pkg.fmri value=pkg:/system/library/flex-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/system/library/flex-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Flex Lexer (Runtime)"
 set name=com.oracle.info.description value="the flex lexer runtime"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Other Languages"
+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.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/289
-
-license flex.license license='BSD'
-
-file path=usr/lib/$(MACH64)/libfl.so.1
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 link path=usr/lib/$(MACH64)/libfl-2.5.4.so.0 target=./libfl.so.1
 link path=usr/lib/$(MACH64)/libfl.so target=./libfl.so.1
-file path=usr/lib/libfl.so.1
-link path=usr/lib/libfl.so target=./libfl.so.1
+file path=usr/lib/$(MACH64)/libfl.so.1
 link path=usr/lib/libfl-2.5.4.so target=./libfl.so.1
-
+link path=usr/lib/libfl.so target=./libfl.so.1
+file path=usr/lib/libfl.so.1
 legacy pkg=SUNWflexruntime \
-	name="Flex Lexer" \
-	desc="The Flex Lexer - A lex replacement/substitute runtime"
+    desc="The Flex Lexer - A lex replacement/substitute runtime" \
+    name="Flex Lexer"
+license flex.license license=BSD