changeset 344:f3d9af4cada9

7031703 Cleanup GNU binaries and their /usr/bin g-name for package: pkg:/text/gnu-grep
author Rich Burridge <rich.burridge@oracle.com>
date Fri, 24 Jun 2011 13:36:19 -0700
parents 3c9588126dfa
children 61b29cf8b717
files components/ggrep/Makefile components/ggrep/gnu-grep.p5m
diffstat 2 files changed, 21 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/components/ggrep/Makefile	Fri Jun 24 06:21:17 2011 -0700
+++ b/components/ggrep/Makefile	Fri Jun 24 13:36:19 2011 -0700
@@ -38,7 +38,6 @@
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--prefix=/usr
-CONFIGURE_OPTIONS  +=		--program-prefix=g
 
 # common targets
 build:		$(BUILD_32)
--- a/components/ggrep/gnu-grep.p5m	Fri Jun 24 06:21:17 2011 -0700
+++ b/components/ggrep/gnu-grep.p5m	Fri Jun 24 13:36:19 2011 -0700
@@ -130,9 +130,9 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/gegrep
-file path=usr/bin/gfgrep
-file path=usr/bin/ggrep
+file usr/bin/egrep path=usr/gnu/bin/egrep
+file usr/bin/fgrep path=usr/gnu/bin/fgrep
+file usr/bin/grep path=usr/gnu/bin/grep
 file path=usr/share/info/grep.info
 file path=usr/share/locale/af/LC_MESSAGES/grep.mo
 file path=usr/share/locale/be/LC_MESSAGES/grep.mo
@@ -175,21 +175,24 @@
 file path=usr/share/locale/uk/LC_MESSAGES/grep.mo
 file path=usr/share/locale/vi/LC_MESSAGES/grep.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/grep.mo
-file path=usr/share/man/man1/gegrep.1
-file path=usr/share/man/man1/gfgrep.1
-file path=usr/share/man/man1/ggrep.1
+file usr/share/man/man1/egrep.1 path=usr/gnu/share/man/man1/egrep.1
+file usr/share/man/man1/fgrep.1 path=usr/gnu/share/man/man1/fgrep.1
+file usr/share/man/man1/grep.1 path=usr/gnu/share/man/man1/grep.1
 legacy pkg=SUNWggrp desc="ggrep - GNU grep utilities 2.5.4" \
     name="ggrep - GNU grep utilities"
 license gnu-grep.license license=GPLv3
-link path=usr/gnu/bin/egrep target=../../bin/gegrep
-link path=usr/gnu/bin/fgrep target=../../bin/gfgrep
-link path=usr/gnu/bin/grep target=../../bin/ggrep
-link path=usr/gnu/share/man/man1/egrep.1 \
-    target=../../../../share/man/man1/ggrep.1
-link path=usr/gnu/share/man/man1/fgrep.1 \
-    target=../../../../share/man/man1/ggrep.1
-link path=usr/gnu/share/man/man1/grep.1 \
-    target=../../../../share/man/man1/ggrep.1
-link path=usr/sfw/bin/gegrep target=../../bin/gegrep
-link path=usr/sfw/bin/gfgrep target=../../bin/gfgrep
-link path=usr/sfw/bin/ggrep target=../../bin/ggrep
+link path=usr/bin/gegrep \
+    target=../gnu/bin/egrep facet.compat.gnulinks=true
+link path=usr/bin/gfgrep \
+    target=../gnu/bin/fgrep facet.compat.gnulinks=true
+link path=usr/bin/ggrep \
+    target=../gnu/bin/grep facet.compat.gnulinks=true
+link path=usr/share/man/man1/gegrep.1 \
+    target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=true
+link path=usr/share/man/man1/gfgrep.1 \
+    target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=true
+link path=usr/share/man/man1/ggrep.1 \
+    target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=true
+link path=usr/sfw/bin/gegrep target=../../gnu/bin/egrep
+link path=usr/sfw/bin/gfgrep target=../../gnu/bin/fgrep
+link path=usr/sfw/bin/ggrep target=../../gnu/bin/grep