r1672 - trunk/gzip

robert at linuxfromscratch.org robert at linuxfromscratch.org
Sun Sep 10 19:55:45 PDT 2006


Author: robert
Date: 2006-09-10 20:55:45 -0600 (Sun, 10 Sep 2006)
New Revision: 1672

Modified:
   trunk/gzip/gzip-1.3.5-scriptsdir-1.patch
Log:
Fixed brokenness in gzip-1.3.5-scriptsdir-1.patch

Modified: trunk/gzip/gzip-1.3.5-scriptsdir-1.patch
===================================================================
--- trunk/gzip/gzip-1.3.5-scriptsdir-1.patch	2006-09-11 02:33:49 UTC (rev 1671)
+++ trunk/gzip/gzip-1.3.5-scriptsdir-1.patch	2006-09-11 02:55:45 UTC (rev 1672)
@@ -24,7 +24,7 @@
 
 diff -Naur gzip-1.3.5.orig/ChangeLog gzip-1.3.5/ChangeLog
 --- gzip-1.3.5.orig/ChangeLog	2002-09-30 09:20:09.000000000 +0000
-+++ gzip-1.3.5/ChangeLog	2006-09-11 01:35:54.000000000 +0000
++++ gzip-1.3.5/ChangeLog	2006-09-11 02:52:47.000000000 +0000
 @@ -1,3 +1,16 @@
 +2006-09-10 Robert Connolly <robert at linuxfromscratch.org>
 +	* configure.in: Added --with-scripts-dir=DIR so scripts and binaries
@@ -44,13 +44,12 @@
  	* NEWS, README, revision.h, configure.in (AM_INIT_AUTOMAKE):
 diff -Naur gzip-1.3.5.orig/Makefile.am gzip-1.3.5/Makefile.am
 --- gzip-1.3.5.orig/Makefile.am	2002-09-29 18:18:50.000000000 +0000
-+++ gzip-1.3.5/Makefile.am	2006-09-11 01:35:54.000000000 +0000
-@@ -71,18 +71,16 @@
- 	sed \
++++ gzip-1.3.5/Makefile.am	2006-09-11 02:52:59.000000000 +0000
+@@ -72,17 +72,16 @@
  		-e '$(SEDCMD)' \
  		-e 's|/bin/sh|$(SHELL)|g' \
--		-e 's|BINDIR|$(bindir)|g' \
-+		-e 's|BINDIR|$(SHELL_PATH_PREFIX)|' \
+ 		-e 's|BINDIR|$(bindir)|g' \
++		-e 's|SCRIPTSDIR|$(SHELL_PATH_PREFIX)|' \
  		$(srcdir)/$@.in >$@
  	chmod a+x $@
  
@@ -66,7 +65,7 @@
  	  *) continue;; \
  	  esac; \
  	  transform='$(transform)'; \
-@@ -95,14 +93,51 @@
+@@ -95,14 +94,51 @@
  	     rm -f "$$dest" && \
  	     case $@ in \
  	     install-exec-hook) \
@@ -122,7 +121,7 @@
  MAINTAINERCLEANFILES = gzip.doc
 diff -Naur gzip-1.3.5.orig/configure.in gzip-1.3.5/configure.in
 --- gzip-1.3.5.orig/configure.in	2002-09-30 09:28:09.000000000 +0000
-+++ gzip-1.3.5/configure.in	2006-09-11 01:36:29.000000000 +0000
++++ gzip-1.3.5/configure.in	2006-09-11 02:52:47.000000000 +0000
 @@ -18,7 +18,7 @@
  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  # 02111-1307, USA.
@@ -151,3 +150,85 @@
  # cc -E produces incorrect asm files on SVR4, we must use /lib/cpp.
  test -z "$ASCPP" && test -f /lib/cpp && ASCPP=/lib/cpp
  test -z "$ASCPP" && ASCPP="$CPP"
+diff -Naur gzip-1.3.5.orig/gzexe.in gzip-1.3.5/gzexe.in
+--- gzip-1.3.5.orig/gzexe.in	2002-09-28 06:18:11.000000000 +0000
++++ gzip-1.3.5/gzexe.in	2006-09-11 02:52:47.000000000 +0000
+@@ -33,7 +33,7 @@
+ # 02111-1307, USA.
+ 
+ 
+-PATH="BINDIR:$PATH"
++PATH="SCRIPTSDIR:$PATH"
+ x=`basename $0`
+ if test $# = 0; then
+   echo compress executables. original file foo is renamed to foo~
+diff -Naur gzip-1.3.5.orig/zdiff.in gzip-1.3.5/zdiff.in
+--- gzip-1.3.5.orig/zdiff.in	2002-09-26 08:33:24.000000000 +0000
++++ gzip-1.3.5/zdiff.in	2006-09-11 02:52:47.000000000 +0000
+@@ -10,7 +10,7 @@
+ # necessary) and fed to cmp or diff.  The exit status from cmp
+ # or diff is preserved.
+ 
+-PATH="BINDIR:$PATH"; export PATH
++PATH="SCRIPTSDIR:$PATH"; export PATH
+ prog=`echo $0 | sed 's|.*/||'`
+ case "$prog" in
+   *cmp) comp=${CMP-cmp}   ;;
+diff -Naur gzip-1.3.5.orig/zforce.in gzip-1.3.5/zforce.in
+--- gzip-1.3.5.orig/zforce.in	2002-09-29 06:01:53.000000000 +0000
++++ gzip-1.3.5/zforce.in	2006-09-11 02:52:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ # 02111-1307, USA.
+ 
+ 
+-PATH="BINDIR:$PATH"; export PATH
++PATH="SCRIPTSDIR:$PATH"; export PATH
+ x=`basename $0`
+ if test $# = 0; then
+   echo "force a '.gz' extension on all gzip files"
+diff -Naur gzip-1.3.5.orig/zgrep.in gzip-1.3.5/zgrep.in
+--- gzip-1.3.5.orig/zgrep.in	2002-09-28 05:53:14.000000000 +0000
++++ gzip-1.3.5/zgrep.in	2006-09-11 02:52:47.000000000 +0000
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+ 
+-PATH="BINDIR:$PATH"; export PATH
++PATH="SCRIPTSDIR:$PATH"; export PATH
+ 
+ prog=`echo $0 | sed 's|.*/||'`
+ case "$prog" in
+diff -Naur gzip-1.3.5.orig/zless.in gzip-1.3.5/zless.in
+--- gzip-1.3.5.orig/zless.in	2002-09-29 07:14:43.000000000 +0000
++++ gzip-1.3.5/zless.in	2006-09-11 02:52:47.000000000 +0000
+@@ -1,5 +1,5 @@
+ :
+ #!/bin/sh
+-PATH="BINDIR:$PATH"; export PATH
++PATH="SCRIPTSDIR:$PATH"; export PATH
+ LESSOPEN="|gzip -cdfq %s"; export LESSOPEN
+ exec less "$@"
+diff -Naur gzip-1.3.5.orig/zmore.in gzip-1.3.5/zmore.in
+--- gzip-1.3.5.orig/zmore.in	2002-09-28 08:19:37.000000000 +0000
++++ gzip-1.3.5/zmore.in	2006-09-11 02:52:47.000000000 +0000
+@@ -19,7 +19,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+ 
+-PATH="BINDIR:$PATH"; export PATH
++PATH="SCRIPTSDIR:$PATH"; export PATH
+ if test "`echo -n a`" = "-n a"; then
+   # looks like a SysV system:
+   n1=''; n2='\c'
+diff -Naur gzip-1.3.5.orig/znew.in gzip-1.3.5/znew.in
+--- gzip-1.3.5.orig/znew.in	2002-09-27 06:17:09.000000000 +0000
++++ gzip-1.3.5/znew.in	2006-09-11 02:52:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ :
+ #!/bin/sh
+ 
+-PATH="BINDIR:$PATH"; export PATH
++PATH="SCRIPTSDIR:$PATH"; export PATH
+ check=0
+ pipe=0
+ opt=




More information about the patches mailing list