Release 1.4.18:

* Diagnose --word-regexp as unsupported if it was not configured.
* Preliminary support for OS/2.
* A number of portability improvements inherited from gnulib.

6 files changed, 49 insertions, 47 deletions

diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 594da39e55a..6d4d68fe257 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2016/02/25 12:12:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.75 2017/08/25 05:28:53 adam Exp $
 
-DISTNAME=	m4-1.4.17
+DISTNAME=	m4-1.4.18
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 
@@ -10,12 +10,10 @@ COMMENT=	GNU version of UNIX m4 macro language processor
 LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
-INFO_FILES=		yes
-
-TEST_TARGET=		check
-
 CONFIGURE_ARGS+=	--program-prefix=g
 CONFIGURE_ARGS.Cygwin+=	ac_cv_func___fpending=yes
+INFO_FILES=		yes
+TEST_TARGET=		check
 
 CFLAGS.AIX+=	-D_LINUX_SOURCE_COMPAT
 
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index 57db995ede4..77ca4e0cda7 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.41 2015/11/03 03:27:48 agc Exp $
+$NetBSD: distinfo,v 1.42 2017/08/25 05:28:53 adam Exp $
 
-SHA1 (m4-1.4.17.tar.gz) = 4f80aed6d8ae3dacf97a0cb6e989845269e342f0
-RMD160 (m4-1.4.17.tar.gz) = d81675f1d358ce5eee27184a9d946acfc97a912b
-SHA512 (m4-1.4.17.tar.gz) = 211bac8ea73723fa1e95a05efa93b962151aee73f92e6a0792a345789b5d2bfba93b37a2bf416a37e6fc32f093b12246bbf50899054979efea5819e5fa48b9c9
-Size (m4-1.4.17.tar.gz) = 1820658 bytes
-SHA1 (patch-ab) = 9e9527cdd4b7ba3501d603f0e5ca60c2150e4359
+SHA1 (m4-1.4.18.tar.gz) = 2f76f8105a45b05c8cfede97b3193cd88b31c657
+RMD160 (m4-1.4.18.tar.gz) = 16396a6ffbb2105cdd0a36c773b44d16854ed740
+SHA512 (m4-1.4.18.tar.gz) = 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae
+Size (m4-1.4.18.tar.gz) = 2006643 bytes
 SHA1 (patch-isnan.c) = a960f35e5168bed47c5924e36bfb254dc1a44621
-SHA1 (patch-lib_fpending.h) = 6f29893c24b03916200f36867ad30ba101f8ef16
-SHA1 (patch-lib_stdio.in.h) = cc5a8572e274b576a154c7a6b14f0a14de5abacd
+SHA1 (patch-lib_stdio.in.h) = 21557ea9d86dbeb36062df4e62cb71735b06480b
+SHA1 (patch-lib_vasnprintf.c) = 2bced6c121efc9bc5894174c7745ba89e8f53033
diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-ab
deleted file mode 100644
index 568f1625a40..00000000000
--- a/devel/m4/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2013/10/04 21:02:11 wiz Exp $
-
---- 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;
-       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.  */
-       fp_->_offset = pos;
- # else
diff --git a/devel/m4/patches/patch-lib_fpending.h b/devel/m4/patches/patch-lib_fpending.h
deleted file mode 100644
index 4ce724397ab..00000000000
--- a/devel/m4/patches/patch-lib_fpending.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_fpending.h,v 1.1 2013/11/01 09:49:20 ryoon Exp $
-
-https://github.com/jrmarino/DPorts/blob/9d9256e3b72a1273339bce4b68878e64b6fadcde/devel/m4/dragonfly/patch-lib_fpending.h
-
---- lib/fpending.h.orig	2013-09-22 06:15:20.000000000 +0000
-+++ lib/fpending.h
-@@ -24,6 +24,8 @@
- # include <stdio_ext.h>
- #endif
- 
-+#ifndef __DragonFly__
- #ifndef __fpending
- size_t __fpending (FILE *);
- #endif
-+#endif
diff --git a/devel/m4/patches/patch-lib_stdio.in.h b/devel/m4/patches/patch-lib_stdio.in.h
index 777344f7a3a..7ee7bbb62ee 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.3 2013/10/04 21:02:11 wiz Exp $
+$NetBSD: patch-lib_stdio.in.h,v 1.4 2017/08/25 05:28:53 adam 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	2013-09-22 06:22:58.000000000 +0000
+--- lib/stdio.in.h.orig	2016-12-31 13:54:42.000000000 +0000
 +++ lib/stdio.in.h
-@@ -719,7 +719,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+@@ -744,7 +744,6 @@ _GL_WARN_ON_USE (getline, "getline is un
     removed it.  */
  #undef gets
- #if HAVE_RAW_DECL_GETS
+ #if HAVE_RAW_DECL_GETS && !defined __cplusplus
 -_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
  #endif
  
- 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/devel/m4/patches/patch-lib_vasnprintf.c b/devel/m4/patches/patch-lib_vasnprintf.c
new file mode 100644
index 00000000000..efc7cbf2c57
--- /dev/null
+++ b/devel/m4/patches/patch-lib_vasnprintf.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-lib_vasnprintf.c,v 1.1 2017/08/25 05:28:53 adam Exp $
+
+Fix crash on macOS 10.13 (Darwin 17).
+http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=7df04f9b8a0adb1575ca0555775ec10860143cbf
+
+--- lib/vasnprintf.c.orig	2015-01-04 16:46:03.000000000 +0000
++++ lib/vasnprintf.c
+@@ -4858,7 +4869,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
+ #endif
+                   *fbp = dp->conversion;
+ #if USE_SNPRINTF
+-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
++# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))        \
++         && !defined __UCLIBC__)                                            \
++        || (defined __APPLE__ && defined __MACH__)                          \
++        || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+                 fbp[1] = '%';
+                 fbp[2] = 'n';
+                 fbp[3] = '\0';
+@@ -4872,6 +4886,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
+                    in format strings in writable memory may crash the program
+                    (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
+                    in this situation.  */
++                /* On Mac OS X 10.3 or newer, we know that snprintf's return
++                   value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99
++                   and gl_SNPRINTF_TRUNCATION_C99 pass.
++                   Therefore we can avoid using %n in this situation.
++                   On Mac OS X 10.13 or newer, the use of %n in format strings
++                   in writable memory by default crashes the program, so we
++                   should avoid it in this situation.  */
+                 /* On native Windows systems (such as mingw), we can avoid using
+                    %n because:
+                      - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,