changeset 348:b47144567f5a

7031712 Cleanup GNU binaries and their /usr/bin g-name for package: pkg:/text/gnu-patch
author Rich Burridge <rich.burridge@oracle.com>
date Tue, 28 Jun 2011 09:49:08 -0700
parents 3901e2e79ac8
children a239e1ea1705
files components/patch/Makefile components/patch/patch.p5m
diffstat 2 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/components/patch/Makefile	Fri Jun 24 14:10:17 2011 -0700
+++ b/components/patch/Makefile	Tue Jun 28 09:49:08 2011 -0700
@@ -34,7 +34,6 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-CONFIGURE_OPTIONS  +=		--program-prefix=g
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
 # common targets
--- a/components/patch/patch.p5m	Fri Jun 24 14:10:17 2011 -0700
+++ b/components/patch/patch.p5m	Tue Jun 28 09:49:08 2011 -0700
@@ -42,15 +42,15 @@
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/gpatch
-file path=usr/share/man/man1/gpatch.1
-
+file usr/bin/patch path=usr/gnu/bin/patch
+file usr/share/man/man1/patch.1 path=usr/gnu/share/man/man1/patch.1
 
 legacy pkg=SUNWgpch desc="The GNU Patch utility" name="The GNU Patch utility"
 license patch.license license=GPLv2
-link path=usr/bin/patch target=gpatch
-link path=usr/gnu/bin/patch target=../../bin/gpatch
-link path=usr/gnu/share/man/man1/patch.1 \
-    target=../../../../share/man/man1/gpatch.1
-link path=usr/share/man/man1/patch.1 target=gpatch.1
 
+link path=usr/bin/patch target=../gnu/bin/patch
+link path=usr/bin/gpatch target=../gnu/bin/patch facet.compat.gnulinks=true
+link path=usr/share/man/man1/patch.1 \
+    target=../../../gnu/share/man/man1/patch.1
+link path=usr/share/man/man1/gpatch.1 \
+    target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=true