# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1333131934 25200
# Node ID e7d0aed114ef35a05e666371d9a3560ef335d64d
# Parent  d1217fe19986a8bb2553c475d2ddbb101339ce9c
7157429 gzip 1.4 integration still has a couple of problems

diff -r d1217fe19986 -r e7d0aed114ef components/gzip/Makefile
--- a/components/gzip/Makefile	Thu Mar 29 12:23:14 2012 -0700
+++ b/components/gzip/Makefile	Fri Mar 30 11:25:34 2012 -0700
@@ -34,6 +34,9 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# To get correct @bindir@ substitution in the various gz<whatever> scripts.
+CONFIGURE_BINDIR.64 =   $(CONFIGURE_PREFIX)/bin
+
 CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 
@@ -52,7 +55,7 @@
 
 # Rename installed programs and man pages in proto dir (z*->gz*).
 COMPONENT_POST_INSTALL_ACTION = \
-	(for dir in $(PROTOUSRBINDIR)/$(MACH64) $(PROTOUSRSHAREMAN1DIR) ; do \
+	(for dir in $(PROTOUSRBINDIR) $(PROTOUSRSHAREMAN1DIR) ; do \
 		cd $$dir; \
 	 	for zfile in `ls z*`; do \
 			mv $$zfile g$$zfile ; \
diff -r d1217fe19986 -r e7d0aed114ef components/gzip/gzip.p5m
--- a/components/gzip/gzip.p5m	Thu Mar 29 12:23:14 2012 -0700
+++ b/components/gzip/gzip.p5m	Fri Mar 30 11:25:34 2012 -0700
@@ -39,19 +39,19 @@
 dir path=usr/share/info
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file usr/bin/$(MACH64)/gunzip path=usr/bin/gunzip
-file usr/bin/$(MACH64)/gzcat path=usr/bin/gzcat
-file usr/bin/$(MACH64)/gzcmp path=usr/bin/gzcmp
-file usr/bin/$(MACH64)/gzdiff path=usr/bin/gzdiff
-file usr/bin/$(MACH64)/gzexe path=usr/bin/gzexe
-file usr/bin/$(MACH64)/gzegrep path=usr/bin/gzegrep
-file usr/bin/$(MACH64)/gzfgrep path=usr/bin/gzfgrep
-file usr/bin/$(MACH64)/gzforce path=usr/bin/gzforce
-file usr/bin/$(MACH64)/gzgrep path=usr/bin/gzgrep
-file usr/bin/$(MACH64)/gzip path=usr/bin/gzip
-file usr/bin/$(MACH64)/gzless path=usr/bin/gzless
-file usr/bin/$(MACH64)/gzmore path=usr/bin/gzmore
-file usr/bin/$(MACH64)/gznew path=usr/bin/gznew
+file path=usr/bin/gunzip
+file path=usr/bin/gzcat
+file path=usr/bin/gzcmp
+file path=usr/bin/gzdiff
+file path=usr/bin/gzexe
+file path=usr/bin/gzegrep
+file path=usr/bin/gzfgrep
+file path=usr/bin/gzforce
+file path=usr/bin/gzgrep
+file path=usr/bin/gzip
+file path=usr/bin/gzless
+file path=usr/bin/gzmore
+file path=usr/bin/gznew
 file path=usr/share/info/gzip.info
 file path=usr/share/man/man1/gunzip.1
 file path=usr/share/man/man1/gzcat.1
diff -r d1217fe19986 -r e7d0aed114ef components/gzip/patches/zgrep-f.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gzip/patches/zgrep-f.patch	Fri Mar 30 11:25:34 2012 -0700
@@ -0,0 +1,11 @@
+--- gzip-1.4/tests/zgrep-f.orig	2012-03-29 11:21:18.457617592 -0700
++++ gzip-1.4/tests/zgrep-f	2012-03-29 11:21:56.078983515 -0700
+@@ -32,7 +32,7 @@
+ 
+ 
+ fail=0
+-zgrep -f - haystack.gz < n > out 2>&1 || fail=1
++zgrep --__bindir /usr/gnu/bin -f - haystack.gz < n > out 2>&1 || fail=1
+ 
+ compare out n || fail=1
+ 
diff -r d1217fe19986 -r e7d0aed114ef components/gzip/patches/zgrep.in.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gzip/patches/zgrep.in.patch	Fri Mar 30 11:25:34 2012 -0700
@@ -0,0 +1,15 @@
+--- gzip-1.4/zgrep.in.orig	2012-03-29 11:17:35.341079056 -0700
++++ gzip-1.4/zgrep.in	2012-03-29 11:18:46.475732896 -0700
+@@ -26,7 +26,11 @@
+ esac
+ PATH=$bindir:$PATH
+ 
+-grep='${GREP-grep}'
++case "$1" in
++	-F) grep='${FGREP-fgrep}'; shift;;
++	-E) grep='${EGREP-egrep}'; shift;;
++	*)  grep='${GREP-grep}';;
++esac
+ 
+ version='zgrep (gzip) @VERSION@
+ Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.