- gawk patch

Changed files:
    gawk-DESTDIR.patch -> 1.1
    gawk-mktemp.patch -> 1.1

diff --git a/gawk-DESTDIR.patch b/gawk-DESTDIR.patch
new file mode 100644 (file)
index 0000000..464b488
--- /dev/null
+++ b/gawk-DESTDIR.patch
@@ -0,0 +1,95 @@
+diff -ur gawk-3.0.3.old/Makefile.in gawk-3.0.3/Makefile.in
+--- gawk-3.0.3.old/Makefile.in Tue May 13 18:37:41 1997
++++ gawk-3.0.3/Makefile.in     Tue May 25 20:06:57 1999
+@@ -54,6 +54,8 @@
+ datadir = @datadir@/awk
+ libexecdir = @libexecdir@/awk
+ 
++DESTDIR =
++
+ DEFPATH = ".:$(datadir)"
+ 
+ SHELL = /bin/sh
+@@ -173,11 +175,11 @@
+ alloca.o:     alloca.c
+ 
+ install:      gawk info installdirs
+-      -rm -f $(bindir)/gawk
++      -rm -f $(DESTDIR)$(bindir)/gawk
+       fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h` ; \
+-      $(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \
+-      (cd $(bindir); $(LN) $$fullname gawk)
+-      (cd $(bindir); \
++      $(INSTALL_PROGRAM) gawk $(DESTDIR)$(bindir)/$$fullname ; \
++      (cd $(DESTDIR)$(bindir); $(LN) $$fullname gawk)
++      (cd $(DESTDIR)$(bindir); \
+       if [ ! -f awk ]; \
+       then    $(LN_S) gawk awk; \
+       fi; exit 0)
+@@ -185,8 +187,9 @@
+       cd awklib && $(MAKE) install
+ 
+ installdirs: mkinstalldirs
+-      $(srcdir)/mkinstalldirs $(bindir) $(datadir) \
+-              $(libdir) $(infodir) $(mandir) $(libexecdir)
++      $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
++              $(DESTDIR)$(libdir) $(DESTDIR)$(infodir) $(DESTDIR)$(mandir) \
++              $(DESTDIR)$(libexecdir)
+ 
+ uninstall:
+       (cd $(bindir); \
+diff -ur gawk-3.0.3.old/awklib/Makefile.in gawk-3.0.3/awklib/Makefile.in
+--- gawk-3.0.3.old/awklib/Makefile.in  Fri May  2 03:36:13 1997
++++ gawk-3.0.3/awklib/Makefile.in      Tue May 25 20:09:14 1999
+@@ -73,13 +73,13 @@
+       sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
+ 
+ install: igawk $(AUXPROGS) $(AUXAWK)
+-      $(INSTALL_PROGRAM) igawk $(bindir)/igawk
++      $(INSTALL_PROGRAM) igawk $(DESTDIR)$(bindir)/igawk
+       for i in $(AUXPROGS) ; do \
+-              $(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
++              $(INSTALL_PROGRAM) $$i $(DESTDIR)$(libexecdir)/$$i ; \
+       done
+       for i in $(AUXAWK) $(srcdir)/eg/lib/*.awk ; do \
+               progname=`echo $$i | sed 's;.*/;;'` ; \
+-              $(INSTALL_DATA) $$i $(datadir)/$$progname ; \
++              $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/$$progname ; \
+       done
+ 
+ # libexecdir and datadir are removed in the top level Makefile's uninstall
+diff -ur gawk-3.0.3.old/doc/Makefile.in gawk-3.0.3/doc/Makefile.in
+--- gawk-3.0.3.old/doc/Makefile.in     Thu May 15 03:36:15 1997
++++ gawk-3.0.3/doc/Makefile.in Tue May 25 20:16:40 1999
+@@ -69,23 +69,23 @@
+ 
+ all: $(DOCS) info
+ 
+-install: $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info
++install: $(DESTDIR)$(mandir)/gawk$(manext) $(DESTDIR)$(mandir)/igawk$(manext) $(DESTDIR)$(infodir)/gawk.info
+ 
+-$(infodir)/gawk.info: gawk.info
++$(DESTDIR)$(infodir)/gawk.info: gawk.info
+       -if test -f gawk.info; then d=.; \
+       else d=$(srcdir); fi; \
+       for i in $$d/gawk.info*; do \
+-              $(INSTALL_DATA) $$i $(infodir)/$i ; \
++              $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$i ; \
+       done; \
+       if $(SHELL) -c 'install-info --version' > /dev/null 2>&1 ; \
+-      then install-info --info-dir=$(infodir) gawk.info ; \
++      then install-info --info-dir=$(DESTDIR)$(infodir) gawk.info ; \
+       else true ; fi; exit 0
+ 
+-$(mandir)/gawk$(manext): gawk.1
+-      $(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/gawk$(manext)
++$(DESTDIR)$(mandir)/gawk$(manext): gawk.1
++      $(INSTALL_DATA) $(srcdir)/gawk.1 $(DESTDIR)$(mandir)/gawk$(manext)
+ 
+-$(mandir)/igawk$(manext): igawk.1
+-      $(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/igawk$(manext)
++$(DESTDIR)$(mandir)/igawk$(manext): igawk.1
++      $(INSTALL_DATA) $(srcdir)/igawk.1 $(DESTDIR)$(mandir)/igawk$(manext)
+ 
+ uninstall:
+       rm -f $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info*

diff --git a/gawk-mktemp.patch b/gawk-mktemp.patch
new file mode 100644 (file)
index 0000000..25b5f89
--- /dev/null
+++ b/gawk-mktemp.patch
@@ -0,0 +1,86 @@
+--- gawk-3.0.3.orig/awklib/eg/prog/igawk.sh
++++ gawk-3.0.3/awklib/eg/prog/igawk.sh
+@@ -4,13 +4,16 @@
+ # Arnold Robbins, arnold@gnu.ai.mit.edu, Public Domain
+ # July 1993
+ 
++igs=`mktemp /tmp/ig.s.XXXXXX` || exit 1
++ige=`mktemp /tmp/ig.e.XXXXXX` || exit 1
++
+ if [ "$1" = debug ]
+ then
+     set -x
+     shift
+ else
+     # cleanup on exit, hangup, interrupt, quit, termination
+-    trap 'rm -f /tmp/ig.[se].$$' 0 1 2 3 15
++    trap 'rm -f $igs $ige' 0 1 2 3 15
+ fi
+ 
+ while [ $# -ne 0 ] # loop over arguments
+@@ -27,26 +30,26 @@
+ 
+     -[vF]*) opts="$opts '$1'" ;;
+ 
+-    -f)     echo @include "$2" >> /tmp/ig.s.$$
++    -f)     echo @include "$2" >> $igs
+             shift;;
+ 
+     -f*)    f=`echo "$1" | sed 's/-f//'`
+-            echo @include "$f" >> /tmp/ig.s.$$ ;;
++            echo @include "$f" >> $igs ;;
+ 
+     -?file=*)    # -Wfile or --file
+             f=`echo "$1" | sed 's/-.file=//'`
+-            echo @include "$f" >> /tmp/ig.s.$$ ;;
++            echo @include "$f" >> $igs ;;
+ 
+     -?file)    # get arg, $2
+-            echo @include "$2" >> /tmp/ig.s.$$
++            echo @include "$2" >> $igs
+             shift;;
+ 
+     -?source=*)    # -Wsource or --source
+             t=`echo "$1" | sed 's/-.source=//'`
+-            echo "$t" >> /tmp/ig.s.$$ ;;
++            echo "$t" >> $igs ;;
+ 
+     -?source)  # get arg, $2
+-            echo "$2" >> /tmp/ig.s.$$
++            echo "$2" >> $igs
+             shift;;
+ 
+     -?version)
+@@ -61,19 +64,19 @@
+     shift
+ done
+ 
+-if [ ! -s /tmp/ig.s.$$ ]
++if [ ! -s $igs ]
+ then
+     if [ -z "$1" ]
+     then
+          echo igawk: no program! 1>&2
+          exit 1
+     else
+-        echo "$1" > /tmp/ig.s.$$
++        echo "$1" > $igs
+         shift
+     fi
+ fi
+ 
+-# at this point, /tmp/ig.s.$$ has the program
++# at this point, $igs has the program
+ gawk -- '
+ # process @include directives
+ 
+@@ -124,7 +127,7 @@
+         }
+         close(input[stackptr])
+     }
+-}' /tmp/ig.s.$$ > /tmp/ig.e.$$
+-eval gawk -f /tmp/ig.e.$$ $opts -- "$@"
++}' $igs > $ige
++eval gawk -f $ige $opts -- "$@"
+ 
+ exit $?