--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,13 +20,17 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-std@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+set name=pkg.fmri \
+    value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-std@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Ghostscript Fonts (Standard)"
-set name=info.classification value="org.opensolaris.category.2008:System/Printing "
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Printing "
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://sourceforge.net/projects/gs-fonts/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/share
 dir path=usr/share/ghostscript
@@ -138,9 +142,6 @@
 file path=usr/share/ghostscript/fonts/z003034l.afm
 file path=usr/share/ghostscript/fonts/z003034l.pfb
 file path=usr/share/ghostscript/fonts/z003034l.pfm
-
-license gnu-gs-fonts-std.license license="GPLv2"
-
-legacy pkg=SUNWgsfst \
-	name="GNU Ghostscript Fonts (Standard)" \
-	desc="GNU Ghostscript Fonts (Standard) 6.0"
+legacy pkg=SUNWgsfst desc="GNU Ghostscript Fonts (Standard) 6.0" \
+    name="GNU Ghostscript Fonts (Standard)"
+license gnu-gs-fonts-std.license license=GPLv2