Update to 1.4.17:

* Noteworthy changes in release 1.4.17 (2013-09-22) [stable]

** Fix compilation with newer glibc headers.

** Fix a failure with diverting large amounts of text on mingw (does
   not affect platforms that can rename an open file).

** A number of portability improvements inherited from gnulib.

7 files changed, 21 insertions, 92 deletions

diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 5fde6b803d6..3a3268f3ebd 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2013/09/20 11:41:16 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2013/10/04 21:02:11 wiz Exp $
 
-DISTNAME=	m4-1.4.16
-PKGREVISION=	3
+DISTNAME=	m4-1.4.17
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index d0ef5f74b48..0173c4ea393 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.37 2013/07/19 14:49:28 ryoon Exp $
+$NetBSD: distinfo,v 1.38 2013/10/04 21:02:11 wiz 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
-SHA1 (patch-lib_stdio.in.h) = 1a550d1c2464319d0ba04b5635d9e997d7f4a0dd
-SHA1 (patch-lib_verror.h) = 4c50ab0bc90a6324845e145bbe140836179ca8c9
+SHA1 (m4-1.4.17.tar.gz) = 4f80aed6d8ae3dacf97a0cb6e989845269e342f0
+RMD160 (m4-1.4.17.tar.gz) = d81675f1d358ce5eee27184a9d946acfc97a912b
+Size (m4-1.4.17.tar.gz) = 1820658 bytes
+SHA1 (patch-ab) = 9e9527cdd4b7ba3501d603f0e5ca60c2150e4359
+SHA1 (patch-lib_stdio.in.h) = cc5a8572e274b576a154c7a6b14f0a14de5abacd
diff --git a/devel/m4/patches/patch-aa b/devel/m4/patches/patch-aa
deleted file mode 100644
index 130f83a6c75..00000000000
--- a/devel/m4/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2011/03/16 14:31:46 wiz Exp $
-
---- lib/isnan.c.orig	2011-03-01 16:39:28.000000000 +0000
-+++ lib/isnan.c
-@@ -118,7 +118,7 @@ FUNC (DOUBLE x)
-   /* Be careful to not do any floating-point operation on x, such as x == x,
-      because x may be a signaling NaN.  */
- #  if defined __TINYC__ || defined __SUNPRO_C || defined __DECC \
--      || (defined __sgi && !defined __GNUC__) || defined __ICC
-+      || (defined __sgi && !defined __GNUC__) || defined __ICC || defined __vax__
-   /* The Sun C 5.0, Intel ICC 10.0, and Compaq (ex-DEC) 6.4 compilers don't
-      recognize the initializers as constant expressions.  The latter compiler
-      also fails when constant-folding 0.0 / 0.0 even when constant-folding is
diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-ab
index df00f750a2b..568f1625a40 100644
--- a/devel/m4/patches/patch-ab
+++ b/devel/m4/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.12 2012/01/31 00:58:43 christos Exp $
+$NetBSD: patch-ab,v 1.13 2013/10/04 21:02:11 wiz 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 */
+--- lib/fseeko.c.orig	2013-09-22 06:15:55.000000000 +0000
++++ lib/fseeko.c
+@@ -125,7 +125,7 @@ fseeko (FILE *fp, off_t offset, int when
        fp->_flags &= ~_IO_EOF_SEEN;
- #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
 -# if defined __CYGWIN__
 +# if defined(__CYGWIN__) || defined(__NetBSD__)
        /* fp_->_offset is typed as an integer.  */
diff --git a/devel/m4/patches/patch-ac b/devel/m4/patches/patch-ac
deleted file mode 100644
index 53cf3ebc83a..00000000000
--- a/devel/m4/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2012/01/31 00:58:43 christos 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
diff --git a/devel/m4/patches/patch-lib_stdio.in.h b/devel/m4/patches/patch-lib_stdio.in.h
index b0c3834a15d..777344f7a3a 100644
--- a/devel/m4/patches/patch-lib_stdio.in.h
+++ b/devel/m4/patches/patch-lib_stdio.in.h
@@ -1,16 +1,16 @@
-$NetBSD: patch-lib_stdio.in.h,v 1.2 2013/07/19 14:49:28 ryoon Exp $
+$NetBSD: patch-lib_stdio.in.h,v 1.3 2013/10/04 21:02:11 wiz Exp $
 
 glibc 2.16's /usr/include/stdio.h does not provide gets(3) anymore,
 and this line causes breakage.
 From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch
 
---- lib/stdio.in.h.orig	2011-03-01 16:39:29.000000000 +0000
+--- lib/stdio.in.h.orig	2013-09-22 06:22:58.000000000 +0000
 +++ lib/stdio.in.h
-@@ -162,7 +162,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
+@@ -719,7 +719,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+    removed it.  */
  #undef gets
+ #if HAVE_RAW_DECL_GETS
 -_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
  
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/devel/m4/patches/patch-lib_verror.h b/devel/m4/patches/patch-lib_verror.h
deleted file mode 100644
index ce9e6e6208f..00000000000
--- a/devel/m4/patches/patch-lib_verror.h
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-lib_verror.h,v 1.1 2012/04/27 21:01:41 wiz Exp $
-
-2011-03-20  Bruno Haible  <bruno@clisp.org>
-
-       verror: Fix compilation error introduced on 2011-02-13.
-       * lib/verror.h (verror, verror_at_line): Use _GL_ATTRIBUTE_FORMAT macro
-       instead of __attribute__.
-       Reported by Tom G. Christensen <tgc@jupiterrise.com>.
-
---- lib/verror.h.orig	2011-03-01 16:39:30.000000000 +0000
-+++ lib/verror.h
-@@ -17,9 +17,10 @@
- #ifndef _VERROR_H
- #define _VERROR_H 1
- 
--#include "error.h"
- #include <stdarg.h>
- 
-+#include "error.h" /* for _GL_ATTRIBUTE_FORMAT */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -32,7 +33,7 @@ extern "C" {
- 
- extern void verror (int __status, int __errnum, const char *__format,
-                     va_list __args)
--     __attribute__ ((__format__ (__printf__, 3, 0)));
-+     _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0));
- 
- /* Print a message with `vfprintf (stderr, FORMAT, ARGS)';
-    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-@@ -44,7 +45,7 @@ extern void verror (int __status, int __
- extern void verror_at_line (int __status, int __errnum, const char *__fname,
-                             unsigned int __lineno, const char *__format,
-                             va_list __args)
--     __attribute__ ((__format__ (__printf__, 5, 0)));
-+     _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 0));
- 
- #ifdef __cplusplus
- }