From 529109e5d8f0aae1921a4000fdd1f4b81c631838 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Jan 2012 13:33:21 +0100 Subject: update to latest stable version --- package/gawk/Makefile | 4 +- package/gawk/patches/patch-Makefile_in | 6 +- package/gawk/patches/patch-configh_in | 45 --------- package/gawk/patches/patch-test_Maketests | 156 ++++++++++++++++++++++++++++-- 4 files changed, 153 insertions(+), 58 deletions(-) delete mode 100644 package/gawk/patches/patch-configh_in diff --git a/package/gawk/Makefile b/package/gawk/Makefile index 29bd9d162..fe1429441 100644 --- a/package/gawk/Makefile +++ b/package/gawk/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gawk -PKG_VERSION:= 3.1.7 +PKG_VERSION:= 4.0.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= a38d5dec19320ace01f1d16c8beb1363 +PKG_MD5SUM:= 51e417b71287629940051e6f652c6492 PKG_DESCR:= GNU awk PKG_SECTION:= lang PKG_URL:= http://www.gnu.org/software/gawk/ diff --git a/package/gawk/patches/patch-Makefile_in b/package/gawk/patches/patch-Makefile_in index 6581d289a..d829ec7dc 100644 --- a/package/gawk/patches/patch-Makefile_in +++ b/package/gawk/patches/patch-Makefile_in @@ -1,6 +1,6 @@ ---- gawk-3.1.7.orig/Makefile.in 2009-07-21 21:29:59.000000000 +0200 -+++ gawk-3.1.7/Makefile.in 2010-02-23 21:42:10.887094938 +0100 -@@ -364,8 +364,7 @@ SUBDIRS = \ +--- gawk-4.0.0.orig/Makefile.in 2011-06-24 10:16:13.000000000 +0200 ++++ gawk-4.0.0/Makefile.in 2012-01-22 13:30:46.000000000 +0100 +@@ -349,8 +349,7 @@ SUBDIRS = \ . \ awklib \ doc \ diff --git a/package/gawk/patches/patch-configh_in b/package/gawk/patches/patch-configh_in deleted file mode 100644 index fc0b26f6c..000000000 --- a/package/gawk/patches/patch-configh_in +++ /dev/null @@ -1,45 +0,0 @@ ---- gawk-3.1.7.orig/configh.in 2009-07-21 21:30:16.000000000 +0200 -+++ gawk-3.1.7/configh.in 2010-02-23 21:33:27.689776531 +0100 -@@ -227,10 +227,10 @@ - /* Define to 1 if you have the `strtoul' function. */ - #undef HAVE_STRTOUL - --/* Define to 1 if `st_blksize' is member of `struct stat'. */ -+/* Define to 1 if `struct stat' is a member of `st_blksize'. */ - #undef HAVE_STRUCT_STAT_ST_BLKSIZE - --/* Define to 1 if `tm_zone' is member of `struct tm'. */ -+/* Define to 1 if `struct tm' is a member of `tm_zone'. */ - #undef HAVE_STRUCT_TM_TM_ZONE - - /* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use -@@ -345,6 +345,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -@@ -452,13 +455,14 @@ - nothing if this is not supported. Do not define if restrict is - supported directly. */ - #undef restrict --/* Work around a bug in Sun C++: it does not support _Restrict, even -- though the corresponding Sun C compiler does, which causes -- "#define restrict _Restrict" in the previous line. Perhaps some future -- version of Sun C++ will work with _Restrict; if so, it'll probably -- define __RESTRICT, just as Sun C does. */ -+/* Work around a bug in Sun C++: it does not support _Restrict or -+ __restrict__, even though the corresponding Sun C compiler ends up with -+ "#define restrict _Restrict" or "#define restrict __restrict__" in the -+ previous line. Perhaps some future version of Sun C++ will work with -+ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ - #if defined __SUNPRO_CC && !defined __RESTRICT - # define _Restrict -+# define __restrict__ - #endif - - /* Define to `unsigned int' if does not define. */ diff --git a/package/gawk/patches/patch-test_Maketests b/package/gawk/patches/patch-test_Maketests index bd6953249..ea1a5b770 100644 --- a/package/gawk/patches/patch-test_Maketests +++ b/package/gawk/patches/patch-test_Maketests @@ -1,6 +1,6 @@ ---- gawk-3.1.7.orig/test/Maketests 2009-07-03 11:31:17.000000000 +0200 -+++ gawk-3.1.7/test/Maketests 2010-02-23 21:33:39.639777383 +0100 -@@ -1,1028 +0,0 @@ +--- gawk-4.0.0.orig/test/Maketests 2011-06-24 10:26:54.000000000 +0200 ++++ gawk-4.0.0/test/Maketests 2012-01-22 13:29:30.000000000 +0100 +@@ -1,1168 +0,0 @@ -Gt-dummy: -# file Maketests, generated from Makefile.am by the Gentests program -addcomma: @@ -173,6 +173,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-delargv: +- @echo delargv +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -delarpm2: - @echo delarpm2 - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -188,6 +193,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-dfastress: +- @echo dfastress +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -dynlj: - @echo dynlj - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -203,6 +213,16 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-fcall_exit: +- @echo fcall_exit +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-fcall_exit2: +- @echo fcall_exit2 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -fldchg: - @echo fldchg - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -248,6 +268,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-forref: +- @echo forref +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -forsimp: - @echo forsimp - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -408,6 +433,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-negrange: +- @echo negrange +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -nested: - @echo nested - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -493,6 +523,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-ofmta: +- @echo ofmta +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -ofmtbig: - @echo ofmtbig - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -558,6 +593,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-posix2008sub: +- @echo posix2008sub +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -prdupval: - @echo prdupval - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -593,16 +633,16 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - --psx96sub: -- @echo psx96sub -- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ -- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ -- -rand: - @echo rand - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-range1: +- @echo range1 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -rebt8b1: - @echo rebt8b1 - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -613,6 +653,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-regrange: +- @echo regrange +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -reindops: - @echo reindops - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -773,6 +818,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-uninit5: +- @echo uninit5 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -uninitialized: - @echo uninitialized - @AWKPATH=$(srcdir) $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -813,6 +863,36 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-aadelete1: +- @echo aadelete1 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-aadelete2: +- @echo aadelete2 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-aarray1: +- @echo aarray1 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-aasort: +- @echo aasort +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-aasorti: +- @echo aasorti +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-arraysort: +- @echo arraysort +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -backw: - @echo backw - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -823,11 +903,31 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-delsub: +- @echo delsub +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -fieldwdth: - @echo fieldwdth - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-fpat1: +- @echo fpat1 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-fpat2: +- @echo fpat2 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-fpatnull: +- @echo fpatnull +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -fsfwfs: - @echo fsfwfs - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -903,6 +1003,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-indirectcall: +- @echo indirectcall +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -lint: - @echo lint - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -913,6 +1018,11 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk --lint-old < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-lintwarn: +- @echo lintwarn +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -match1: - @echo match1 - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -928,11 +1038,21 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-nastyparm: +- @echo nastyparm +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -nondec: - @echo nondec - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-patsplit: +- @echo patsplit +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -posix: - @echo posix - @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -968,11 +1088,31 @@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-sortfor: +- @echo sortfor +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-sortu: +- @echo sortu +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- +-splitarg4: +- @echo splitarg4 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -strtonum: - @echo strtonum - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - +-switch2: +- @echo switch2 +- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +- -double1: - @echo double1 - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ -- cgit v1.2.3