Update to 2.64.

XXX: Needs m4>=1.4.6, but we use USE_TOOLS+=gm4:run, and I don't see
a way to specify a version there. Please someone fix that :)
On the other hand, 1.4.6 was added to pkgsrc in 09/2006, so I hope
everyone has it by now.

* Major changes in Autoconf 2.64 (2009-07-26) [stable]
  Released by Eric Blake, based on git versions 2.63b.*.

** Autoconf now requires GNU M4 1.4.6 or later.  Earlier versions of M4
   have a bug in regular expression handling that interferes with some
   of the speedups provided since Autoconf 2.63.  GNU M4 1.4.13 or
   later is recommended.

** AS_IF and AS_CASE have been taught to avoid syntax errors even when
   given arguments that expand to just whitespace.

** The following documented autoconf macros are new:
   AC_ERLANG_SUBST_ERTS_VER

** The autoheader tool now understands m4 macro arguments passed to
   AC_DEFINE and AC_DEFINE_UNQUOTED.

** Ensure AT_CHECK can support commands that include a # given with
   proper m4 quoting.  For shell comments, this is a new feature; for
   non-shell comments, this fixes a regression introduced in 2.63b.
   Additionally, AT_CHECK correctly supplies shell escapes for
   metacharacters occurring in m4 macro expansions within the expected
   stdout and stderr parameters.

** The macro AT_CHECK now understands the concept of hard failure.  If
   a test exits with an unexpected status 99, cleanup actions for the
   test are inhibited and the test is treated as a failure regardless
   of AT_XFAIL_IF.  It also understands the new directives
   ignore-nolog, stdout-nolog, and stderr-nolog.

** The following documented autotest macros are new:
   AT_CHECK_UNQUOTED  AT_FAIL_IF  AT_SKIP_IF

** The following documented m4sugar macros are new:
   m4_argn  m4_copy_force  m4_default_nblank  m4_default_nblank_quoted
   m4_ifblank  m4_ifnblank  m4_rename_force

** The autoconf testsuite now exercises all Erlang macros.

* Major changes in Autoconf 2.63b (2009-03-31) [beta]
  Released by Eric Blake, based on git versions 2.63.*.

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

** AC_REQUIRE now detects the case of an outer macro which first expands
   then later indirectly requires the same inner macro.  Previously,
   this case led to silent out-of-order expansion (bug present since
   2.50); it now issues a syntax warning, and duplicates the expansion
   of the inner macro to guarantee dependencies have been met.  See
   the manual for advice on how to refactor macros in order to avoid
   the bug in earlier autoconf versions and avoid increased script
   size in the current version.

** AC_DEFUN_ONCE has improved semantics.  Previously, a macro declared
   with AC_DEFUN_ONCE warned on a second invocation; and out-of-order
   expansion was still possible.  Now, dependencies are guaranteed,
   and subsequent invocations are a silent no-op.  This makes
   AC_DEFUN_ONCE an ideal macro for silencing AC_REQUIRE warnings.

** The following macros are now defined with AC_DEFUN_ONCE.  This means
   a subtle change in semantics; previously, an AC_DEFUN macro could
   expand one of these macros multiple times or surround the macro
   inside shell conditional text to bypass the effects of these
   macros, but now the macro will expand exactly once, and prior to
   the start of any enclosing AC_DEFUN macro:
   AC_CANONICAL_BUILD  AC_CANONICAL_HOST  AC_CANONICAL_TARGET
   AC_HEADER_ASSERT  AC_PROG_INSTALL  AC_PROG_MKDIR_P
   AC_USE_SYSTEM_EXTENSIONS

** AC_LANG_ERLANG works once again (regression introduced in 2.61a).

** AC_HEADER_ASSERT is fixed so that './configure --enable-assert' no
   longer mistakenly disables assertions.

** AC_INIT now takes an optional fifth parameter that can be used to
   set AC_PACKAGE_URL, a URL for the package's home page; the URL is
   used in `configure --help' and is also available via AC_DEFINE.

** Autotest testsuites accept an option --jobs[=N] for parallel testing.
   This feature is still in testing, and may not work on every
   platform, help in improving it would be appreciated.

** Autotest testsuites do not attempt to write startup error messages
   to the log file before that is opened (regression introduced in 2.63).

** Configure scripts now use shell functions.  This feature leads to
   smaller configure files and faster execution.

** Present But Cannot Be Compiled: Autoconf will now proceed with
   the compiler's result if a header is present but cannot be compiled.
   The warning is still printed, and you should really fix it by
   providing a fourth parameter to AC_CHECK_HEADER/AC_CHECK_HEADERS.

** Autoreconf added aclocal to the set of programs affected by the
   `autoreconf -I dir' option.

** The following documented m4sugar macros are new:
   m4_chomp  m4_chomp_all  m4_cleardivert  m4_curry  m4_default_quoted
   m4_esyscmd_s  m4_map_args  m4_map_args_pair  m4_map_args_sep
   m4_map_args_w  m4_set_map  m4_set_map_sep  m4_stack_foreach
   m4_stack_foreach_lifo  m4_stack_foreach_sep
   m4_stack_foreach_sep_lifo

** The following m4sugar macros are documented now, but in some cases
   with slightly different semantics than what the previous
   undocumented version had:
   m4_copy  m4_dumpdefs  m4_rename  m4_version_prereq

** The m4sugar macro m4_expand has been taught to handle unterminated
   comments and shell case statements.  As a result, it is used
   internally in more places, such as AC_DEFINE and AT_CHECK.  Most
   uses of AC_DEFINE and AT_CHECK should not behave any differently;
   however, it may be necessary to add double-quoting around
   unbalanced `(' where single-quoting used to be sufficient.

** The following documented m4sh macros are new:
   AS_INIT_GENERATED  AS_LINENO_PREPARE  AS_ME_PREPARE  AS_SET_STATUS
   AS_VAR_APPEND  AS_VAR_ARITH  AS_VAR_COPY

** The following m4sh macros are documented now, but in some cases
   with slightly different semantics than what the previous
   undocumented version had:
   AS_ECHO  AS_ECHO_N  AS_ESCAPE  AS_EXIT  AS_LITERAL_IF  AS_UNSET
   AS_VAR_IF  AS_VAR_POPDEF  AS_VAR_PUSHDEF  AS_VAR_SET  AS_VAR_SET_IF
   AS_VAR_TEST_SET  AS_VERSION_COMPARE

** The m4sh macros AS_IF and AS_CASE can now be used in shell lists.
   The responsibility for supplying a trailing newline now belongs to
   the call site, but since most users did not add dnl, this generally
   results in fewer empty lines in configure.

2 files changed, 13 insertions, 13 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index abafce143f8..3bfbc2d8d74 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2008/10/09 18:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2009/08/09 21:13:23 wiz Exp $
 
-DISTNAME=		autoconf-2.63
+DISTNAME=		autoconf-2.64
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=autoconf/}
 EXTRACT_SUFX=		.tar.bz2
@@ -8,7 +8,9 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/autoconf/autoconf.html
 COMMENT=		Generates automatic source code configuration scripts
+LICENSE=		gnu-gpl-v2 AND gnu-fdl-v1.3 # AND gnu-gpl-v3 for building
 
+# XXX: needs m4>1.4.6; wants m4>1.4.13
 USE_TOOLS+=		gm4:run perl:run
 
 # The next line is for conflicts with old versions of this package,
@@ -21,7 +23,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=		# empty
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-lispdir
-MAKE_JOBS_SAFE=		no
 
 TEXINFO_REQD=		4.0
 INFO_FILES=		YES
@@ -35,16 +36,15 @@ CHECK_WRKREF_SKIP+=	${PREFIX}/share/autoconf/autotest/autotest.m4f
 CHECK_WRKREF_SKIP+=	${PREFIX}/share/autoconf/m4sugar/m4sugar.m4f
 CHECK_WRKREF_SKIP+=	${PREFIX}/share/autoconf/m4sugar/m4sh.m4f
 
+# wiz 20090809: next section commented out because it seems not to be needed.
+# re-enable if it is; otherwise it will be removed during the next
+# update:
 # pkgsrc symlinks config/config.guess and config.sub to mk/gnu-config
 # when you do not preserve timestamps in mk, this can cause
 # config.guess and config.sub to be newer than config.guess.1 and
 # config.sub.1.  In that case, the man pages need to be rebuilt, and
 # build fails because pkgsrc lacks help2man.  Work around this situation.
-pre-build:
-	${TOUCH} ${WRKSRC}/man/config.sub.1 ${WRKSRC}/man/config.guess.1
-
-# undo a rather stupid hack in the install step when --without-lispdir is used
-post-install:
-	${RM} -rf ${WRKSRC}/lib/emacs/no
+#pre-build:
+#	${TOUCH} ${WRKSRC}/man/config.sub.1 ${WRKSRC}/man/config.guess.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autoconf/distinfo b/devel/autoconf/distinfo
index a213cdc5d10..5ef686da7c7 100644
--- a/devel/autoconf/distinfo
+++ b/devel/autoconf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2008/10/09 18:21:39 wiz Exp $
+$NetBSD: distinfo,v 1.19 2009/08/09 21:13:23 wiz Exp $
 
-SHA1 (autoconf-2.63.tar.bz2) = f15e14aa34acf871b47f659ef99a2e6707db4a18
-RMD160 (autoconf-2.63.tar.bz2) = 273448a60bc4dfcfcb3ee455ef012333eeca3256
-Size (autoconf-2.63.tar.bz2) = 1195259 bytes
+SHA1 (autoconf-2.64.tar.bz2) = dfbcdbd7dd74a52130dda324e9d94ee0b8551466
+RMD160 (autoconf-2.64.tar.bz2) = cf498949b3cc0a6bc465a50114c98750871bcf49
+Size (autoconf-2.64.tar.bz2) = 1313833 bytes