From: kloczek Date: Thu, 5 Jul 2001 16:42:04 +0000 (+0000) Subject: - outdated. X-Git-Tag: gawk-3_1_0-3~3 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgawk.git;a=commitdiff_plain;h=dced83ac44901dabf8e75d7d549cc3962a6988f7 - outdated. Changed files: gawk-DESTDIR.patch -> 1.4 gawk-mktemp.patch -> 1.3 --- diff --git a/gawk-DESTDIR.patch b/gawk-DESTDIR.patch deleted file mode 100644 index b5e3b49..0000000 --- a/gawk-DESTDIR.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- gawk-3.0.6/doc/Makefile.in.wiget Wed Jun 7 10:48:18 2000 -+++ gawk-3.0.6/doc/Makefile.in Sat Sep 2 09:53:02 2000 -@@ -69,29 +69,29 @@ - - 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:: -+$(DESTDIR)$(infodir)/gawk.info:: - -if test -f gawk.info; then d=.; \ - else d=$(srcdir); fi; \ -- if [ -f $(infodir)/dir -a -f $(infodir)/gawk.info ] \ -- && cmp $$d/gawk.info $(infodir)/gawk.info > /dev/null \ -- && grep '(gawk)' $(infodir)/dir > /dev/null; then \ -+ if [ -f $(DESTDIR)$(infodir)/dir -a -f $(DESTDIR)$(infodir)/gawk.info ] \ -+ && cmp $$d/gawk.info $(DESTDIR)$(infodir)/gawk.info > /dev/null \ -+ && grep '(gawk)' $(DESTDIR)$(infodir)/dir > /dev/null; then \ - exit 0; \ - fi; \ -- $(INSTALL_DATA) $$d/gawk.info $(infodir)/gawk.info ; \ -+ $(INSTALL_DATA) $$d/gawk.info $(DESTDIR)$(infodir)/gawk.info ; \ - 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* -+ rm -f $(DESTDIR)$(mandir)/gawk$(manext) $(DESTDIR)$(mandir)/igawk$(manext) $(DESTDIR)$(infodir)/gawk.info* - - dvi: gawk.dvi - ---- gawk-3.0.6/awklib/Makefile.in.wiget Wed Oct 7 22:33:20 1998 -+++ gawk-3.0.6/awklib/Makefile.in Sat Sep 2 09:51:10 2000 -@@ -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 ---- gawk-3.0.6/Makefile.in.wiget Sun Jun 18 14:14:08 2000 -+++ gawk-3.0.6/Makefile.in Sat Sep 2 09:51:10 2000 -@@ -55,6 +55,8 @@ - datadir = @datadir@/awk - libexecdir = @libexecdir@/awk - -+DESTDIR = -+ - DEFPATH = ".:$(datadir)" - - SHELL = /bin/sh -@@ -175,11 +177,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) -@@ -187,8 +189,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) - - install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install diff --git a/gawk-mktemp.patch b/gawk-mktemp.patch deleted file mode 100644 index 66c11b4..0000000 --- a/gawk-mktemp.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- 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 ${TEMDIR:-/tmp}/ig.s.XXXXXX` || exit 1 -+ige=`mktemp ${TEMDIR:-/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 $?