--- a/components/gtar/Makefile	Tue Jun 21 00:50:33 2011 -0700
+++ b/components/gtar/Makefile	Tue Jun 21 13:39:40 2011 -0700
@@ -38,7 +38,6 @@
 
 CONFIGURE_OPTIONS +=	--with-rmt=/usr/sbin/rmt
 CONFIGURE_OPTIONS +=	--libexecdir=/usr/sbin
-CONFIGURE_OPTIONS +=	--program-prefix=g
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 
 COMPONENT_BUILD_TARGETS = all

--- a/components/gtar/gtar.p5m	Tue Jun 21 00:50:33 2011 -0700
+++ b/components/gtar/gtar.p5m	Tue Jun 21 13:39:40 2011 -0700
@@ -120,7 +120,7 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/gtar
+file usr/bin/tar path=usr/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
@@ -160,14 +160,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/share/man/man1/gtar.1
+file gtar.1.sunman path=usr/gnu/share/man/man1/tar.1
 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
-link path=usr/gnu/bin/tar target=../../bin/gtar
-link path=usr/gnu/share/man/man1/tar.1 \
-    target=../../../../share/man/man1/gtar.1
-link path=usr/sfw/bin/gtar target=../../bin/gtar
+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=true
+link path=usr/sfw/bin/gtar target=../../gnu/bin/tar