Use the cosmetic BUILD_VERSION variable (a la libtool), switch portnames

away from using the version number twice.

Unbreak autoconf257, based on work from Rui Lopes <rui@ruilopes.com>

62 files changed, 1087 insertions, 1050 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 2b528c639d83..9a21edda1a55 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -19,38 +19,20 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+LATEST_LINK=	autoconf
 USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
-CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
+CONFIGURE_ENV=	CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
-
-MAN1=		autoconf.1	\
-		autoheader.1	\
-		autom4te.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
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist
index e9c549f71932..fe71c6bd11e8 100644
--- a/devel/autoconf/pkg-plist
+++ b/devel/autoconf/pkg-plist
@@ -48,13 +48,6 @@ share/autoconf/m4sugar/version.m4
 share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
-%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el
-%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc
-%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el
-%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc
-@comment directories
-%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp
-%%EMACS%%@dirrm %%EMACSDIR%%
 @dirrm share/autoconf/m4sugar
 @dirrm share/autoconf/autotest
 @dirrm share/autoconf/autoscan
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index a17bf74d160a..e535c649df09 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -5,11 +5,7 @@
 # $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=	autoconf213
+PORTNAME=	autoconf
 PORTVERSION=	2.13.000227
 PORTREVISION=	5
 CATEGORIES=	devel
@@ -23,12 +19,15 @@ COMMENT=	Automatically configure source code on many Un*x platforms (legacy 2.13
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	213
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
-CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=213
+CONFIGURE_ENV=	CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/autoconf
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
@@ -45,16 +44,16 @@ post-patch:
 	@${RM} ${WRKSRC}/*.info* >/dev/null 2>&1 || true
 
 post-install:
-	@${CHMOD} +x ${PREFIX}/share/autoconf213/config.*
+	@${CHMOD} +x ${PREFIX}/share/autoconf${BUILD_VERSION}/config.*
 	@${INSTALL_SCRIPT} ${WRKSRC}/install-sh \
-		${PREFIX}/share/autoconf213
-	@-${RM} -fr ${PREFIX}/libexec/autoconf213
-	${MKDIR} ${PREFIX}/libexec/autoconf213
+		${PREFIX}/share/autoconf${BUILD_VERSION}
+	@-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION}
+	${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION}
 .for i in autoconf autoheader autoreconf autoscan autoupdate ifnames
-	${LN} -sf ${PREFIX}/bin/${i}213 \
-		${PREFIX}/libexec/autoconf213/${i}
+	${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
+		${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i}
 .endfor
-	install-info ${PREFIX}/info/autoconf213.info \
+	install-info ${PREFIX}/info/autoconf${BUILD_VERSION}.info \
 		${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf213/pkg-plist b/devel/autoconf213/pkg-plist
index fa84b581ed6a..f16aaab9fd77 100644
--- a/devel/autoconf213/pkg-plist
+++ b/devel/autoconf213/pkg-plist
@@ -1,33 +1,33 @@
-bin/autoconf213
-bin/autoheader213
-bin/autoreconf213
-bin/autoscan213
-bin/autoupdate213
-bin/ifnames213
-@unexec install-info --delete %D/info/autoconf213.info %D/info/dir
-info/autoconf213.info
-@exec install-info %D/info/autoconf213.info %D/info/dir
-libexec/autoconf213/autoconf
-libexec/autoconf213/autoheader
-libexec/autoconf213/autoreconf
-libexec/autoconf213/autoscan
-libexec/autoconf213/autoupdate
-libexec/autoconf213/ifnames
-share/autoconf213/acconfig.h
-share/autoconf213/acfunctions
-share/autoconf213/acgeneral.m4
-share/autoconf213/acheaders
-share/autoconf213/acidentifiers
-share/autoconf213/acmakevars
-share/autoconf213/acoldnames.m4
-share/autoconf213/acprograms
-share/autoconf213/acspecific.m4
-share/autoconf213/autoconf.m4
-share/autoconf213/autoconf.m4f
-share/autoconf213/autoheader.m4
-share/autoconf213/autoheader.m4f
-share/autoconf213/config.guess
-share/autoconf213/config.sub
-share/autoconf213/install-sh
-@dirrm libexec/autoconf213
-@dirrm share/autoconf213
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+libexec/autoconf%%BUILD_VERSION%%/autoconf
+libexec/autoconf%%BUILD_VERSION%%/autoheader
+libexec/autoconf%%BUILD_VERSION%%/autoreconf
+libexec/autoconf%%BUILD_VERSION%%/autoscan
+libexec/autoconf%%BUILD_VERSION%%/autoupdate
+libexec/autoconf%%BUILD_VERSION%%/ifnames
+share/autoconf%%BUILD_VERSION%%/acconfig.h
+share/autoconf%%BUILD_VERSION%%/acfunctions
+share/autoconf%%BUILD_VERSION%%/acgeneral.m4
+share/autoconf%%BUILD_VERSION%%/acheaders
+share/autoconf%%BUILD_VERSION%%/acidentifiers
+share/autoconf%%BUILD_VERSION%%/acmakevars
+share/autoconf%%BUILD_VERSION%%/acoldnames.m4
+share/autoconf%%BUILD_VERSION%%/acprograms
+share/autoconf%%BUILD_VERSION%%/acspecific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoheader.m4f
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/install-sh
+@dirrm libexec/autoconf%%BUILD_VERSION%%
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index 2b528c639d83..9a21edda1a55 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -19,38 +19,20 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+LATEST_LINK=	autoconf
 USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
-CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
+CONFIGURE_ENV=	CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4
+CONFIGURE_ARGS=	--without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
-
-MAN1=		autoconf.1	\
-		autoheader.1	\
-		autom4te.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
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
diff --git a/devel/autoconf253/pkg-plist b/devel/autoconf253/pkg-plist
index e9c549f71932..fe71c6bd11e8 100644
--- a/devel/autoconf253/pkg-plist
+++ b/devel/autoconf253/pkg-plist
@@ -48,13 +48,6 @@ share/autoconf/m4sugar/version.m4
 share/autoconf/mdate-sh
 share/autoconf/missing
 share/autoconf/mkinstalldirs
-%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el
-%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc
-%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el
-%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc
-@comment directories
-%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp
-%%EMACS%%@dirrm %%EMACSDIR%%
 @dirrm share/autoconf/m4sugar
 @dirrm share/autoconf/autotest
 @dirrm share/autoconf/autoscan
diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/autoconf257/Makefile
+++ b/devel/autoconf257/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/autoconf257/files/manpages.mk b/devel/autoconf257/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/autoconf257/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/autoconf257/files/patch-autoconf.texi b/devel/autoconf257/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/autoconf257/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/autoconf257/files/patch-configure b/devel/autoconf257/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/autoconf257/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/autoconf257/files/patch-doc:Makefile.in b/devel/autoconf257/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/autoconf257/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/autoconf257/files/patch-standards.texi b/devel/autoconf257/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/autoconf257/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/autoconf257/pkg-plist b/devel/autoconf257/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/autoconf257/pkg-plist
+++ b/devel/autoconf257/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/autoconf259/files/manpages.mk b/devel/autoconf259/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/autoconf259/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/autoconf259/files/patch-autoconf.texi b/devel/autoconf259/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/autoconf259/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/autoconf259/files/patch-configure b/devel/autoconf259/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/autoconf259/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/autoconf259/files/patch-doc:Makefile.in b/devel/autoconf259/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/autoconf259/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/autoconf259/files/patch-standards.texi b/devel/autoconf259/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/autoconf259/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/autoconf259/pkg-plist b/devel/autoconf259/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/autoconf259/pkg-plist
+++ b/devel/autoconf259/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/autoconf26/files/manpages.mk b/devel/autoconf26/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/autoconf26/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/autoconf26/files/patch-autoconf.texi b/devel/autoconf26/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/autoconf26/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/autoconf26/files/patch-configure b/devel/autoconf26/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/autoconf26/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/autoconf26/files/patch-doc:Makefile.in b/devel/autoconf26/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/autoconf26/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/autoconf26/files/patch-standards.texi b/devel/autoconf26/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/autoconf26/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/autoconf26/pkg-plist b/devel/autoconf26/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/autoconf26/pkg-plist
+++ b/devel/autoconf26/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/autoconf261/files/manpages.mk b/devel/autoconf261/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/autoconf261/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/autoconf261/files/patch-autoconf.texi b/devel/autoconf261/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/autoconf261/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/autoconf261/files/patch-configure b/devel/autoconf261/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/autoconf261/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/autoconf261/files/patch-doc:Makefile.in b/devel/autoconf261/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/autoconf261/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/autoconf261/files/patch-standards.texi b/devel/autoconf261/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/autoconf261/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/autoconf261/pkg-plist
+++ b/devel/autoconf261/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/autoconf262/files/manpages.mk b/devel/autoconf262/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/autoconf262/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/autoconf262/files/patch-autoconf.texi b/devel/autoconf262/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/autoconf262/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/autoconf262/files/patch-configure b/devel/autoconf262/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/autoconf262/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/autoconf262/files/patch-doc:Makefile.in b/devel/autoconf262/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/autoconf262/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/autoconf262/files/patch-standards.texi b/devel/autoconf262/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/autoconf262/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/autoconf262/pkg-plist
+++ b/devel/autoconf262/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/autoconf267/files/manpages.mk b/devel/autoconf267/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/autoconf267/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/autoconf267/files/patch-autoconf.texi b/devel/autoconf267/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/autoconf267/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/autoconf267/files/patch-configure b/devel/autoconf267/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/autoconf267/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/autoconf267/files/patch-doc:Makefile.in b/devel/autoconf267/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/autoconf267/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/autoconf267/files/patch-standards.texi b/devel/autoconf267/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/autoconf267/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/autoconf267/pkg-plist b/devel/autoconf267/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/autoconf267/pkg-plist
+++ b/devel/autoconf267/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/autoconf268/files/manpages.mk b/devel/autoconf268/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/autoconf268/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/autoconf268/files/patch-autoconf.texi b/devel/autoconf268/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/autoconf268/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/autoconf268/files/patch-configure b/devel/autoconf268/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/autoconf268/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/autoconf268/files/patch-doc:Makefile.in b/devel/autoconf268/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/autoconf268/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/autoconf268/files/patch-standards.texi b/devel/autoconf268/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/autoconf268/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/autoconf268/pkg-plist
+++ b/devel/autoconf268/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index d2b41efd550b..888fa6bc9901 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	autoconf257
+PORTNAME=	autoconf
 PORTVERSION=	2.57
 PORTREVISION=	0
 CATEGORIES=	devel
@@ -20,32 +20,26 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+BUILD_VERSION=	257
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=257
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == "autoconf"
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+=	EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+=	EMACS="@comment " EMACSDIR=""
-.endif # no emacs found
-.endif # ${PORTNAME} == "autoconf"
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
+		missing	mkinstalldirs
 
-GENERIC_TOOLS=	config.guess	\
-		config.sub	\
-		elisp-comp	\
-		install-sh	\
-		mdate-sh	\
-		missing		\
-		mkinstalldirs
+MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
+		autoupdate config.guess config.sub ifnames
+MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 pre-everything::
@@ -57,12 +51,23 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
 
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(cd ${WRKSRC}/man && \
+		for file in *.[1x]; do \
+			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
+						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
+		done)
+	@(cd ${WRKSRC}/doc && \
+		${RM} -f *.info && \
+		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
+		${MV} standards.texi standards${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
+		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
+
 post-install:
-	${MKDIR} ${PREFIX}/share/autoconf257
 .for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257
+	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gnu-autoconf/files/manpages.mk b/devel/gnu-autoconf/files/manpages.mk
deleted file mode 100644
index 89f0c821598b..000000000000
--- a/devel/gnu-autoconf/files/manpages.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1=	autoconf257.1 \
-	autoreconf257.1 \
-	autoheader257.1 \
-	autoupdate257.1 \
-	ifnames257.1 \
-	autoscan257.1 \
-	autom4te257.1
diff --git a/devel/gnu-autoconf/files/patch-autoconf.texi b/devel/gnu-autoconf/files/patch-autoconf.texi
new file mode 100644
index 000000000000..50e1e8e7acab
--- /dev/null
+++ b/devel/gnu-autoconf/files/patch-autoconf.texi
@@ -0,0 +1,23 @@
+--- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
++++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf257.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf257
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -97,7 +97,7 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts
++* Autoconf257: (autoconf257).         Create source code configuration scripts
+ @end direntry
+ 
+ @dircategory Individual utilities
diff --git a/devel/gnu-autoconf/files/patch-configure b/devel/gnu-autoconf/files/patch-configure
deleted file mode 100644
index 9318d22ab266..000000000000
--- a/devel/gnu-autoconf/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jun 18 21:54:44 2003
-+++ configure	Wed Jun 18 21:55:06 2003
-@@ -1475,7 +1475,7 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=autoconf
-+ PACKAGE=autoconf257
-  VERSION=2.57
- 
- 
diff --git a/devel/gnu-autoconf/files/patch-doc:Makefile.in b/devel/gnu-autoconf/files/patch-doc:Makefile.in
deleted file mode 100644
index 18587ebe9d36..000000000000
--- a/devel/gnu-autoconf/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.in.orig	Wed Jun 18 22:18:17 2003
-+++ doc/Makefile.in	Wed Jun 18 22:19:32 2003
-@@ -113,7 +113,7 @@
- DIST_SOURCES =
- TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/config
--INFO_DEPS = autoconf.info standards.info
-+INFO_DEPS = 
- DVIS = autoconf.dvi standards.dvi
- PDFS = autoconf.pdf standards.pdf
- PSS = autoconf.ps standards.ps
-@@ -121,6 +121,11 @@
- DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
- 	Makefile.in stamp-vti version.texi
- all: all-am
-+
-+autoconf257.info: autoconf.info
-+	cp autoconf.info autoconf257.info
-+standards257.info: standards.info
-+	cp standards.info standards257.info
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .pdf .ps .texi
diff --git a/devel/gnu-autoconf/files/patch-standards.texi b/devel/gnu-autoconf/files/patch-standards.texi
new file mode 100644
index 000000000000..51c669fafb1b
--- /dev/null
+++ b/devel/gnu-autoconf/files/patch-standards.texi
@@ -0,0 +1,19 @@
+--- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
++++ doc/standards.texi	Sun Jun  1 18:54:00 2003
+@@ -1,6 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename standards.info
++@setfilename standards257.info
+ @settitle GNU Coding Standards
+ @c This date is automagically updated when you save this file:
+ @set lastupdate November 23, 2002
+@@ -8,7 +8,7 @@
+ 
+ @dircategory GNU organization
+ @direntry
+-* Standards: (standards).        GNU coding standards.
++* Standards257: (standards257).        GNU coding standards.
+ @end direntry
+ 
+ @c @setchapternewpage odd
diff --git a/devel/gnu-autoconf/pkg-plist b/devel/gnu-autoconf/pkg-plist
index 42e7438c75ea..26f1b36ec1cc 100644
--- a/devel/gnu-autoconf/pkg-plist
+++ b/devel/gnu-autoconf/pkg-plist
@@ -1,53 +1,58 @@
-bin/autoconf257
-bin/autoheader257
-bin/autom4te257
-bin/autoreconf257
-bin/autoscan257
-bin/autoupdate257
-bin/ifnames257
-share/autoconf257/Autom4te/General.pm
-share/autoconf257/Autom4te/Struct.pm
-share/autoconf257/Autom4te/XFile.pm
-share/autoconf257/INSTALL
-share/autoconf257/autoconf/autoconf.m4
-share/autoconf257/autoconf/autoconf.m4f
-share/autoconf257/autoconf/autoheader.m4
-share/autoconf257/autoconf/autoscan.m4
-share/autoconf257/autoconf/autotest.m4
-share/autoconf257/autoconf/autoupdate.m4
-share/autoconf257/autoconf/c.m4
-share/autoconf257/autoconf/fortran.m4
-share/autoconf257/autoconf/functions.m4
-share/autoconf257/autoconf/general.m4
-share/autoconf257/autoconf/headers.m4
-share/autoconf257/autoconf/lang.m4
-share/autoconf257/autoconf/libs.m4
-share/autoconf257/autoconf/oldnames.m4
-share/autoconf257/autoconf/programs.m4
-share/autoconf257/autoconf/specific.m4
-share/autoconf257/autoconf/status.m4
-share/autoconf257/autoconf/types.m4
-share/autoconf257/autom4te.cfg
-share/autoconf257/autoscan/autoscan.list
-share/autoconf257/autotest/autotest.m4
-share/autoconf257/autotest/autotest.m4f
-share/autoconf257/autotest/general.m4
-share/autoconf257/config.guess
-share/autoconf257/config.sub
-share/autoconf257/elisp-comp
-share/autoconf257/install-sh
-share/autoconf257/m4sugar/m4sh.m4
-share/autoconf257/m4sugar/m4sh.m4f
-share/autoconf257/m4sugar/m4sugar.m4
-share/autoconf257/m4sugar/m4sugar.m4f
-share/autoconf257/m4sugar/version.m4
-share/autoconf257/mdate-sh
-share/autoconf257/missing
-share/autoconf257/mkinstalldirs
-@dirrm share/autoconf257/m4sugar
-@dirrm share/autoconf257/autotest
-@dirrm share/autoconf257/autoscan
-@dirrm share/autoconf257/autoconf
-@dirrm share/autoconf257/Autom4te
-@dirrm share/autoconf257
-@unexec rmdir %D/info 2>/dev/null || true
+bin/autoconf%%BUILD_VERSION%%
+bin/autoheader%%BUILD_VERSION%%
+bin/autom4te%%BUILD_VERSION%%
+bin/autoreconf%%BUILD_VERSION%%
+bin/autoscan%%BUILD_VERSION%%
+bin/autoupdate%%BUILD_VERSION%%
+bin/ifnames%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+info/autoconf%%BUILD_VERSION%%.info
+info/standards%%BUILD_VERSION%%.info
+@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
+@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
+share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
+share/autoconf%%BUILD_VERSION%%/INSTALL
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
+share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
+share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
+share/autoconf%%BUILD_VERSION%%/autom4te.cfg
+share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
+share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
+share/autoconf%%BUILD_VERSION%%/autotest/general.m4
+share/autoconf%%BUILD_VERSION%%/config.guess
+share/autoconf%%BUILD_VERSION%%/config.sub
+share/autoconf%%BUILD_VERSION%%/elisp-comp
+share/autoconf%%BUILD_VERSION%%/install-sh
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
+share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
+share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
+share/autoconf%%BUILD_VERSION%%/mdate-sh
+share/autoconf%%BUILD_VERSION%%/missing
+share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
+@dirrm share/autoconf%%BUILD_VERSION%%/autotest
+@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
+@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
+@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
+@dirrm share/autoconf%%BUILD_VERSION%%