--- a/components/automake/automake-1.9.6/automake.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/automake/automake-1.9.6/automake.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,16 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/automake-19@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/developer/build/automake-19@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A Makefile generator"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/software/automake/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/automake/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license automake.license license='GPLv2'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -149,7 +150,6 @@
 file path=usr/share/automake-1.9/symlink-tree mode=0555
 file path=usr/share/automake-1.9/texinfo.tex
 file path=usr/share/automake-1.9/ylwrap mode=0555
-
-legacy pkg=SUNWgnu-automake-19 \
-	name="GNU Automake - A Makefile generator" \
-	desc="GNU Automake - A Makefile generator"
+legacy pkg=SUNWgnu-automake-19 desc="GNU Automake - A Makefile generator" \
+    name="GNU Automake - A Makefile generator"
+license automake.license license=GPLv2