5 files changed, 107 insertions, 104 deletions

diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index b546aa6353cf..b05b78eecbaa 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autoconf
 PORTVERSION=	2.53
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,19 +17,20 @@ COMMENT=	Automatically configure source code on many Un*x platforms (2.53)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper
 
-BUILD_VERSION=	253
+BUILD_VERSION=	2.53
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	autoconf${BUILD_VERSION}
+LATEST_LINK=	autoconf253
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_RUN=	yes
-INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
+INFO=		autoconf-${BUILD_VERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION} --without-lispdir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
@@ -37,31 +38,21 @@ GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
 
 MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
-MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
+MAN1=		${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g}
 
 post-patch:
-	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
+	@(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 ; \
+			${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)
+	@(cd ${WRKSRC}/doc && ${RM} -f *.info && \
+		${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi)
 
 post-install:
 .for FILE in ${GENERIC_TOOLS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
-.endfor
-	@-${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}${BUILD_VERSION} \
-		${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i}
+	@${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf253/files/patch-autoconf.texi b/devel/autoconf253/files/patch-autoconf.texi
index 96be39a790c3..ccff64a74e97 100644
--- a/devel/autoconf253/files/patch-autoconf.texi
+++ b/devel/autoconf253/files/patch-autoconf.texi
@@ -1,13 +1,16 @@
---- doc/autoconf.texi.orig	Fri Mar  8 12:57:41 2002
-+++ doc/autoconf.texi	Thu Oct 14 20:14:14 2004
+--- doc/autoconf.texi.orig	Fri Mar  8 04:57:41 2002
++++ doc/autoconf.texi	Sat Apr 14 15:36:01 2007
 @@ -2,4 +2,4 @@
  @c %**start of header
 -@setfilename autoconf.info
 -@settitle Autoconf
-+@setfilename autoconf253.info
-+@settitle Autoconf253
++@setfilename autoconf-2.53.info
++@settitle Autoconf-2.53
  
-@@ -36,21 +36,3 @@
+@@ -34,23 +34,5 @@
+ 
+-@dircategory GNU admin
++@dircategory Programming & development tools
  @direntry
 -* Autoconf: (autoconf).         Create source code configuration scripts
 -@end direntry
@@ -28,5 +31,5 @@
 -                                Recreating a configuration
 -* testsuite: (autoconf)testsuite Invocation.
 -                                Running an Autotest test suite
-+* Autoconf253: (autoconf253).         Create source code configuration scripts
++* Autoconf-2.53: (autoconf-2.53).   Create source code configuration scripts.
  @end direntry
diff --git a/devel/autoconf253/files/patch-doc-Makefile.in b/devel/autoconf253/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..a4d4c79be5f0
--- /dev/null
+++ b/devel/autoconf253/files/patch-doc-Makefile.in
@@ -0,0 +1,28 @@
+--- doc/Makefile.in.orig	Fri Mar  8 05:10:30 2002
++++ doc/Makefile.in	Thu Apr  5 01:01:20 2007
+@@ -86,3 +86,3 @@
+ 
+-info_TEXINFOS = autoconf.texi standards.texi
++info_TEXINFOS = autoconf-2.53.texi
+ autoconf_TEXINFOS = fdl.texi install.texi
+@@ -103,5 +103,5 @@
+ TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
+-INFO_DEPS = autoconf.info standards.info
+-DVIS = autoconf.dvi standards.dvi
+-TEXINFOS = autoconf.texi standards.texi
++INFO_DEPS = autoconf-2.53.info
++DVIS = autoconf.dvi
++TEXINFOS = autoconf-2.53.texi
+ DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
+@@ -120,4 +120,4 @@
+ 	@:
+-$(srcdir)/stamp-vti: autoconf.texi $(top_srcdir)/configure.ac
+-	@(set `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/autoconf.texi`; \
++$(srcdir)/stamp-vti: autoconf-2.53.texi $(top_srcdir)/configure.ac
++	@(set `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/autoconf-2.53.texi`; \
+ 	echo "@set UPDATED $$1 $$2 $$3"; \
+@@ -138,3 +138,3 @@
+ 
+-autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
++autoconf-2.53.info: autoconf-2.53.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
+ autoconf.dvi: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
diff --git a/devel/autoconf253/files/patch-standards.texi b/devel/autoconf253/files/patch-standards.texi
deleted file mode 100644
index a0386512057f..000000000000
--- a/devel/autoconf253/files/patch-standards.texi
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/standards.texi.orig	Fri Nov  2 08:29:03 2001
-+++ doc/standards.texi	Wed Feb 11 00:11:15 2004
-@@ -2,3 +2,3 @@
- @c %**start of header
--@setfilename standards.info
-+@setfilename standards253.info
- @settitle GNU Coding Standards
-@@ -11,3 +11,3 @@
- START-INFO-DIR-ENTRY
--* Standards: (standards).        GNU coding standards.
-+* Standards253: (standards253).        GNU coding standards.
- END-INFO-DIR-ENTRY
diff --git a/devel/autoconf253/pkg-plist b/devel/autoconf253/pkg-plist
index c8c9fde3e23c..7dc8deef61d1 100644
--- a/devel/autoconf253/pkg-plist
+++ b/devel/autoconf253/pkg-plist
@@ -1,63 +1,56 @@
-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%%
-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%%/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/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/functions
-share/autoconf%%BUILD_VERSION%%/autoscan/headers
-share/autoconf%%BUILD_VERSION%%/autoscan/identifiers
-share/autoconf%%BUILD_VERSION%%/autoscan/libraries
-share/autoconf%%BUILD_VERSION%%/autoscan/makevars
-share/autoconf%%BUILD_VERSION%%/autoscan/programs
-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%%
-@dirrm libexec/autoconf%%BUILD_VERSION%%
+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%%
+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/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/functions
+share/autoconf-%%BUILD_VERSION%%/autoscan/headers
+share/autoconf-%%BUILD_VERSION%%/autoscan/identifiers
+share/autoconf-%%BUILD_VERSION%%/autoscan/libraries
+share/autoconf-%%BUILD_VERSION%%/autoscan/makevars
+share/autoconf-%%BUILD_VERSION%%/autoscan/programs
+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%%