Upgrade to 2.52; this should solve some problems when mixing ac 2.13* and

am 1.5.  Ports which require 2.13/1.4 will be modified to use the ac213
and am14 ports.

PR:		29069
Submitted by:	pat
Approved by:	sobomax, ade, steve
		(contingent upon me fixing every problem that crops up)

11 files changed, 20 insertions, 145 deletions

diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index f8d6c2a9574e..f92817370da1 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -5,29 +5,22 @@
 # $FreeBSD$
 #
 
-# Upgrading this port is not possible at this time because it has
-# extensive implications for the entire ports system. It will be
-# upgraded as soon as possible. Thanks.
-
 PORTNAME=	autoconf
-PORTVERSION=	2.13.000227
+PORTVERSION=	2.52
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE} ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	binutils autoconf
-DISTNAME=	autoconf-000227
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	autoconf
 
 MAINTAINER=	portmgr@FreeBSD.org
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	M4=${PREFIX}/bin/gm4
-WRKSRC=		${WRKDIR}/${PORTNAME}
+CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
 
-post-install:
-	@install-info ${PREFIX}/info/autoconf.info ${PREFIX}/info/dir
-	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
+MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
+		autoscan.1 autoupdate.1 config.guess.1 \
+		config.sub.1 ifnames.1
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf261/distinfo b/devel/autoconf261/distinfo
index 1120f10b7fd5..9982ada15c41 100644
--- a/devel/autoconf261/distinfo
+++ b/devel/autoconf261/distinfo
@@ -1 +1 @@
-MD5 (autoconf-000227.tar.bz2) = 9b3066c91a635a5ffd71a1ee5caebfec
+MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
diff --git a/devel/autoconf261/files/patch-aa b/devel/autoconf261/files/patch-aa
deleted file mode 100644
index eefb2438ca51..000000000000
--- a/devel/autoconf261/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.in.orig	Tue Jan  5 08:27:16 1999
-+++ Makefile.in	Sat Jan 23 23:29:33 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/autoconf261/files/patch-ab b/devel/autoconf261/files/patch-ab
deleted file mode 100644
index d15dbdf44250..000000000000
--- a/devel/autoconf261/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- autoconf.texi.orig	Tue Jan  5 08:28:37 1999
-+++ autoconf.texi	Sat Jan 23 23:34:43 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/autoconf261/files/patch-ac b/devel/autoconf261/files/patch-ac
deleted file mode 100644
index cfeaeef83ba2..000000000000
--- a/devel/autoconf261/files/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- standards.texi.orig	Tue Jan  5 08:29:22 1999
-+++ standards.texi	Sat Jan 23 23:36:36 1999
-@@ -4,12 +4,13 @@
- @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
- @format
- START-INFO-DIR-ENTRY
--* Standards: (standards).        GNU coding standards.
-+* Standards: (standards).       GNU coding standards.
- END-INFO-DIR-ENTRY
- @end format
- @end ifinfo
diff --git a/devel/autoconf261/files/patch-ad b/devel/autoconf261/files/patch-ad
deleted file mode 100644
index 20401d060f61..000000000000
--- a/devel/autoconf261/files/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
---- autoconf.sh.orig	Tue Jan  5 07:27:53 1999
-+++ autoconf.sh	Thu May 31 15:56:39 2001
-@@ -47,3 +47,2 @@
- : ${TMPDIR=/tmp}
--tmpout=${TMPDIR}/acout.$$
- localdir=
-@@ -97,5 +96,8 @@
- 
-+tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
-+tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
-+
- trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
- 
--tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
-+# Always set this, to avoid bogus errors from some rm's.
- if test z$infile = z-; then
-@@ -120,3 +122,3 @@
- *traditional*) ;;
--*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
-+*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;;
- esac
-@@ -156,3 +158,3 @@
- 
--rm -f $tmpout
-+rm -f $tmpin $tmpout
- 
diff --git a/devel/autoconf261/files/patch-ae b/devel/autoconf261/files/patch-ae
deleted file mode 100644
index 87e6102e3ba9..000000000000
--- a/devel/autoconf261/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
-+++ autoheader.sh	Mon Nov 22 21:52:02 1999
-@@ -194,7 +194,7 @@
-   # Some fgrep's have limits on the number of lines that can be in the
-   # pattern on the command line, so use a temporary file containing the
-   # pattern.
--  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
-+  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
-    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
-    cat > $fgrep_tmp <<EOF
- $syms
diff --git a/devel/autoconf261/files/patch-af b/devel/autoconf261/files/patch-af
deleted file mode 100644
index d40bc0ee9e7a..000000000000
--- a/devel/autoconf261/files/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
---- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
-+++ autoupdate.sh	Mon Nov 22 21:54:30 1999
-@@ -26,7 +26,7 @@
- Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
-        [--version] [template-file]" 
- 
--sedtmp=/tmp/acups.$$
-+sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
- # For debugging.
- #sedtmp=/tmp/acups
- show_version=no
-@@ -66,7 +66,7 @@
- 
- : ${SIMPLE_BACKUP_SUFFIX='~'}
- 
--tmpout=acupo.$$
-+tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
- trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
- case $# in
-   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf261/files/patch-ag b/devel/autoconf261/files/patch-ag
deleted file mode 100644
index 0ab4f683e3de..000000000000
--- a/devel/autoconf261/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- acspecific.m4.orig	Sun Aug 13 19:42:57 2000
-+++ acspecific.m4	Sun Aug 13 19:43:24 2000
-@@ -2659,7 +2659,7 @@
-   if AC_TRY_EVAL(ac_link); then
-     for file in conftest.*; do
-       case $file in
--      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+      *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;;
-       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-       esac
-     done
diff --git a/devel/autoconf261/pkg-descr b/devel/autoconf261/pkg-descr
index d1ce6fbd87ff..c404cc852ea8 100644
--- a/devel/autoconf261/pkg-descr
+++ b/devel/autoconf261/pkg-descr
@@ -6,4 +6,4 @@ configuration script for a package from a template file that lists the
 operating system features that the package can use, in the form of m4
 macro calls.
 
-WWW: http://sources.redhat.com/autoconf/
+WWW: http://www.gnu.org/software/autoconf/
diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist
index da3d5de5423d..1a6d002069ea 100644
--- a/devel/autoconf261/pkg-plist
+++ b/devel/autoconf261/pkg-plist
@@ -4,25 +4,25 @@ bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
-@unexec install-info --delete %D/info/autoconf.info %D/info/dir
-@unexec install-info --delete %D/info/standards.info %D/info/dir
-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/INSTALL
 share/autoconf/acfunctions
+share/autoconf/acfunctions.m4
 share/autoconf/acgeneral.m4
 share/autoconf/acheaders
+share/autoconf/acheaders.m4
 share/autoconf/acidentifiers
+share/autoconf/aclang.m4
+share/autoconf/aclibraries
 share/autoconf/acmakevars
 share/autoconf/acoldnames.m4
 share/autoconf/acprograms
 share/autoconf/acspecific.m4
+share/autoconf/actypes.m4
+share/autoconf/acversion.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
+share/autoconf/m4sh.m4
+share/autoconf/m4sugar.m4
 @dirrm share/autoconf
+@unexec install-info --delete %D/info/autoconf.info %D/info/dir
+@unexec install-info --delete %D/info/standards.info %D/info/dir