6 files changed, 107 insertions, 110 deletions

diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index 4185285da65c..bbb91a356664 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	autoconf
 PORTVERSION=	2.61
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
@@ -17,27 +18,28 @@ COMMENT=	Automatically configure source code on many Un*x platforms (2.61)
 
 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=	261
+BUILD_VERSION=	2.61
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	autoconf${BUILD_VERSION}
+LATEST_LINK=	autoconf261
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
+INFO=		autoconf-${BUILD_VERSION}
 
 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=	--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 missing
+GENERIC_LINKS=	autoconf autoheader autom4te autoreconf autoscan autoupdate \
+		ifnames
 
-MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
-		autoupdate config.guess config.sub ifnames
-MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
+MAN1_PAGES=	${GENERIC_LINKS} config.guess config.sub
+MAN1=		${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g}
 
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
@@ -48,20 +50,13 @@ post-patch:
 		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)
+		${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi)
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@PACKAGE@$$|@PACKAGE@-@VERSION@|'
 
 post-install:
 .for FILE in ${GENERIC_TOOLS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${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}/build-aux/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf268/files/patch-autoconf.texi b/devel/autoconf268/files/patch-autoconf.texi
index f561aee323f9..96b0ec210a63 100644
--- a/devel/autoconf268/files/patch-autoconf.texi
+++ b/devel/autoconf268/files/patch-autoconf.texi
@@ -1,14 +1,17 @@
---- doc/autoconf.texi.orig	Wed Nov  5 10:38:29 2003
-+++ doc/autoconf.texi	Thu Oct 14 20:17:35 2004
+--- doc/autoconf.texi.orig	Thu Nov 16 16:16:27 2006
++++ doc/autoconf.texi	Sat Apr 14 15:41:27 2007
 @@ -3,5 +3,5 @@
  @comment %**start of header
 -@setfilename autoconf.info
-+@setfilename autoconf261.info
++@setfilename autoconf-2.61.info
  @include version.texi
 -@settitle Autoconf
-+@settitle Autoconf261
++@settitle Autoconf-2.61
  @setchapternewpage odd
-@@ -212,23 +212,3 @@
+@@ -205,25 +205,5 @@
+ 
+-@dircategory Software development
++@dircategory Programming & development tools
  @direntry
 -* Autoconf: (autoconf).         Create source code configuration scripts.
 -@end direntry
@@ -31,5 +34,5 @@
 -                                Automatic update of @file{configure.ac}
 -* config.status: (autoconf)config.status Invocation. Recreating configurations.
 -* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
-+* Autoconf261: (autoconf261).         Create source code configuration scripts.
++* Autoconf-2.61: (autoconf-2.61).   Create source code configuration scripts.
  @end direntry
diff --git a/devel/autoconf268/files/patch-configure b/devel/autoconf268/files/patch-configure
deleted file mode 100644
index 0d805971c245..000000000000
--- a/devel/autoconf268/files/patch-configure
+++ /dev/null
@@ -1,7 +0,0 @@
---- configure.orig	Fri Nov 17 11:05:17 2006
-+++ configure	Sun Dec  3 16:58:50 2006
-@@ -2013,3 +2013,3 @@
- # Define the identity of the package.
-- PACKAGE='autoconf'
-+ PACKAGE='autoconf261'
-  VERSION='2.61'
diff --git a/devel/autoconf268/files/patch-doc-Makefile.in b/devel/autoconf268/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..8597e60bd979
--- /dev/null
+++ b/devel/autoconf268/files/patch-doc-Makefile.in
@@ -0,0 +1,25 @@
+--- doc/Makefile.in.orig	Mon Oct 16 13:58:44 2006
++++ doc/Makefile.in	Thu Apr  5 01:51:13 2007
+@@ -44,3 +44,3 @@
+ DIST_SOURCES =
+-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
++INFO_DEPS = $(srcdir)/autoconf-2.61.info
+ TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+@@ -51,3 +51,3 @@
+ HTMLS = autoconf.html standards.html
+-TEXINFOS = autoconf.texi standards.texi
++TEXINFOS = autoconf-2.61.texi
+ TEXI2PDF = $(TEXI2DVI) --pdf --batch
+@@ -241,3 +241,3 @@
+ 	fi
+-$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
++$(srcdir)/autoconf-2.61.info: autoconf-2.61.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
+ autoconf.dvi: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
+@@ -246,5 +246,5 @@
+ $(srcdir)/version.texi:  $(srcdir)/stamp-vti
+-$(srcdir)/stamp-vti: autoconf.texi $(top_srcdir)/configure
++$(srcdir)/stamp-vti: autoconf-2.61.texi $(top_srcdir)/configure
+ 	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
+-	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/autoconf.texi`; \
++	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/autoconf-2.61.texi`; \
+ 	echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/devel/autoconf268/files/patch-standards.texi b/devel/autoconf268/files/patch-standards.texi
deleted file mode 100644
index 7ecda7e79ef4..000000000000
--- a/devel/autoconf268/files/patch-standards.texi
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/standards.texi.orig	Sun Sep 14 18:33:44 2003
-+++ doc/standards.texi	Sun Mar 14 16:47:41 2004
-@@ -2,3 +2,3 @@
- @c %**start of header
--@setfilename standards.info
-+@setfilename standards261.info
- @settitle GNU Coding Standards
-@@ -10,3 +10,3 @@
- @direntry
--* Standards: (standards).        GNU coding standards.
-+* Standards261: (standards261).        GNU coding standards.
- @end direntry
diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist
index cb89cfdb2c54..b9ef638c9691 100644
--- a/devel/autoconf268/pkg-plist
+++ b/devel/autoconf268/pkg-plist
@@ -1,65 +1,58 @@
-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/C4che.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/Request.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/erlang.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
-@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/C4che.pm
+share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm
+share/autoconf-%%BUILD_VERSION%%/Autom4te/Channels.pm
+share/autoconf-%%BUILD_VERSION%%/Autom4te/Configure_ac.pm
+share/autoconf-%%BUILD_VERSION%%/Autom4te/FileUtils.pm
+share/autoconf-%%BUILD_VERSION%%/Autom4te/General.pm
+share/autoconf-%%BUILD_VERSION%%/Autom4te/Request.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/erlang.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
+@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%%