From 118a6ea3ad13c69fdddf9ab0714d4ad7b492cd2f Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Fri, 6 Sep 2013 02:20:12 +0200
Subject: [PATCH] gawk: updated to 4.1.0 and fixed build to use host's gawk

---
 gawk/.footprint | 30 +++++++++++++++++++++++++++---
 gawk/.md5sum    |  2 +-
 gawk/Pkgfile    | 12 +++++++-----
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/gawk/.footprint b/gawk/.footprint
index 1d90ba1..0103523 100644
--- a/gawk/.footprint
+++ b/gawk/.footprint
@@ -1,19 +1,42 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/awk -> gawk
--rwxr-xr-x	root/root	usr/bin/dgawk
 -rwxr-xr-x	root/root	usr/bin/gawk
 -rwxr-xr-x	root/root	usr/bin/igawk
--rwxr-xr-x	root/root	usr/bin/pgawk
+drwxr-xr-x	root/root	usr/include/
+-rw-r--r--	root/root	usr/include/gawkapi.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/awk/
 -rwxr-xr-x	root/root	usr/lib/awk/grcat
 -rwxr-xr-x	root/root	usr/lib/awk/pwcat
+drwxr-xr-x	root/root	usr/lib/gawk/
+-rwxr-xr-x	root/root	usr/lib/gawk/filefuncs.so
+-rwxr-xr-x	root/root	usr/lib/gawk/fnmatch.so
+-rwxr-xr-x	root/root	usr/lib/gawk/fork.so
+-rwxr-xr-x	root/root	usr/lib/gawk/inplace.so
+-rwxr-xr-x	root/root	usr/lib/gawk/ordchr.so
+-rwxr-xr-x	root/root	usr/lib/gawk/readdir.so
+-rwxr-xr-x	root/root	usr/lib/gawk/readfile.so
+-rwxr-xr-x	root/root	usr/lib/gawk/revoutput.so
+-rwxr-xr-x	root/root	usr/lib/gawk/revtwoway.so
+-rwxr-xr-x	root/root	usr/lib/gawk/rwarray.so
+-rwxr-xr-x	root/root	usr/lib/gawk/testext.so
+-rwxr-xr-x	root/root	usr/lib/gawk/time.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
-lrwxrwxrwx	root/root	usr/man/man1/awk.1.gz -> gawk.1.gz
 -rw-r--r--	root/root	usr/man/man1/gawk.1.gz
 -rw-r--r--	root/root	usr/man/man1/igawk.1.gz
+drwxr-xr-x	root/root	usr/man/man3/
+-rw-r--r--	root/root	usr/man/man3/filefuncs.3am.gz
+-rw-r--r--	root/root	usr/man/man3/fnmatch.3am.gz
+-rw-r--r--	root/root	usr/man/man3/fork.3am.gz
+-rw-r--r--	root/root	usr/man/man3/ordchr.3am.gz
+-rw-r--r--	root/root	usr/man/man3/readdir.3am.gz
+-rw-r--r--	root/root	usr/man/man3/readfile.3am.gz
+-rw-r--r--	root/root	usr/man/man3/revoutput.3am.gz
+-rw-r--r--	root/root	usr/man/man3/revtwoway.3am.gz
+-rw-r--r--	root/root	usr/man/man3/rwarray.3am.gz
+-rw-r--r--	root/root	usr/man/man3/time.3am.gz
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/awk/
 -rw-r--r--	root/root	usr/share/awk/assert.awk
@@ -24,6 +47,7 @@ drwxr-xr-x	root/root	usr/share/awk/
 -rw-r--r--	root/root	usr/share/awk/getopt.awk
 -rw-r--r--	root/root	usr/share/awk/gettime.awk
 -rw-r--r--	root/root	usr/share/awk/group.awk
+-rw-r--r--	root/root	usr/share/awk/inplace.awk
 -rw-r--r--	root/root	usr/share/awk/join.awk
 -rw-r--r--	root/root	usr/share/awk/libintl.awk
 -rw-r--r--	root/root	usr/share/awk/noassign.awk
diff --git a/gawk/.md5sum b/gawk/.md5sum
index fe4f9e6..bdb2ab8 100644
--- a/gawk/.md5sum
+++ b/gawk/.md5sum
@@ -1 +1 @@
-a601b032c39cd982f34272664f8afa49  gawk-4.0.1.tar.xz
+b18992ff8faf3217dab55d2d0aa7d707  gawk-4.1.0.tar.xz
diff --git a/gawk/Pkgfile b/gawk/Pkgfile
index b9bc5b4..f31786c 100644
--- a/gawk/Pkgfile
+++ b/gawk/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=gawk
-version=4.0.1
+version=4.1.0
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 
@@ -18,12 +18,14 @@ build() {
               --mandir=/usr/man \
               --enable-switch \
               --disable-nls
+
+  # Use host's gawk
+  sed "s|../gawk\$(EXEEXT)|gawk|g" -i extension/Makefile.in
+
   make
   make DESTDIR=$PKG install
 
   rm -r $PKG/usr/share/info
-  rm $PKG/usr/bin/{gawk,pgawk}-$version \
-     $PKG/usr/man/man1/pgawk.1
-
-  ln -sf gawk.1.gz $PKG/usr/man/man1/awk.1.gz
+  rm $PKG/usr/bin/gawk-$version
+  rm $PKG/usr/lib/gawk/*.la
 }
-- 
2.26.2