# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1308921677 25200
# Node ID 3c9588126dfa4654b1a93fcfad74f424d5c42163
# Parent  6cd382e0c40b149f522bcfd75f067119ef6b1afb
7031700 Cleanup GNU binaries and their /usr/bin g-name for package: pkg:/text/gnu-diffutils

diff -r 6cd382e0c40b -r 3c9588126dfa components/diffutils/Makefile
--- a/components/diffutils/Makefile	Fri Jun 24 06:17:23 2011 -0700
+++ b/components/diffutils/Makefile	Fri Jun 24 06:21:17 2011 -0700
@@ -36,7 +36,6 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-CONFIGURE_OPTIONS  +=		--program-prefix=g
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
diff -r 6cd382e0c40b -r 3c9588126dfa components/diffutils/diffutils.p5m
--- a/components/diffutils/diffutils.p5m	Fri Jun 24 06:17:23 2011 -0700
+++ b/components/diffutils/diffutils.p5m	Fri Jun 24 06:21:17 2011 -0700
@@ -95,10 +95,10 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/gcmp
-file path=usr/bin/gdiff
-file path=usr/bin/gdiff3
-file path=usr/bin/gsdiff
+file usr/bin/cmp path=usr/gnu/bin/cmp
+file usr/bin/diff path=usr/gnu/bin/diff
+file usr/bin/diff3 path=usr/gnu/bin/diff3
+file usr/bin/sdiff path=usr/gnu/bin/sdiff
 file path=usr/share/info/diff.info
 file path=usr/share/locale/ca/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/cs/LC_MESSAGES/diffutils.mo
@@ -124,23 +124,27 @@
 file path=usr/share/locale/sv/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/tr/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/diffutils.mo
-file path=usr/share/man/man1/gcmp.1
-file path=usr/share/man/man1/gdiff.1
-file path=usr/share/man/man1/gdiff3.1
-file path=usr/share/man/man1/gsdiff.1
+file usr/share/man/man1/cmp.1 path=usr/gnu/share/man/man1/cmp.1
+file usr/share/man/man1/diff.1 path=usr/gnu/share/man/man1/diff.1
+file usr/share/man/man1/diff3.1 path=usr/gnu/share/man/man1/diff3.1
+file usr/share/man/man1/sdiff.1 path=usr/gnu/share/man/man1/sdiff.1
 legacy pkg=SUNWgnu-diffutils \
     desc="GNU diffutils - Finds differences between and among files (2.8.7)" \
     name="GNU diffutils"
 license diffutils.license license=GPLv2
-link path=usr/gnu/bin/cmp target=../../bin/gcmp
-link path=usr/gnu/bin/diff target=../../bin/gdiff
-link path=usr/gnu/bin/diff3 target=../../bin/gdiff3
-link path=usr/gnu/bin/sdiff target=../../bin/gsdiff
-link path=usr/gnu/share/man/man1/cmp.1 \
-    target=../../../../share/man/man1/gcmp.1
-link path=usr/gnu/share/man/man1/diff.1 \
-    target=../../../../share/man/man1/gdiff.1
-link path=usr/gnu/share/man/man1/diff3.1 \
-    target=../../../../share/man/man1/gdiff3.1
-link path=usr/gnu/share/man/man1/sdiff.1 \
-    target=../../../../share/man/man1/gsdiff.1
+link path=usr/bin/gcmp \
+    target=../gnu/bin/cmp facet.compat.gnulinks=true
+link path=usr/bin/gdiff \
+    target=../gnu/bin/diff facet.compat.gnulinks=true
+link path=usr/bin/gdiff3 \
+    target=../gnu/bin/diff3 facet.compat.gnulinks=true
+link path=usr/bin/gsdiff \
+    target=../gnu/bin/sdiff facet.compat.gnulinks=true
+link path=usr/share/man/man1/gcmp.1 \
+    target=../../../gnu/share/man/man1/cmp.1 facet.compat.gnulinks=true
+link path=usr/share/man/man1/gdiff.1 \
+    target=../../../gnu/share/man/man1/diff.1 facet.compat.gnulinks=true
+link path=usr/share/man/man1/gdiff3.1 \
+    target=../../../gnu/share/man/man1/diff3.1 facet.compat.gnulinks=true
+link path=usr/share/man/man1/gsdiff.1 \
+    target=../../../gnu/share/man/man1/sdiff.1 facet.compat.gnulinks=true