Pullup ticket #3681 - requested by riz

devel/m4: build fixes

Revisions pulled up:
- devel/m4/Makefile                                             1.66
- devel/m4/distinfo                                             1.34
- devel/m4/patches/patch-ab                                     1.12
- devel/m4/patches/patch-ac                                     1.10

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   christos
   Date:           Tue Jan 31 00:58:44 UTC 2012

   Added Files:
           pkgsrc/devel/m4/patches: patch-ab patch-ac

   Log Message:
   update for new fpos_t


   To generate a diff of this commit:
   cvs rdiff -u -r0 -r1.12 pkgsrc/devel/m4/patches/patch-ab
   cvs rdiff -u -r0 -r1.10 pkgsrc/devel/m4/patches/patch-ac

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   christos
   Date:           Tue Jan 31 01:00:13 UTC 2012

   Modified Files:
           pkgsrc/devel/m4: Makefile

   Log Message:
   bump patchlevel


   To generate a diff of this commit:
   cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/m4/Makefile

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   christos
   Date:           Tue Jan 31 01:12:46 UTC 2012

   Modified Files:
           pkgsrc/devel/m4: distinfo

   Log Message:
   update.


   To generate a diff of this commit:
   cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/m4/distinfo

4 files changed, 31 insertions, 2 deletions

diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 956a6efa658..b4507aee8c8 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2011/03/16 14:31:46 wiz Exp $
+# $NetBSD: Makefile,v 1.65.8.1 2012/02/13 20:42:03 spz Exp $
 
 DISTNAME=	m4-1.4.16
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index f01ca8195f2..9284e94a471 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.33 2011/03/16 14:31:46 wiz Exp $
+$NetBSD: distinfo,v 1.33.8.1 2012/02/13 20:42:03 spz Exp $
 
 SHA1 (m4-1.4.16.tar.gz) = 44b3ed8931f65cdab02aee66ae1e49724d2551a4
 RMD160 (m4-1.4.16.tar.gz) = 9b161898b9fb2fc44614e644a0e3bdab3ff1328b
 Size (m4-1.4.16.tar.gz) = 1657870 bytes
 SHA1 (patch-aa) = ef316620b49f78f46e9dea47032b0141814c1f43
+SHA1 (patch-ab) = b29840365e983623bce64e84ceab3504b8270b32
+SHA1 (patch-ac) = 7bd9164c659727a906ef54a2f1027e9fd19315ba
diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-ab
new file mode 100644
index 00000000000..4e4e766c0df
--- /dev/null
+++ b/devel/m4/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.11.4.1 2012/02/13 20:42:03 spz Exp $
+
+--- lib/fseeko.c.orig	2011-03-01 11:39:28.000000000 -0500
++++ lib/fseeko.c	2012-01-30 19:56:49.000000000 -0500
+@@ -109,7 +109,7 @@
+ #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__NetBSD__)
+       /* fp_->_offset is typed as an integer.  */
+       fp_->_offset = pos;
+ # else
diff --git a/devel/m4/patches/patch-ac b/devel/m4/patches/patch-ac
new file mode 100644
index 00000000000..7db52e5d677
--- /dev/null
+++ b/devel/m4/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.9.6.1 2012/02/13 20:42:03 spz Exp $
+
+--- lib/fflush.c.orig	2011-03-01 11:39:27.000000000 -0500
++++ lib/fflush.c	2012-01-30 19:56:16.000000000 -0500
+@@ -91,7 +91,7 @@
+ update_fpos_cache (FILE *fp, off_t pos)
+ {
+ #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__NetBSD__)
+   /* fp_->_offset is typed as an integer.  */
+   fp_->_offset = pos;
+ # else