--- a/components/gtar/gtar.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gtar/gtar.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,25 +18,26 @@
 #
 # 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 volatile>
 set name=pkg.fmri \
     value=pkg:/archiver/gnu-tar@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU version of the tar archiving utility"
 set name=pkg.description \
     value="Tar is a program for packaging a set of files as a single archive in tar format."
-set name=pkg.summary value="GNU version of the tar archiving utility"
 set name=com.oracle.info.description value="GNU tar"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/GNU
+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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2000/488
+set name=org.opensolaris.arc-caseid value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/gtar target=../gnu/bin/tar facet.compat.gnulinks=true
 file usr/bin/tar path=usr/gnu/bin/tar
+file gtar.1.sunman path=usr/gnu/share/man/man1/tar.1
+link path=usr/sfw/bin/gtar target=../../gnu/bin/tar
 file path=usr/share/info/tar.info
 file path=usr/share/info/tar.info-1
 file path=usr/share/info/tar.info-2
@@ -78,19 +79,13 @@
 file path=usr/share/locale/vi/LC_MESSAGES/tar.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/tar.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/tar.mo
-file gtar.1.sunman path=usr/gnu/share/man/man1/tar.1
-
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/bzip2 type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/compress type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gzip type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/ssh type=require
-
+link path=usr/share/man/man1/gtar.1 target=../../../gnu/share/man/man1/tar.1 \
+    facet.compat.gnulinks=all
 legacy pkg=SUNWgtar \
     desc="GNU tar - A utility used to store, backup, and transport files (gtar) 1.25" \
     name="gtar - GNU tar"
-
 license gtar.license license="GPLv3, FDLv1.3"
-link path=usr/bin/gtar target=../gnu/bin/tar facet.compat.gnulinks=true
-link path=usr/share/man/man1/gtar.1 \
-    target=../../../gnu/share/man/man1/tar.1 facet.compat.gnulinks=all
-link path=usr/sfw/bin/gtar target=../../gnu/bin/tar
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/bzip2
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/compress
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gzip
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/ssh