From 0ddd91a2b65a7d2d04f3a5d963d8bee8cb17a4f9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 4 May 2015 18:57:16 +0000
Subject: [PATCH] gawk: bump version

---
 .../{gawk-4.1.0.recipe => gawk-4.1.2.recipe}  |  7 ++--
 sys-apps/gawk/patches/gawk-4.1.0.patchset     | 28 ---------------
 sys-apps/gawk/patches/gawk-4.1.2.patchset     | 34 +++++++++++++++++++
 3 files changed, 38 insertions(+), 31 deletions(-)
 rename sys-apps/gawk/{gawk-4.1.0.recipe => gawk-4.1.2.recipe} (92%)
 delete mode 100644 sys-apps/gawk/patches/gawk-4.1.0.patchset
 create mode 100644 sys-apps/gawk/patches/gawk-4.1.2.patchset

diff --git a/sys-apps/gawk/gawk-4.1.0.recipe b/sys-apps/gawk/gawk-4.1.2.recipe
similarity index 92%
rename from sys-apps/gawk/gawk-4.1.0.recipe
rename to sys-apps/gawk/gawk-4.1.2.recipe
index eecc606bb..6e64cede1 100644
--- a/sys-apps/gawk/gawk-4.1.0.recipe
+++ b/sys-apps/gawk/gawk-4.1.2.recipe
@@ -12,13 +12,13 @@ makes it possible to handle simple data-reformatting jobs with just a \
 few lines of code.
 "
 HOMEPAGE="http://www.gnu.org/s/gawk" 
-SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.1.0.tar.gz"
+SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-$portVersion.tar.gz"
 CHECKSUM_SHA256="79f81b09bc3cce50e083f78acc0f91783821ad30866615d30dd1731f17ec440b"
-REVISION="2"
+REVISION="1"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1983-2013 Free Software Foundation, Inc."
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-PATCHES="gawk-4.1.0.patchset"
+PATCHES="gawk-$portVersion.patchset"
 
 PROVIDES="
 	gawk = $portVersion compat >= 4
@@ -42,6 +42,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:makeinfo
 	cmd:sed
+	cmd:yacc
 	"
 
 defineDebugInfoPackage gawk \
diff --git a/sys-apps/gawk/patches/gawk-4.1.0.patchset b/sys-apps/gawk/patches/gawk-4.1.0.patchset
deleted file mode 100644
index 992aa9cdb..000000000
--- a/sys-apps/gawk/patches/gawk-4.1.0.patchset
+++ /dev/null
@@ -1,28 +0,0 @@
-From e5661558712bbd6f1e688fb564732bd3ca80ac63 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Tue, 25 Feb 2014 19:38:04 +0000
-Subject: avoids unsupported CFLAGS
-
-
-diff --git a/extension/configure.ac b/extension/configure.ac
-index 53ed588..d9b41f5 100644
---- a/extension/configure.ac
-+++ b/extension/configure.ac
-@@ -47,10 +47,10 @@ dnl AC_PROG_INSTALL
- 
- AC_SUBST([pkgextensiondir], ['${libdir}/gawk'])
- 
--if test "$GCC" = yes
--then
--	CFLAGS="$CFLAGS -Wall -Wextra"
--fi
-+#if test "$GCC" = yes
-+#then
-+#	CFLAGS="$CFLAGS -Wall -Wextra"
-+#fi
- 
- AC_MSG_CHECKING([for special development options])
- if test -f $srcdir/../.developing
--- 
-1.8.3.4
-
diff --git a/sys-apps/gawk/patches/gawk-4.1.2.patchset b/sys-apps/gawk/patches/gawk-4.1.2.patchset
new file mode 100644
index 000000000..16144e939
--- /dev/null
+++ b/sys-apps/gawk/patches/gawk-4.1.2.patchset
@@ -0,0 +1,34 @@
+From 8e62f11fa3e9de98b46ecd516d08a58690586040 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 4 May 2015 18:51:15 +0000
+Subject: Haiku patch
+
+
+diff --git a/getopt.c b/getopt.c
+index 4de0b9a..715790e 100644
+--- a/getopt.c
++++ b/getopt.c
+@@ -30,6 +30,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C
+diff --git a/io.c b/io.c
+index 2344c2a..61fe6ac 100644
+--- a/io.c
++++ b/io.c
+@@ -46,6 +46,8 @@
+ #define	S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+ #endif
+ 
++#include <sys/select.h>
++
+ #ifdef HAVE_TERMIOS_H
+ #include <termios.h>
+ #endif
+-- 
+1.8.3.4
+