Update to 2.53, which fixes many bugs.

Use the bzip2 tarball.

Approved by:	portmgr (will)

33 files changed, 726 insertions, 275 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf/distinfo b/devel/autoconf/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf/distinfo
+++ b/devel/autoconf/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf/pkg-plist
+++ b/devel/autoconf/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf253/distinfo b/devel/autoconf253/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf253/distinfo
+++ b/devel/autoconf253/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf253/pkg-plist b/devel/autoconf253/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf253/pkg-plist
+++ b/devel/autoconf253/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf254/Makefile b/devel/autoconf254/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf254/Makefile
+++ b/devel/autoconf254/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf254/distinfo b/devel/autoconf254/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf254/distinfo
+++ b/devel/autoconf254/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf254/pkg-plist b/devel/autoconf254/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf254/pkg-plist
+++ b/devel/autoconf254/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf257/Makefile
+++ b/devel/autoconf257/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf257/distinfo b/devel/autoconf257/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf257/distinfo
+++ b/devel/autoconf257/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf257/pkg-plist b/devel/autoconf257/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf257/pkg-plist
+++ b/devel/autoconf257/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf259/distinfo b/devel/autoconf259/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf259/distinfo
+++ b/devel/autoconf259/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf259/pkg-plist b/devel/autoconf259/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf259/pkg-plist
+++ b/devel/autoconf259/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf26/distinfo b/devel/autoconf26/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf26/distinfo
+++ b/devel/autoconf26/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf26/pkg-plist b/devel/autoconf26/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf26/pkg-plist
+++ b/devel/autoconf26/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf261/distinfo b/devel/autoconf261/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf261/distinfo
+++ b/devel/autoconf261/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf261/pkg-plist
+++ b/devel/autoconf261/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf262/distinfo b/devel/autoconf262/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf262/distinfo
+++ b/devel/autoconf262/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf262/pkg-plist
+++ b/devel/autoconf262/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf267/distinfo b/devel/autoconf267/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf267/distinfo
+++ b/devel/autoconf267/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf267/pkg-plist b/devel/autoconf267/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf267/pkg-plist
+++ b/devel/autoconf267/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/autoconf268/distinfo b/devel/autoconf268/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/autoconf268/distinfo
+++ b/devel/autoconf268/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/autoconf268/pkg-plist
+++ b/devel/autoconf268/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index e21c00c26dc1..45ff33a1b1c9 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.52
-PORTREVISION=	2
+PORTVERSION=	2.53
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,15 +16,32 @@ 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=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+
+GENERIC_TOOLS=	config.guess	\
+		config.sub	\
+		elisp-comp	\
+		install-sh	\
+		mdate-sh	\
+		missing		\
+		mkinstalldirs
 
-MAN1=		autoconf.1 autoheader.1 autoreconf.1 \
-		autoscan.1 autoupdate.1 config.guess.1 \
-		config.sub.1 ifnames.1
+MAN1=		autoconf.1	\
+		autoheader.1	\
+		autom4te.1	\
+		autoreconf.1	\
+		autoscan.1	\
+		autoupdate.1	\
+		config.guess.1	\
+		config.sub.1	\
+		ifnames.1
 
 post-install:
-.for FILE in install-sh config.sub config.guess missing mkinstalldirs
+.for FILE in ${GENERIC_TOOLS}
 	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf
 .endfor
 
diff --git a/devel/gnu-autoconf/distinfo b/devel/gnu-autoconf/distinfo
index 9982ada15c41..5934f0eaa52f 100644
--- a/devel/gnu-autoconf/distinfo
+++ b/devel/gnu-autoconf/distinfo
@@ -1 +1 @@
-MD5 (autoconf-2.52.tar.gz) = 054c54b73aade6da546f98a7c03a724d
+MD5 (autoconf-2.53.tar.bz2) = c121b003f51e293c2bf5a6105c721388
diff --git a/devel/gnu-autoconf/pkg-plist b/devel/gnu-autoconf/pkg-plist
index ad4944934b1f..81b746b015d5 100644
--- a/devel/gnu-autoconf/pkg-plist
+++ b/devel/gnu-autoconf/pkg-plist
@@ -1,33 +1,58 @@
 bin/autoconf
 bin/autoheader
+bin/autom4te
 bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
 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/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/config.guess
 share/autoconf/config.sub
+share/autoconf/elisp-comp
 share/autoconf/install-sh
-share/autoconf/m4sh.m4
-share/autoconf/m4sugar.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
+share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
 @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