Update to 2.60:

* Major changes in Autoconf 2.60

  Released 2006-06-23, by Ralf Wildenhues.

** Autoconf no longer depends on whether m4wrap is FIFO (as Posix requires)
  or LIFO (as in GNU M4 1.4.x).  GNU M4 2.0 is expected to conform to Posix
  here, so m4wrap/m4_wrap users should no longer depend on LIFO behavior.

** Provide a way to turn off warnings about the changed directory variables.

* Major changes in Autoconf 2.59d

  Released 2006-06-05, by Ralf Wildenhues.

** GNU make now recommended for VPATH builds
  INSTALL now suggests VPATH builds (e.g., "sh ../srcdir/configure")
  only if you use GNU make.  In practice, other 'make' implementations
  have too many subtle incompatibilities in their support for VPATH.
  Many packages (including Autoconf itself) are portable to other
  'make' implementations, but some packages are not, and recommending
  GNU make keeps the installation instructions simpler.

** Even more safety checks for the new Directory variables:
  Warn about suspicious `${datarootdir}' found in config files output.

** AC_TRY_COMMAND, AC_TRY_EVAL, ac_config_guess, ac_config_sub, ac_configure
  These never-documented macros and variables have been marked with
  comments saying that they may be removed in a future release,
  because their use can lead to unintended code being executed.
  If you need functionality that only these macros or variables
  currently supply, please write bug-autoconf@gnu.org.

** AC_SUBST, AC_DEFINE
  Literal arguments to these are passed to m4_pattern_allow now.

** AC_PROG_CC_STDC
  Passing 'ac_cv_prog_cc_stdc=no' to 'configure' now sets ac_cv_prog_cc_c99
  and ac_cv_prog_cc_c89 to 'no' as well, for backward compatibility with
  obsolete K&R tests in the Automake test suite.

** AC_PROG_CXX_C_O
  New macro.

** AC_PROG_MKDIR_P
  New macro.

** AS_MKDIR_P
  Now more robust with special characters in file names, or when
  multiple processes create the same directory at the same time.

** Obsolescent macros
  The documentation now says that the following macros are obsolescent:
  they test for problems that are so old that they are no longer of
  practical importance on current systems.

    AC_C_BACKSLASH_A       AC_FUNC_MEMCMP            AC_HEADER_DIRENT
    AC_C_CONST             AC_FUNC_SELECT_ARGTYPES   AC_HEADER_STAT
    AC_C_PROTOTYPES        AC_FUNC_SETPGRP           AC_HEADER_STDC
    AC_C_STRINGIZE         AC_FUNC_SETVBUF_REVERSED  AC_HEADER_SYS_WAIT
    AC_C_VOLATILE          AC_FUNC_STAT              AC_HEADER_TIME
    AC_FUNC_CLOSEDIR_VOID  AC_FUNC_STRFTIME          AC_ISC_POSIX
    AC_FUNC_GETPGRP        AC_FUNC_UTIME_NULL        AC_PROG_GCC_TRADITIONAL
    AC_FUNC_LSTAT          AC_FUNC_VPRINTF           AC_STRUCT_TM

  New programs need not use these macros.  We have no current plans to
  remove them.

** autoreconf
  For compatibility with future Libtool 2.0, autoreconf will invoke
  libtoolize with the option `--ltdl' now, if LT_CONFIG_LTDL_DIR is
  used.

* Major changes in Autoconf 2.59c

  Released 2006-04-12, by Ralf Wildenhues.

** The configure command now redirects standard input from /dev/null,
  to help avoid problems with subsidiary commands that might mistakenly
  read standard input.  AS_ORIGINAL_STDIN_FD points to the original
  standard input before this redirection, if you really want configure to
  read from standard input.

** Directory variables adjusted to recent changes in the GNU Coding Standards.
  The following directory variables are new:

    datarootdir   read-only architecture-independent data root [PREFIX/share]
    localedir     locale-specific message catalogs [DATAROOTDIR/locale]
    docdir        documentation root [DATAROOTDIR/doc/PACKAGE]
    htmldir       html documentation [DOCDIR]
    dvidir        dvi documentation [DOCDIR]
    pdfdir        pdf documentation [DOCDIR]
    psdir         ps documentation [DOCDIR]

  The following variables have new default values:

    datadir       read-only architecture-independent data [DATAROOTDIR]
    infodir       info documentation [DATAROOTDIR/info]
    mandir        man documentation [DATAROOTDIR/man]

  This means that if you use any of `@datadir@', `@infodir@', or
  `@mandir@' in a file, you will have to ensure `${datarootdir}' is
  defined in this file.  As a temporary measure, if any of those are
  found but no mention of `datarootdir', the substitutions will be
  replaced with values that do not contain `${datarootdir}', and a
  warning will be issued.

** @top_builddir@ is now a dir name: it is always nonempty and doesn't have
  a trailing slash.  Similar change will be made to ac_top_builddir in a
  future release; the old style value, which matches (../)*, is (and will
  continue to be) available as ac_top_build_prefix.

** AC_C_TYPEOF
  New macro to check for support of 'typeof' syntax a la GNU C.

** AC_CHECK_DECLS_ONCE, AC_CHECK_FUNCS_ONCE, AC_CHECK_HEADERS_ONCE
  New "once-only" variants of commonly-used macros, to make 'configure'
  smaller and faster in common cases.

** AC_FUNC_STRTOLD
  New macro to check for strtold with C99 semantics.

** AC_HEADER_ASSERT
  New macro that lets builder disable assertions at 'configure'-time.

** AC_PATH_X
  Now checks for X11/Xlib.h and XrmInitialize (X proper) rather than
  X11/Intrinsic.h and XtMalloc (Xt).

** AC_PRESERVE_HELP_ORDER
  New macro that causes `configure' to display help strings for AC_ARG_ENABLE
  and AC_ARG_WITH arguments in one region, in the order defined.  The default
  behavior is to group options of each classes separately.

** AC_PROG_CC, AC_PROG_CXX
  No longer automatically arrange to declare the 'exit' function of C,
  when a C++ compiler is used.  Standard Autoconf macros no longer use
  'exit', so this is no longer an issue for them.  If you use C++, and
  want to call 'exit', you'll have to arrange for its declaration
  yourself.  But we now suggest you return from 'main' instead.

** AC_PROG_CC_C89, AC_PROG_CC_C99
  New macros for ISO C99 support.  AC_PROG_CC_C89 and AC_PROG_CC_C99
  check for ANSI C89 and ISO C99 support respectively.

** AC_PROG_CC_STDC
  Has been unobsoleted, and will check if the compiler supports ISO
  C99, falling back to ANSI C89 if not.  ac_cv_prog_cc_stdc is
  retained for backwards compatibility, assuming the value of
  ac_cv_prog_cc_c99 or ac_cv_prog_cc_c89 (whichever is valid, in
  that order).

** AC_STRUCT_DIRENT_D_INO, AC_STRUCT_DIRENT_D_TYPE
  New macros for checking commonly-used members of struct dirent.

** AC_SUBST
  The substituted value can now contain newlines.

** AC_SUBST_FILE
  The substitution now occurs only when @variable@ is on a line by itself,
  optionally surrounded by spaces and tabs.  The whole line is replaced.

** AC_TYPE_LONG_DOUBLE, AC_TYPE_LONG_DOUBLE_WIDER
  New macros to check for long double, and whether it is wider than double.
  The old macro AC_C_TYPE_LONG_DOUBLE has been marked as obsolete;
  applications should switch to the new macro.

** AC_TYPE_INT8_T, AC_TYPE_INT16_T, AC_TYPE_INT32_T, AC_TYPE_INT64_T,
   AC_TYPE_INTMAX_T, AC_TYPE_INTPTR_T, AC_TYPE_LONG_LONG_INT, AC_TYPE_SSIZE_T,
   AC_TYPE_UINT8_T, AC_TYPE_UINT16_T, AC_TYPE_UINT32_T, AC_TYPE_UINT64_T,
   AC_TYPE_UINTMAX_T, AC_TYPE_UINTPTR_T, AC_TYPE_UNSIGNED_LONG_LONG_INT
  New macros to check for C99 and POSIX types.

** AC_USE_SYSTEM_EXTENSIONS
  New macro to enable extensions to Posix.

** AH_HEADER
  New macro which is defined to the name of the first declared config header
  or undefined if no config headers have been declared yet.

** AS_HELP_STRING
  The macro correctly handles quadrigraphs now.

** AS_BOURNE_COMPATIBLE, AS_SHELL_SANITIZE, AS_CASE
  These macros are new or published now.

** AT_COPYRIGHT
  New macro for copyright notices in testsuite files.

** ALLOCA, LIBOBJS, LTLIBOBJS
  Object names added to these variables are now prefixed with `${LIBOBJDIR}',
  as in `${LIBOBJDIR}alloca.o'.  LIBOBJDIR is meant to be defined from
  `Makefile.in' in case the object files lie in a different directory.
  The LIBOBJDIR feature is experimental.

** autoreconf
  Supports --no-recursive now.

** New macros to support Erlang/OTP.
  New macros for configuring paths to Erlang tools and libraries:
  AC_ERLANG_PATH_ERLC, AC_ERLANG_NEED_ERLC, AC_ERLANG_PATH_ERL,
  AC_ERLANG_NEED_ERL, AC_ERLANG_CHECK_LIB, AC_ERLANG_SUBST_ROOT_DIR,
  AC_ERLANG_SUBST_LIB_DIR.

  New macros for configuring installation of Erlang libraries:
  AC_ERLANG_SUBST_INSTALL_LIB_DIR, AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR.

** The manual now mentions Gnulib more prominently.

** New macros to support Objective C.
  AC_PROG_OBJC, AC_PROG_OBJCPP.

* Major changes in Autoconf 2.59b

  Released 2004-08-20, by Paul Eggert.

** AC_CHECK_ALIGNOF
  New macro that computes the default alignment of a type.

** AC_CHECK_TOOL, AC_PATH_TOOL, AC_CHECK_TOOLS
  When cross-compiling, these macros will give a warning if the tool
  is not prefixed.  In the future, unprefixed cross tools will not
  be detected; please consult the info documentation for information
  about the reason of this change.

** AC_CHECK_TARGET_TOOL, AC_PATH_TARGET_TOOL, AC_CHECK_TARGET_TOOLS
  New macros that detect programs whose name is prefixed with the
  target type, if the build type and target type are different.

** AC_REQUIRE_AUX_FILE
  New trace macro that declares expected auxiliary files.

** AC_PROG_GREP
  New macro that tests for a grep program that accepts as a long a line
  as possible.

** AC_PROG_EGREP, AC_PROG_FGREP
  These macros now require AC_PROG_GREP, and try EGREP="$GREP -E" and
  FGREP="$GREP -F" respectively if possible, or else run a path search for
  a program that accepts as long a line as possible.

** AC_PROG_SED
  New macro that tests for a sed program that truncates as few characters
  as possible.

7 files changed, 10 insertions, 99 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 04d71d3775a..e528f2f7a6a 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2006/05/21 09:43:07 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2006/07/03 21:23:29 wiz Exp $
 
-DISTNAME=		autoconf-2.59
-PKGREVISION=		3
+DISTNAME=		autoconf-2.60
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=autoconf/}
 EXTRACT_SUFX=		.tar.bz2
@@ -23,7 +22,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-lispdir
 
 TEXINFO_REQD=		4.0
-INFO_FILES=		# PLIST
+INFO_FILES=		YES
 
 AUTOMAKE_OVERRIDE=	NO
 
diff --git a/devel/autoconf/PLIST b/devel/autoconf/PLIST
index bf508c1ba0b..ffb72fa7f65 100644
--- a/devel/autoconf/PLIST
+++ b/devel/autoconf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/30 03:44:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/07/03 21:23:29 wiz Exp $
 bin/autoconf
 bin/autoheader
 bin/autom4te
@@ -22,8 +22,8 @@ share/autoconf/Autom4te/ChannelDefs.pm
 share/autoconf/Autom4te/Channels.pm
 share/autoconf/Autom4te/Configure_ac.pm
 share/autoconf/Autom4te/FileUtils.pm
-share/autoconf/Autom4te/Request.pm
 share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Request.pm
 share/autoconf/Autom4te/Struct.pm
 share/autoconf/Autom4te/XFile.pm
 share/autoconf/INSTALL
@@ -34,6 +34,7 @@ share/autoconf/autoconf/autoscan.m4
 share/autoconf/autoconf/autotest.m4
 share/autoconf/autoconf/autoupdate.m4
 share/autoconf/autoconf/c.m4
+share/autoconf/autoconf/erlang.m4
 share/autoconf/autoconf/fortran.m4
 share/autoconf/autoconf/functions.m4
 share/autoconf/autoconf/general.m4
diff --git a/devel/autoconf/distinfo b/devel/autoconf/distinfo
index 8e7aa179364..a7497169168 100644
--- a/devel/autoconf/distinfo
+++ b/devel/autoconf/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.14 2006/05/21 09:43:07 rillig Exp $
+$NetBSD: distinfo,v 1.15 2006/07/03 21:23:29 wiz Exp $
 
-SHA1 (autoconf-2.59.tar.bz2) = d366a07b2d99c95b7f24395aa8a8e023d8b93b69
-RMD160 (autoconf-2.59.tar.bz2) = 792c45aade68e2ed19a0e4c6ebc0e20cb8298e1a
-Size (autoconf-2.59.tar.bz2) = 925073 bytes
-SHA1 (patch-aa) = 9e8d3d2dd52e145c70a25bdf45a46aea0eb28a63
-SHA1 (patch-ab) = d7dd2cc35620227b9a07cd1cb6fe66aa33302163
-SHA1 (patch-ac) = d8bf5a8c12bdc5f4953f3299a32520c6fca97b81
-SHA1 (patch-ad) = ea9ec5e087c7b9099c347587a9bd545cc0634309
+SHA1 (autoconf-2.60.tar.bz2) = b02c6f06ea0ae07dfa1c40d6ded36c2a02196dff
+RMD160 (autoconf-2.60.tar.bz2) = b981b5d39feb2de3cde4f41281afe6280e92cd05
+Size (autoconf-2.60.tar.bz2) = 1019170 bytes
diff --git a/devel/autoconf/patches/patch-aa b/devel/autoconf/patches/patch-aa
deleted file mode 100644
index f9f5c17e419..00000000000
--- a/devel/autoconf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2003/12/06 18:26:36 wiz Exp $
-
---- doc/autoconf.texi.orig	Tue Nov  4 09:33:44 2003
-+++ doc/autoconf.texi
-@@ -213,7 +213,7 @@ published by the Free Software Foundatio
- * Autoconf: (autoconf).         Create source code configuration scripts.
- @end direntry
- 
--@dircategory Individual utilities
-+@dircategory GNU Autoconf
- @direntry
- * autoscan: (autoconf)autoscan Invocation.
-                                 Semi-automatic @file{configure.ac} writing
diff --git a/devel/autoconf/patches/patch-ab b/devel/autoconf/patches/patch-ab
deleted file mode 100644
index 5f1b59b1f60..00000000000
--- a/devel/autoconf/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2006/05/21 09:43:07 rillig Exp $
-
-It's AC_INCLUDES_DEFAULT, not AC_DEFAULT_INCLUDES.
-
---- doc/autoconf.info.orig	2003-11-06 10:36:30.000000000 +0100
-+++ doc/autoconf.info	2006-05-21 11:07:47.000000000 +0200
-@@ -27,7 +27,7 @@ START-INFO-DIR-ENTRY
- * Autoconf: (autoconf).         Create source code configuration scripts.
- END-INFO-DIR-ENTRY
- 
--INFO-DIR-SECTION Individual utilities
-+INFO-DIR-SECTION GNU Autoconf
- START-INFO-DIR-ENTRY
- * autoscan: (autoconf)autoscan Invocation.
-                                 Semi-automatic `configure.ac' writing
-@@ -2598,7 +2598,7 @@ include beforehand (*note Header Files::
-    Most generic macros use the following macro to provide the default
- set of includes:
- 
-- - Macro: AC_DEFAULT_INCLUDES ([INCLUDE-DIRECTIVES])
-+ - Macro: AC_INCLUDES_DEFAULT ([INCLUDE-DIRECTIVES])
-      Expand to INCLUDE-DIRECTIVES if defined, otherwise to:
- 
-           #include <stdio.h>
-@@ -14106,7 +14106,6 @@ This is an alphabetical list of the Auto
- * AC_CYGWIN:                             Obsolete Macros.
- * AC_DECL_SYS_SIGLIST:                   Obsolete Macros.
- * AC_DECL_YYTEXT:                        Obsolete Macros.
--* AC_DEFAULT_INCLUDES:                   Default Includes.
- * AC_DEFINE:                             Defining Symbols.
- * AC_DEFINE_UNQUOTED:                    Defining Symbols.
- * AC_DEFUN <1>:                          Obsoleting Macros.
-@@ -14189,6 +14188,7 @@ This is an alphabetical list of the Auto
- * AC_HEADER_TIOCGWINSZ:                  Particular Headers.
- * AC_HELP_STRING <1>:                    Obsolete Macros.
- * AC_HELP_STRING:                        Pretty Help Strings.
-+* AC_INCLUDES_DEFAULT:                   Default Includes.
- * AC_INIT <1>:                           Obsolete Macros.
- * AC_INIT:                               Initializing configure.
- * AC_INLINE:                             Obsolete Macros.
diff --git a/devel/autoconf/patches/patch-ac b/devel/autoconf/patches/patch-ac
deleted file mode 100644
index 84a81814ed6..00000000000
--- a/devel/autoconf/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2003/12/06 18:26:36 wiz Exp $
-
---- doc/Makefile.in.orig	Tue Nov  4 09:47:19 2003
-+++ doc/Makefile.in
-@@ -194,10 +194,10 @@ $(ACLOCAL_M4):  $(top_srcdir)/configure.
- .texi.html:
- 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --html -I $(srcdir) \
- 	 -o $@ $<
--autoconf.info: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.dvi: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.pdf: autoconf.texi version.texi $(autoconf_TEXINFOS)
--autoconf.html: autoconf.texi version.texi $(autoconf_TEXINFOS)
-+autoconf.info: autoconf.texi $(autoconf_TEXINFOS)
-+autoconf.dvi: autoconf.texi $(autoconf_TEXINFOS)
-+autoconf.pdf: autoconf.texi $(autoconf_TEXINFOS)
-+autoconf.html: autoconf.texi $(autoconf_TEXINFOS)
- version.texi:  stamp-vti
- stamp-vti: autoconf.texi $(top_srcdir)/configure
- 	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
diff --git a/devel/autoconf/patches/patch-ad b/devel/autoconf/patches/patch-ad
deleted file mode 100644
index 2704413986e..00000000000
--- a/devel/autoconf/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2004/04/26 14:52:39 tv Exp $
-
---- tests/wrapper.in.orig	Mon Apr 26 10:49:37 2004
-+++ tests/wrapper.in
-@@ -15,7 +15,7 @@ elif test -n "${BASH_VERSION+set}" && (s
- fi
- 
- # Support unset when possible.
--if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false