Update to 1.4.12:

* Noteworthy changes in Version 1.4.12 (2008-10-10) [stable]
  Released by Eric Blake, based on git version 1.4.11.*

** Fix regression introduced in 1.4.4b where using `traceon' could delete
   a macro.  This was most noticeable with `traceon(`traceon')', but
   would also happen in cases such as `foo(traceon(`foo'))'.

** Fix regression introduced in 1.4.7 where `m4 -N9' died with an assertion
   failure.

** Fix regression introduced in 1.4.11 where `defn' died with an assertion
   failure on a traced but undefined macro.

** New `-g'/`--gnu' command-line option overrides `-G'/`--traditional'.
   For now, the environment variable POSIXLY_CORRECT has no effect on M4
   behavior; but a future release of M4 will behave as though --traditional
   is implied if POSIXLY_CORRECT is set (this future change is necessary,
   because in the current release, there is no way to disable GNU
   extensions that conflict with POSIX without the use of a non-POSIX
   command-line argument).  Clients of M4 that want to use GNU extensions,
   even when POSIXLY_CORRECT is set, should start using the -g command-line
   argument, even though it is currently a no-op if -G did not appear
   earlier in the command line, so that the client will not break in the
   face of an upgraded m4 and a POSIXLY_CORRECT execution environment.

** The `-L'/`--nesting-limit' command-line option now defaults to 0 for
   unlimited on platforms that can detect and deal with stack overflow.  On
   systems that lack alternate stack support, such as Cygwin, and on
   systems that do not obey the POSIX semantics for distinguishing stack
   overflow from other exceptions, such as Linux, you can optionally
   install the libsigsegv library (version 2.6 or newer recommended) to
   enhance m4's ability to accurately report stack overflow:
   http://www.gnu.org/software/libsigsegv/

** A number of portability improvements inherited from gnulib.

16 files changed, 16 insertions, 451 deletions

diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 9daf510ac39..ae8a333b3d2 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2008/04/27 00:01:56 reed Exp $
+# $NetBSD: Makefile,v 1.57 2008/10/14 12:29:10 wiz Exp $
 
-DISTNAME=	m4-1.4.11
-PKGREVISION=	1
+DISTNAME=	m4-1.4.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 
diff --git a/devel/m4/PLIST b/devel/m4/PLIST
index 2474ed6eb35..1cea0a07e7a 100644
--- a/devel/m4/PLIST
+++ b/devel/m4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/10/14 12:29:11 wiz Exp $
 bin/${GNU_PROGRAM_PREFIX}m4
 ${PLIST.gm4}bin/gm4
 info/m4.info
@@ -16,6 +16,7 @@ share/examples/m4/foreach2.m4
 share/examples/m4/foreachq.m4
 share/examples/m4/foreachq2.m4
 share/examples/m4/foreachq3.m4
+share/examples/m4/foreachq4.m4
 share/examples/m4/forloop.m4
 share/examples/m4/forloop2.m4
 share/examples/m4/fstab.m4
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index fdb181cea91..9ba2fc53c82 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.24 2008/08/23 16:07:50 wiz Exp $
+$NetBSD: distinfo,v 1.25 2008/10/14 12:29:11 wiz Exp $
 
-SHA1 (m4-1.4.11.tar.gz) = 4d6b7f6344faee39f55af397c25f3e7ad13b6fcb
-RMD160 (m4-1.4.11.tar.gz) = 3689d9681cf9d2effbf87a3202cea68a75ebcec2
-Size (m4-1.4.11.tar.gz) = 1168840 bytes
-SHA1 (patch-aa) = 31aed81ffd1ea40d688ff89786fa72d95a13d422
-SHA1 (patch-ab) = 6f51d8220aeb5232e87788db259df6d8d94c3653
+SHA1 (m4-1.4.12.tar.gz) = 013ca38511e17835dc1a1381cbe8e39179637a49
+RMD160 (m4-1.4.12.tar.gz) = ae3cfbb621977952cc07e080b1696b5113ab603a
+Size (m4-1.4.12.tar.gz) = 1168821 bytes
 SHA1 (patch-ac) = 5e1d6388d05b3ee6ea9e5b0a56ce5fbde310d538
-SHA1 (patch-ad) = 20eaea03b78ef94ed39931e7a54dd44ce40a29ff
-SHA1 (patch-ae) = 4cf1187471889796b063eb3ca78c31dc8ec83f01
-SHA1 (patch-af) = 742749e268de7363eb587246d33b4408341eb133
-SHA1 (patch-ag) = 990789fb44865d237c7d369c278e5ed205aa79b8
-SHA1 (patch-ah) = 262d6d9635d66550711133ecba183a77940bf7cb
-SHA1 (patch-ai) = 0d44a1e740e7a7dc11ccbe979ccdfcb080e42d93
-SHA1 (patch-aj) = 3aff8f3677f5b45bb3d3da75705291282bf540e6
-SHA1 (patch-ak) = 0f40c8bb20f22c3fcddae2f5c7f8b6468a1744e4
-SHA1 (patch-al) = 88e0f632d1b2e95e67f32e3dd3fcd3ff0d315880
-SHA1 (patch-am) = ca86ae670f933a89f56e1069253d00db92f8231a
-SHA1 (patch-an) = 9a39ba63810406545a43dfc17bdd6f9873b25bb3
+SHA1 (patch-ad) = c9871719689b46193c4d688e336f9c3ff0883c79
diff --git a/devel/m4/patches/patch-aa b/devel/m4/patches/patch-aa
deleted file mode 100644
index c11dd29b4d8..00000000000
--- a/devel/m4/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2008/04/13 00:51:59 wiz Exp $
-
-2008-04-12  Bruno Haible  <bruno@clisp.org>
-
-        * lib/fpucw.h: Enable the definitions also for x86_64.
-        Needed for NetBSD/x86_64.
-        Reported by Thomas Klausner <tk@giga.or.at>.
-
---- lib/fpucw.h.orig	2007-12-01 20:55:20.000000000 +0000
-+++ lib/fpucw.h
-@@ -1,5 +1,5 @@
- /* Manipulating the FPU control word.
--   Copyright (C) 2007 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
-    Written by Bruno Haible <bruno@clisp.org>, 2007.
- 
-    This program is free software: you can redistribute it and/or modify
-@@ -61,7 +61,7 @@
-  */
- 
- /* Inline assembler like this works only with GNU C.  */
--#if defined __i386__ && defined __GNUC__
-+#if (defined __i386__ || defined __x86_64__) && defined __GNUC__
- 
- typedef unsigned short fpucw_t; /* glibc calls this fpu_control_t */
- 
diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-ab
deleted file mode 100644
index b5b0a275d8d..00000000000
--- a/devel/m4/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2008/04/29 13:54:55 wiz Exp $
-
---- lib/freadahead.c.orig	2008-03-10 19:11:22 -0700
-+++ lib/freadahead.c	2008-04-14 17:38:46 -0700
-@@ -78,6 +78,8 @@
- 	 + (fp->_Mode & 0x4000 /* _MBYTE */
- 	    ? (fp->_Back + sizeof (fp->_Back)) - fp->_Rback
- 	    : 0);
-+#elif defined __DragonFly__	    /* DragonFly */
-+  return __sreadahead(fp);
- #else
-  #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your system, then report this to bug-gnulib."
- #endif
diff --git a/devel/m4/patches/patch-ad b/devel/m4/patches/patch-ad
index f9d59b5170b..797902b2335 100644
--- a/devel/m4/patches/patch-ad
+++ b/devel/m4/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.4 2008/04/29 13:54:55 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2008/10/14 12:29:11 wiz Exp $
 
---- lib/fseeko.c.orig	2007-12-17 21:18:34 -0800
-+++ lib/fseeko.c	2008-04-14 20:27:44 -0700
-@@ -23,6 +23,18 @@
- /* Get off_t and lseek.  */
- #include <unistd.h>
+--- lib/fseeko.c.orig	2008-08-05 13:16:44.000000000 +0000
++++ lib/fseeko.c
+@@ -25,6 +25,18 @@
+ 
+ #include "stdio-impl.h"
  
 +#ifdef __DragonFly__
 +
@@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.4 2008/04/29 13:54:55 wiz Exp $
  #undef fseeko
  #if !HAVE_FSEEKO
  # undef fseek
-@@ -121,3 +133,5 @@
+@@ -111,3 +123,5 @@ rpl_fseeko (FILE *fp, off_t offset, int 
    else
      return fseeko (fp, offset, whence);
  }
diff --git a/devel/m4/patches/patch-ae b/devel/m4/patches/patch-ae
deleted file mode 100644
index 38fc4dccc0c..00000000000
--- a/devel/m4/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- Makefile.in.orig    2008-04-02 21:45:30.000000000 +0900
-+++ Makefile.in 2008-07-05 05:58:39.000000000 +0900
-@@ -386,12 +386,14 @@
- REPLACE_GETLINE = @REPLACE_GETLINE@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-+REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
- REPLACE_ISFINITE = @REPLACE_ISFINITE@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LDEXPL = @REPLACE_LDEXPL@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
-+REPLACE_NAN = @REPLACE_NAN@
- REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_ROUND = @REPLACE_ROUND@
diff --git a/devel/m4/patches/patch-af b/devel/m4/patches/patch-af
deleted file mode 100644
index 0f3b25e17f9..00000000000
--- a/devel/m4/patches/patch-af
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- configure.orig      2008-04-02 21:45:03.000000000 +0900
-+++ configure   2008-07-05 06:46:20.000000000 +0900
-@@ -790,8 +790,10 @@
- REPLACE_FLOORL
- REPLACE_FREXP
- REPLACE_FREXPL
-+REPLACE_HUGE_VAL
- REPLACE_ISFINITE
- REPLACE_LDEXPL
-+REPLACE_NAN
- REPLACE_ROUND
- REPLACE_ROUNDF
- REPLACE_ROUNDL
-@@ -7366,8 +7368,10 @@
-   REPLACE_FLOORL=0;
-   REPLACE_FREXP=0;
-   REPLACE_FREXPL=0;
-+  REPLACE_HUGE_VAL=0;
-   REPLACE_ISFINITE=0;
-   REPLACE_LDEXPL=0;
-+  REPLACE_NAN=0;
-   REPLACE_ROUND=0;
-   REPLACE_ROUNDF=0;
-   REPLACE_ROUNDL=0;
-@@ -16379,6 +16383,119 @@
- 
- 
- 
-+  { echo "$as_me:$LINENO: checking whether NAN macro works" >&5
-+echo $ECHO_N "checking whether NAN macro works... $ECHO_C" >&6; }
-+if test "${gl_cv_header_math_nan_works+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+/* Solaris 10 has a broken definition of NAN.  Other platforms
-+        fail to provide NAN, or provide it only in C99 mode; this
-+        test only needs to fail when NAN is provided but wrong.  */
-+         float f = 1.0f;
-+#ifdef NAN
-+        f = NAN;
-+#endif
-+        return f == 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+        test -z "$ac_c_werror_flag" ||
-+        test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  gl_cv_header_math_nan_works=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+       gl_cv_header_math_nan_works=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $gl_cv_header_math_nan_works" >&5
-+echo "${ECHO_T}$gl_cv_header_math_nan_works" >&6; }
-+  if test $gl_cv_header_math_nan_works = no; then
-+    REPLACE_NAN=1
-+  fi
-+  { echo "$as_me:$LINENO: checking whether HUGE_VAL works" >&5
-+echo $ECHO_N "checking whether HUGE_VAL works... $ECHO_C" >&6; }
-+if test "${gl_cv_header_math_huge_val_works+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+/* Solaris 10 has a broken definition of HUGE_VAL.  */
-+        double d = HUGE_VAL;
-+        return d == 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+        test -z "$ac_c_werror_flag" ||
-+        test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  gl_cv_header_math_huge_val_works=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+       gl_cv_header_math_huge_val_works=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $gl_cv_header_math_huge_val_works" >&5
-+echo "${ECHO_T}$gl_cv_header_math_huge_val_works" >&6; }
-+  if test $gl_cv_header_math_huge_val_works = no; then
-+    REPLACE_HUGE_VAL=1
-+  fi
- 
- 
- 
-@@ -27058,8 +27175,10 @@
- REPLACE_FLOORL!$REPLACE_FLOORL$ac_delim
- REPLACE_FREXP!$REPLACE_FREXP$ac_delim
- REPLACE_FREXPL!$REPLACE_FREXPL$ac_delim
-+REPLACE_HUGE_VAL!$REPLACE_HUGE_VAL$ac_delim
- REPLACE_ISFINITE!$REPLACE_ISFINITE$ac_delim
- REPLACE_LDEXPL!$REPLACE_LDEXPL$ac_delim
-+REPLACE_NAN!$REPLACE_NAN$ac_delim
- REPLACE_ROUND!$REPLACE_ROUND$ac_delim
- REPLACE_ROUNDF!$REPLACE_ROUNDF$ac_delim
- REPLACE_ROUNDL!$REPLACE_ROUNDL$ac_delim
-@@ -27081,7 +27200,7 @@
- GNULIB_FCHDIR!$GNULIB_FCHDIR$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 99; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/devel/m4/patches/patch-ag b/devel/m4/patches/patch-ag
deleted file mode 100644
index 061ecf81455..00000000000
--- a/devel/m4/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- doc/Makefile.in.orig        2008-04-02 21:45:28.000000000 +0900
-+++ doc/Makefile.in     2008-07-05 05:57:57.000000000 +0900
-@@ -380,12 +380,14 @@
- REPLACE_GETLINE = @REPLACE_GETLINE@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-+REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
- REPLACE_ISFINITE = @REPLACE_ISFINITE@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LDEXPL = @REPLACE_LDEXPL@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
-+REPLACE_NAN = @REPLACE_NAN@
- REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_ROUND = @REPLACE_ROUND@
diff --git a/devel/m4/patches/patch-ah b/devel/m4/patches/patch-ah
deleted file mode 100644
index 859dd47c258..00000000000
--- a/devel/m4/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- examples/Makefile.in.orig   2008-04-02 21:45:28.000000000 +0900
-+++ examples/Makefile.in        2008-07-05 05:59:06.000000000 +0900
-@@ -355,12 +355,14 @@
- REPLACE_GETLINE = @REPLACE_GETLINE@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-+REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
- REPLACE_ISFINITE = @REPLACE_ISFINITE@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LDEXPL = @REPLACE_LDEXPL@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
-+REPLACE_NAN = @REPLACE_NAN@
- REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_ROUND = @REPLACE_ROUND@
diff --git a/devel/m4/patches/patch-ai b/devel/m4/patches/patch-ai
deleted file mode 100644
index 956d1e7c566..00000000000
--- a/devel/m4/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- lib/Makefile.am.orig        2008-04-02 09:56:18.000000000 +0900
-+++ lib/Makefile.am     2008-07-05 06:01:46.000000000 +0900
-@@ -582,8 +582,10 @@
-	      -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \
-	      -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
-	      -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
-+             -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
-	      -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \
-	      -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
-+             -e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \
-	      -e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \
-	      -e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \
-	      -e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \
diff --git a/devel/m4/patches/patch-aj b/devel/m4/patches/patch-aj
deleted file mode 100644
index 1664d6c7b27..00000000000
--- a/devel/m4/patches/patch-aj
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- lib/Makefile.in.orig        2008-04-02 21:45:29.000000000 +0900
-+++ lib/Makefile.in     2008-07-05 06:00:27.000000000 +0900
-@@ -399,11 +399,13 @@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
- REPLACE_ISFINITE = @REPLACE_ISFINITE@
-+REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LDEXPL = @REPLACE_LDEXPL@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
-+REPLACE_NAN = @REPLACE_NAN@
- REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_ROUND = @REPLACE_ROUND@
-@@ -1083,8 +1085,10 @@
-	      -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \
-	      -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
-	      -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
-+             -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
-	      -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \
-	      -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
-+             -e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \
-	      -e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \
-	      -e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \
-	      -e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \
diff --git a/devel/m4/patches/patch-ak b/devel/m4/patches/patch-ak
deleted file mode 100644
index a2643766184..00000000000
--- a/devel/m4/patches/patch-ak
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- lib/math.in.h.orig  2008-04-01 11:59:24.000000000 +0900
-+++ lib/math.in.h       2008-07-05 06:07:06.000000000 +0900
-@@ -34,8 +34,11 @@
- 
- /* POSIX allows platforms that don't support NAN.  But all major
-    machines in the past 15 years have supported something close to
--   IEEE NaN, so we define this unconditionally.  */
--#ifndef NAN
-+   IEEE NaN, so we define this unconditionally.  We also must define
-+   it on platforms like Solaris 10, where NAN is present but defined
-+   as a function pointer rather than a floating point constant.  */
-+#if !defined NAN || @REPLACE_NAN@
-+# undef NAN
-   /* The Compaq (ex-DEC) C 6.4 compiler chokes on the expression 0.0 / 0.0.  */
- # ifdef __DECC
- static float
-@@ -50,6 +53,13 @@
- # endif
- #endif
- 
-+/* Solaris 10 defines HUGE_VAL, but as a function pointer rather
-+   than a floating point constant.  */
-+#if @REPLACE_HUGE_VAL@
-+# undef HUGE_VAL
-+# define HUGE_VAL (1.0 / 0.0)
-+#endif
-+
- /* Write x as
-      x = mantissa * 2^exp
-    where
diff --git a/devel/m4/patches/patch-al b/devel/m4/patches/patch-al
deleted file mode 100644
index e1c76c01262..00000000000
--- a/devel/m4/patches/patch-al
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-al,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- m4/math_h.m4.orig   2008-01-27 08:05:11.000000000 +0900
-+++ m4/math_h.m4        2008-07-05 06:04:14.000000000 +0900
-@@ -8,6 +8,31 @@
- [
-   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-   gl_CHECK_NEXT_HEADERS([math.h])
-+  AC_CACHE_CHECK([whether NAN macro works], [gl_cv_header_math_nan_works],
-+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <math.h>]],
-+      [[/* Solaris 10 has a broken definition of NAN.  Other platforms
-+        fail to provide NAN, or provide it only in C99 mode; this
-+        test only needs to fail when NAN is provided but wrong.  */
-+         float f = 1.0f;
-+#ifdef NAN
-+        f = NAN;
-+#endif
-+        return f == 0;]])],
-+      [gl_cv_header_math_nan_works=yes],
-+      [gl_cv_header_math_nan_works=no])])
-+  if test $gl_cv_header_math_nan_works = no; then
-+    REPLACE_NAN=1
-+  fi
-+  AC_CACHE_CHECK([whether HUGE_VAL works], [gl_cv_header_math_huge_val_works],
-+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <math.h>]],
-+      [[/* Solaris 10 has a broken definition of HUGE_VAL.  */
-+        double d = HUGE_VAL;
-+        return d == 0;]])],
-+      [gl_cv_header_math_huge_val_works=yes],
-+      [gl_cv_header_math_huge_val_works=no])])
-+  if test $gl_cv_header_math_huge_val_works = no; then
-+    REPLACE_HUGE_VAL=1
-+  fi
- ])
- 
- AC_DEFUN([gl_MATH_MODULE_INDICATOR],
-@@ -56,8 +81,10 @@
-   REPLACE_FLOORL=0;            AC_SUBST([REPLACE_FLOORL])
-   REPLACE_FREXP=0;             AC_SUBST([REPLACE_FREXP])
-   REPLACE_FREXPL=0;            AC_SUBST([REPLACE_FREXPL])
-+  REPLACE_HUGE_VAL=0;          AC_SUBST([REPLACE_HUGE_VAL])
-   REPLACE_ISFINITE=0;          AC_SUBST([REPLACE_ISFINITE])
-   REPLACE_LDEXPL=0;            AC_SUBST([REPLACE_LDEXPL])
-+  REPLACE_NAN=0;               AC_SUBST([REPLACE_NAN])
-   REPLACE_ROUND=0;             AC_SUBST([REPLACE_ROUND])
-   REPLACE_ROUNDF=0;            AC_SUBST([REPLACE_ROUNDF])
-   REPLACE_ROUNDL=0;            AC_SUBST([REPLACE_ROUNDL])
diff --git a/devel/m4/patches/patch-am b/devel/m4/patches/patch-am
deleted file mode 100644
index 7cd6f6869b3..00000000000
--- a/devel/m4/patches/patch-am
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-am,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- src/Makefile.in.orig        2008-04-02 21:45:29.000000000 +0900
-+++ src/Makefile.in     2008-07-05 06:05:08.000000000 +0900
-@@ -381,12 +381,14 @@
- REPLACE_GETLINE = @REPLACE_GETLINE@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-+REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
- REPLACE_ISFINITE = @REPLACE_ISFINITE@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LDEXPL = @REPLACE_LDEXPL@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
-+REPLACE_NAN = @REPLACE_NAN@
- REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_ROUND = @REPLACE_ROUND@
diff --git a/devel/m4/patches/patch-an b/devel/m4/patches/patch-an
deleted file mode 100644
index 72f4ab82919..00000000000
--- a/devel/m4/patches/patch-an
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-an,v 1.1 2008/08/23 16:07:51 wiz Exp $
-
---- tests/Makefile.in.orig      2008-04-02 21:45:30.000000000 +0900
-+++ tests/Makefile.in   2008-07-05 06:05:56.000000000 +0900
-@@ -695,12 +695,14 @@
- REPLACE_GETLINE = @REPLACE_GETLINE@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
-+REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
- REPLACE_ISFINITE = @REPLACE_ISFINITE@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LDEXPL = @REPLACE_LDEXPL@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
-+REPLACE_NAN = @REPLACE_NAN@
- REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_ROUND = @REPLACE_ROUND@