Update to 1.4.13. Set LICENSE (gnu-gpl-v3).

* Noteworthy changes in Version 1.4.13 (2009-04-01) [stable]
  Released by Eric Blake, based on git version 1.4.12.*

** The manual is now distributed under the terms of FDL 1.3.

** The `divert' and `undivert' builtins have been made more efficient
   when using temporary files for large diversions.

** The `translit' builtin has been made more efficient when the second
   argument is short.

** The input engine has been optimized for faster processing.

** The command line option `--debugfile', introduced in 1.4.7, now
   treats its argument as optional, in order to allow setting the debug
   output back to stderr when used without an argument; and order is now
   significant with respect to command line files.  You must therefore use
   `m4 --debugfile=trace file', not `m4 file --debugfile trace'.  This
   change does not affect the deprecated `-o'/`--error-output' option.

** The `syscmd' and `esyscmd' builtins can be configured to use an
   alternate shell, via the new `configure' option `--with-syscmd-shell'.

** A number of portability improvements inherited from gnulib.

6 files changed, 12 insertions, 76 deletions

diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index ae8a333b3d2..40a01a090ca 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2008/10/14 12:29:10 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2009/04/20 09:57:37 wiz Exp $
 
-DISTNAME=	m4-1.4.12
+DISTNAME=	m4-1.4.13
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
-#LICENSE=		GPLv3
+LICENSE=		gnu-gpl-v3
 
 TEST_TARGET=		check
 
diff --git a/devel/m4/PLIST b/devel/m4/PLIST
index 1cea0a07e7a..a3ab7fcd89d 100644
--- a/devel/m4/PLIST
+++ b/devel/m4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/10/14 12:29:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/04/20 09:57:37 wiz Exp $
 bin/${GNU_PROGRAM_PREFIX}m4
 ${PLIST.gm4}bin/gm4
 info/m4.info
@@ -6,6 +6,7 @@ man/man1/${GNU_PROGRAM_PREFIX}m4.1
 share/examples/m4/capitalize.m4
 share/examples/m4/capitalize2.m4
 share/examples/m4/comments.m4
+share/examples/m4/curry.m4
 share/examples/m4/ddivert.m4
 share/examples/m4/debug.m4
 share/examples/m4/esyscmd.m4
@@ -19,6 +20,7 @@ share/examples/m4/foreachq3.m4
 share/examples/m4/foreachq4.m4
 share/examples/m4/forloop.m4
 share/examples/m4/forloop2.m4
+share/examples/m4/forloop3.m4
 share/examples/m4/fstab.m4
 share/examples/m4/hanoi.m4
 share/examples/m4/incl-test.m4
@@ -34,6 +36,8 @@ share/examples/m4/pushpop.m4
 share/examples/m4/quote.m4
 share/examples/m4/regexp.m4
 share/examples/m4/reverse.m4
+share/examples/m4/stack.m4
+share/examples/m4/stack_sep.m4
 share/examples/m4/sync-lines.m4
 share/examples/m4/sysv-args.m4
 share/examples/m4/trace.m4
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index 3536dd0487e..7ba2d4a43ac 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.26 2008/10/24 12:37:37 wiz Exp $
+$NetBSD: distinfo,v 1.27 2009/04/20 09:57:37 wiz Exp $
 
-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-aa) = 67d40e140571b32fbc25f452cbb46dae38dcd51f
-SHA1 (patch-ac) = 5e1d6388d05b3ee6ea9e5b0a56ce5fbde310d538
-SHA1 (patch-ad) = c9871719689b46193c4d688e336f9c3ff0883c79
+SHA1 (m4-1.4.13.tar.gz) = 75aba989a6dfaa0bbe43d3bcf8d1d47bcd03e39a
+RMD160 (m4-1.4.13.tar.gz) = 92874c851ddd1a9f6513426bc75390f5ce04e3ed
+Size (m4-1.4.13.tar.gz) = 1274475 bytes
diff --git a/devel/m4/patches/patch-aa b/devel/m4/patches/patch-aa
deleted file mode 100644
index c59af44c227..00000000000
--- a/devel/m4/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2008/10/24 12:37:37 wiz Exp $
-
-2008-10-23  Bruno Haible  <bruno@clisp.org>
-        Define a dummy SA_NODEFER macro on Interix.
-        * lib/signal.in.h (SA_NODEFER): Define fallback.
-        Reported by Aleksey Cheusov <cheusov@tut.by> via
-        Thomas Klausner <wiz@netbsd.org> and Eric Blake.
-
---- lib/signal.in.h.orig	2008-09-26 12:32:24.000000000 +0000
-+++ lib/signal.in.h
-@@ -176,6 +176,12 @@ extern int sigaction (int, const struct 
- #endif /* !@HAVE_SIGACTION@, !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@ */
- 
- 
-+/* Some systems don't have SA_NODEFER.  */
-+#ifndef SA_NODEFER
-+# define SA_NODEFER 0
-+#endif
-+
-+
- #ifdef __cplusplus
- }
- #endif
diff --git a/devel/m4/patches/patch-ac b/devel/m4/patches/patch-ac
deleted file mode 100644
index c73bef9ead8..00000000000
--- a/devel/m4/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2008/04/29 13:54:55 wiz Exp $
-
---- lib/freading.c.orig	2007-11-10 15:24:02 -0800
-+++ lib/freading.c	2008-04-14 17:41:47 -0700
-@@ -42,6 +42,8 @@
- #elif defined __QNX__               /* QNX */
-   return ((fp->_Mode & 0x2 /* _MOPENW */) == 0
- 	  || (fp->_Mode & 0x1000 /* _MREAD */) != 0);
-+#elif defined __DragonFly__	    /* DragonFly */
-+  return ((((struct __FILE_public *)fp)->_flags & __SRD) != 0);
- #else
-  #error "Please port gnulib freading.c to your platform!"
- #endif
diff --git a/devel/m4/patches/patch-ad b/devel/m4/patches/patch-ad
deleted file mode 100644
index 797902b2335..00000000000
--- a/devel/m4/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/10/14 12:29:11 wiz Exp $
-
---- 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__
-+
-+#undef fseeko
-+
-+int
-+rpl_fseeko (FILE *fp, off_t offset, int whence)
-+{
-+	return(fseeko(fp, offset, whence));
-+}
-+
-+#else
-+
- #undef fseeko
- #if !HAVE_FSEEKO
- # undef fseek
-@@ -111,3 +123,5 @@ rpl_fseeko (FILE *fp, off_t offset, int 
-   else
-     return fseeko (fp, offset, whence);
- }
-+
-+#endif