Update to 2.54 (from autoconf-devel package).

Does not conflict with autoconf213 package.

7 files changed, 71 insertions, 96 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index af1e45da76f..2fea6cb0a9a 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,26 +1,30 @@
-# $NetBSD: Makefile,v 1.33 2002/08/25 21:49:38 jlam Exp $
-# FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
-#
+# $NetBSD: Makefile,v 1.34 2002/10/03 19:30:58 wiz Exp $
 
-DISTNAME=       autoconf-2.13
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU:=autoconf/}
+DISTNAME=		autoconf-2.54
+CATEGORIES=		devel
+MASTER_SITES=		${MASTER_SITE_GNU:=autoconf/}
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.gnu.org/software/autoconf/autoconf.html
-COMMENT=	Generates automatic source code configuration scripts
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnu.org/software/autoconf/autoconf.html
+COMMENT=		Generates automatic source code configuration scripts
 
-DEPENDS=	m4-1.4:../../devel/m4
+DEPENDS=		m4-1.4:../../devel/m4
 
+# The next line is for conflicts with old versions of this package,
+# which had autoconf-devel as PKGNAME.
 CONFLICTS=		autoconf-devel-[0-9]*
 
 USE_BUILDLINK2=		YES
+
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--without-lispdir
 CONFIGURE_ENV+=		AWK="${AWK}"
 M4=			${PREFIX}/bin/gm4
 
 INFO_FILES=		autoconf.info standards.info
-TEXINFO_OVERRIDE=	YES
+
+PERL5_REQD=		5.6
+TEXINFO_REQD=		4.0
 
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/texinfo.mk"
diff --git a/devel/autoconf/PLIST b/devel/autoconf/PLIST
index 54af921bc0d..31c32b825a4 100644
--- a/devel/autoconf/PLIST
+++ b/devel/autoconf/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:07 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/10/03 19:30:58 wiz Exp $
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
@@ -11,19 +12,54 @@ info/autoconf.info
 info/standards.info
 @exec ${INSTALL_INFO} %D/info/autoconf.info %D/info/dir
 @exec ${INSTALL_INFO} %D/info/standards.info %D/info/dir
-share/autoconf/acconfig.h
-share/autoconf/acfunctions
-share/autoconf/acgeneral.m4
-share/autoconf/acheaders
-share/autoconf/acidentifiers
-share/autoconf/acmakevars
-share/autoconf/acoldnames.m4
-share/autoconf/acprograms
-share/autoconf/acspecific.m4
-share/autoconf/autoconf.m4
-share/autoconf/autoconf.m4f
-share/autoconf/autoheader.m4
-share/autoconf/autoheader.m4f
-share/autoconf/config.guess
-share/autoconf/config.sub
-@dirrm share/autoconf
+man/man1/autoconf.1
+man/man1/autoheader.1
+man/man1/autom4te.1
+man/man1/autoreconf.1
+man/man1/autoscan.1
+man/man1/autoupdate.1
+man/man1/config.guess.1
+man/man1/config.sub.1
+man/man1/ifnames.1
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
+share/autoconf/INSTALL
+share/autoconf/autoconf/autoconf.m4
+share/autoconf/autoconf/autoconf.m4f
+share/autoconf/autoconf/autoheader.m4
+share/autoconf/autoconf/autotest.m4
+share/autoconf/autoconf/autoupdate.m4
+share/autoconf/autoconf/c.m4
+share/autoconf/autoconf/fortran.m4
+share/autoconf/autoconf/functions.m4
+share/autoconf/autoconf/general.m4
+share/autoconf/autoconf/headers.m4
+share/autoconf/autoconf/lang.m4
+share/autoconf/autoconf/libs.m4
+share/autoconf/autoconf/oldnames.m4
+share/autoconf/autoconf/programs.m4
+share/autoconf/autoconf/specific.m4
+share/autoconf/autoconf/status.m4
+share/autoconf/autoconf/types.m4
+share/autoconf/autom4te.cfg
+share/autoconf/autoscan/functions
+share/autoconf/autoscan/headers
+share/autoconf/autoscan/identifiers
+share/autoconf/autoscan/libraries
+share/autoconf/autoscan/makevars
+share/autoconf/autoscan/programs
+share/autoconf/autotest/autotest.m4
+share/autoconf/autotest/autotest.m4f
+share/autoconf/autotest/general.m4
+share/autoconf/m4sugar/m4sh.m4
+share/autoconf/m4sugar/m4sh.m4f
+share/autoconf/m4sugar/m4sugar.m4
+share/autoconf/m4sugar/m4sugar.m4f
+share/autoconf/m4sugar/version.m4
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
+@unexec ${RMDIR} %D/share/autoconf 2>&1 || ${TRUE}
diff --git a/devel/autoconf/distinfo b/devel/autoconf/distinfo
index 1c50204ce00..acbd90878d9 100644
--- a/devel/autoconf/distinfo
+++ b/devel/autoconf/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/08/28 14:58:15 skrll Exp $
+$NetBSD: distinfo,v 1.6 2002/10/03 19:30:58 wiz Exp $
 
-SHA1 (autoconf-2.13.tar.gz) = e4826c8bd85325067818f19b2b2ad2b625da66fc
-Size (autoconf-2.13.tar.gz) = 443844 bytes
-SHA1 (patch-aa) = f31397e3feda41b4493905f03d20b0db354bb3b4
-SHA1 (patch-ab) = 27fd826a2e9be84cab8b050c6314343fe062a726
-SHA1 (patch-ac) = 3a2ba2e7505e7f1476c17142839c1890cba2e4d4
-SHA1 (patch-ad) = 640b838fed5e04586e940a5dad543903e4f8be9a
+SHA1 (autoconf-2.54.tar.gz) = 5126d0f011a5c45f211ec7304739bd3e335bf37d
+Size (autoconf-2.54.tar.gz) = 1038536 bytes
diff --git a/devel/autoconf/patches/patch-aa b/devel/autoconf/patches/patch-aa
deleted file mode 100644
index 4014d6b6815..00000000000
--- a/devel/autoconf/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/08/28 14:58:16 skrll Exp $
-
---- Makefile.in-orig	Tue Jan  5 14:27:16 1999
-+++ Makefile.in	Wed Jan  6 17:10:56 1999
-@@ -141,7 +141,7 @@
- 
- install: all $(M4FILES) acconfig.h installdirs install-info
- 	for p in $(ASCRIPTS); do \
--	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
- 	done
- 	for i in $(M4FROZEN); do \
- 	  $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-@@ -150,9 +150,9 @@
- 	  $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
- 	done
- 	-if test -f autoscan; then \
--	$(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+	$(INSTALL) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
- 	for i in acfunctions acheaders acidentifiers acprograms \
--	  acmakevars; do \
-+	  acmakevars config.guess config.sub; do \
- 	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
- 	done; \
- 	else :; fi
diff --git a/devel/autoconf/patches/patch-ab b/devel/autoconf/patches/patch-ab
deleted file mode 100644
index 8e22239abd6..00000000000
--- a/devel/autoconf/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/08/28 14:58:16 skrll Exp $
-
---- autoconf.texi-orig	Tue Jan  5 14:28:37 1999
-+++ autoconf.texi	Wed Jan  6 16:36:16 1999
-@@ -4,6 +4,7 @@
- @settitle Autoconf
- @c For double-sided printing, uncomment:
- @c @setchapternewpage odd
-+@dircategory Programming & development tools
- @c %**end of header
- 
- @set EDITION 2.13
diff --git a/devel/autoconf/patches/patch-ac b/devel/autoconf/patches/patch-ac
deleted file mode 100644
index 1b0405413d1..00000000000
--- a/devel/autoconf/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/08/28 14:58:16 skrll Exp $
-
---- standards.texi-orig	Tue Jan  5 14:29:22 1999
-+++ standards.texi	Wed Jan  6 16:39:21 1999
-@@ -4,6 +4,7 @@
- @settitle GNU Coding Standards
- @c This date is automagically updated when you save this file:
- @set lastupdate August 26, 1998
-+@dircategory Programming & development tools
- @c %**end of header
- 
- @ifinfo
diff --git a/devel/autoconf/patches/patch-ad b/devel/autoconf/patches/patch-ad
deleted file mode 100644
index 6a0b11d3a5e..00000000000
--- a/devel/autoconf/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2001/08/28 14:58:16 skrll Exp $
---- configure.BAK	Wed Sep  8 17:36:21 1999
-+++ configure	Wed Sep  8 17:36:27 1999
-@@ -583,7 +583,7 @@
- done
- test -n "$M4" || M4="m4"
- 
--for ac_prog in mawk gawk nawk awk
-+for ac_prog in gawk nawk awk mawk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2