8 files changed, 79 insertions, 163 deletions

diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index aa6be53c07c7..6420504f9d4f 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -7,64 +7,35 @@
 
 PORTNAME=	autoconf
 PORTVERSION=	2.59
-PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
+PKGNAMEPREFIX=	gnu-
 DISTNAME=	autoconf-${PORTVERSION}
 
-MAINTAINER=	ade@FreeBSD.org
+MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms (version 2.59)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-BUILD_VERSION=	259
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_REINPLACE=	yes
-INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
+
+PREFIX?=	${LOCALBASE}/gnu-autotools
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_ARGS=	--without-lispdir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-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}
-
-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)
+MAN1=		autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 \
+		autoupdate.1 config.guess.1 config.sub.1 ifnames.1
 
 post-install:
-.for FILE in ${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}
-.endfor
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-autoconf/files/patch-autoconf.texi b/devel/gnu-autoconf/files/patch-autoconf.texi
deleted file mode 100644
index 32c58797956f..000000000000
--- a/devel/gnu-autoconf/files/patch-autoconf.texi
+++ /dev/null
@@ -1,35 +0,0 @@
---- doc/autoconf.texi.orig	Wed Nov  5 10:38:29 2003
-+++ doc/autoconf.texi	Thu Oct 14 20:17:35 2004
-@@ -3,5 +3,5 @@
- @comment %**start of header
--@setfilename autoconf.info
-+@setfilename autoconf259.info
- @include version.texi
--@settitle Autoconf
-+@settitle Autoconf259
- @setchapternewpage odd
-@@ -212,23 +212,3 @@
- @direntry
--* Autoconf: (autoconf).         Create source code configuration scripts.
--@end direntry
--
--@dircategory Individual utilities
--@direntry
--* autoscan: (autoconf)autoscan Invocation.
--                                Semi-automatic @file{configure.ac} writing
--* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
--* autoconf: (autoconf)autoconf Invocation.
--                                How to create configuration scripts
--* autoreconf: (autoconf)autoreconf Invocation.
--                                Remaking multiple @command{configure} scripts
--* autoheader: (autoconf)autoheader Invocation.
--                                How to create configuration templates
--* autom4te: (autoconf)autom4te Invocation.
--                                The Autoconf executables backbone
--* configure: (autoconf)configure Invocation.    Configuring a package.
--* autoupdate: (autoconf)autoupdate Invocation.
--                                Automatic update of @file{configure.ac}
--* config.status: (autoconf)config.status Invocation. Recreating configurations.
--* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
-+* Autoconf259: (autoconf259).         Create source code configuration scripts.
- @end direntry
diff --git a/devel/gnu-autoconf/files/patch-autoreconf.in b/devel/gnu-autoconf/files/patch-autoreconf.in
deleted file mode 100644
index e0545245db62..000000000000
--- a/devel/gnu-autoconf/files/patch-autoreconf.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- bin/autoreconf.in.orig	Fri Oct  3 07:31:23 2003
-+++ bin/autoreconf.in	Wed Jun 30 20:15:18 2004
-@@ -488,3 +488,3 @@
-       verb "$configure_ac: creating directory $aux_dir";
--      mkdir $aux_dir
-+      mkdir $aux_dir, 0777
- 	or error "cannot create $aux_dir: $!";
diff --git a/devel/gnu-autoconf/files/patch-configure b/devel/gnu-autoconf/files/patch-configure
deleted file mode 100644
index bc622f2b52b1..000000000000
--- a/devel/gnu-autoconf/files/patch-configure
+++ /dev/null
@@ -1,7 +0,0 @@
---- configure.orig	Thu Nov  6 01:33:28 2003
-+++ configure	Sun Mar 14 16:53:34 2004
-@@ -1536,3 +1536,3 @@
- # Define the identity of the package.
-- PACKAGE='autoconf'
-+ PACKAGE='autoconf259'
-  VERSION='2.59'
diff --git a/devel/gnu-autoconf/files/patch-standards.texi b/devel/gnu-autoconf/files/patch-standards.texi
deleted file mode 100644
index 9d6134950668..000000000000
--- a/devel/gnu-autoconf/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 standards259.info
- @settitle GNU Coding Standards
-@@ -10,3 +10,3 @@
- @direntry
--* Standards: (standards).        GNU coding standards.
-+* Standards259: (standards259).        GNU coding standards.
- @end direntry
diff --git a/devel/gnu-autoconf/pkg-descr b/devel/gnu-autoconf/pkg-descr
index c404cc852ea8..2cb2ea8e0f09 100644
--- a/devel/gnu-autoconf/pkg-descr
+++ b/devel/gnu-autoconf/pkg-descr
@@ -6,4 +6,9 @@ configuration script for a package from a template file that lists the
 operating system features that the package can use, in the form of m4
 macro calls.
 
+This port is specifically designed for developers that want to create
+cross-platform software distributions on FreeBSD.  This version of autoconf
+should _NEVER_ be used with the FreeBSD ports system as a replacement for the
+versioned copies of autoconf.
+
 WWW: http://www.gnu.org/software/autoconf/
diff --git a/devel/gnu-autoconf/pkg-message b/devel/gnu-autoconf/pkg-message
new file mode 100644
index 000000000000..2200a7959d99
--- /dev/null
+++ b/devel/gnu-autoconf/pkg-message
@@ -0,0 +1,9 @@
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!CAUTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+This port is specifically designed for developers that want to create
+cross-platform software distributions on FreeBSD.  This version of autoconf
+should _NEVER_ be used with the FreeBSD ports system as a replacement for the
+versioned copies of autoconf.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!CAUTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/devel/gnu-autoconf/pkg-plist b/devel/gnu-autoconf/pkg-plist
index ac4409d55537..e6a238684e3d 100644
--- a/devel/gnu-autoconf/pkg-plist
+++ b/devel/gnu-autoconf/pkg-plist
@@ -1,65 +1,57 @@
-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/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%%
-@dirrm libexec/autoconf%%BUILD_VERSION%%
+bin/autoconf
+bin/autoheader
+bin/autom4te
+bin/autoreconf
+bin/autoscan
+bin/autoupdate
+bin/ifnames
+@unexec install-info --delete %D/info/autoconf.info %D/info/dir
+@unexec install-info --delete %D/info/standards.info %D/info/dir
+info/autoconf.info
+info/standards.info
+@exec install-info %D/info/autoconf.info %D/info/dir
+@exec install-info %D/info/standards.info %D/info/dir
+share/autoconf/Autom4te/C4che.pm
+share/autoconf/Autom4te/ChannelDefs.pm
+share/autoconf/Autom4te/Channels.pm
+share/autoconf/Autom4te/Configure_ac.pm
+share/autoconf/Autom4te/FileUtils.pm
+share/autoconf/Autom4te/General.pm
+share/autoconf/Autom4te/Request.pm
+share/autoconf/Autom4te/Struct.pm
+share/autoconf/Autom4te/XFile.pm
+share/autoconf/INSTALL
+share/autoconf/autoconf/autoconf.m4
+share/autoconf/autoconf/autoconf.m4f
+share/autoconf/autoconf/autoheader.m4
+share/autoconf/autoconf/autoscan.m4
+share/autoconf/autoconf/autotest.m4
+share/autoconf/autoconf/autoupdate.m4
+share/autoconf/autoconf/c.m4
+share/autoconf/autoconf/fortran.m4
+share/autoconf/autoconf/functions.m4
+share/autoconf/autoconf/general.m4
+share/autoconf/autoconf/headers.m4
+share/autoconf/autoconf/lang.m4
+share/autoconf/autoconf/libs.m4
+share/autoconf/autoconf/oldnames.m4
+share/autoconf/autoconf/programs.m4
+share/autoconf/autoconf/specific.m4
+share/autoconf/autoconf/status.m4
+share/autoconf/autoconf/types.m4
+share/autoconf/autom4te.cfg
+share/autoconf/autoscan/autoscan.list
+share/autoconf/autotest/autotest.m4
+share/autoconf/autotest/autotest.m4f
+share/autoconf/autotest/general.m4
+share/autoconf/m4sugar/m4sh.m4
+share/autoconf/m4sugar/m4sh.m4f
+share/autoconf/m4sugar/m4sugar.m4
+share/autoconf/m4sugar/m4sugar.m4f
+share/autoconf/m4sugar/version.m4
+@dirrm share/autoconf/m4sugar
+@dirrm share/autoconf/autotest
+@dirrm share/autoconf/autoscan
+@dirrm share/autoconf/autoconf
+@dirrm share/autoconf/Autom4te
+@dirrm share/autoconf