4 files changed, 51 insertions, 105 deletions

diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 48984a9558a9..795de66d8fb2 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autoconf
 PORTVERSION=	2.13.000227
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ade/gnu
@@ -17,32 +17,29 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms (2.13)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper
 
-BUILD_VERSION=	213
+BUILD_VERSION=	2.13
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	autoconf${BUILD_VERSION}
+LATEST_LINK=	autoconf213
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
+CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/autoconf
-INFO=		autoconf${BUILD_VERSION}
+INFO=		autoconf-${BUILD_VERSION}
+
+STRIP=		# none
 
 post-patch:
 	@${RM} ${WRKSRC}/*.info* >/dev/null 2>&1 || true
 
 post-install:
-	@${CHMOD} +x ${PREFIX}/share/autoconf${BUILD_VERSION}/config.*
+	@${CHMOD} +x ${PREFIX}/share/autoconf-${BUILD_VERSION}/config.*
 	@${INSTALL_SCRIPT} ${WRKSRC}/install-sh \
-		${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}${BUILD_VERSION} \
-		${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i}
-.endfor
+		${PREFIX}/share/autoconf-${BUILD_VERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf213/files/patch-Makefile.in b/devel/autoconf213/files/patch-Makefile.in
index c2f58f6abbb7..cddd63509ff7 100644
--- a/devel/autoconf213/files/patch-Makefile.in
+++ b/devel/autoconf213/files/patch-Makefile.in
@@ -1,80 +1,36 @@
---- Makefile.in.orig	Sun Feb 27 11:18:10 2000
-+++ Makefile.in	Sat Oct 12 19:40:56 2002
-@@ -49,7 +49,7 @@
- 
- # Directory in which to install library files.
+--- Makefile.in.orig	Sun Feb 27 08:18:10 2000
++++ Makefile.in	Thu Apr  5 02:14:57 2007
+@@ -51,3 +51,3 @@
  datadir = @datadir@
 -acdatadir = $(datadir)/autoconf
-+acdatadir = $(datadir)/autoconf213
++acdatadir = $(datadir)/autoconf-2.13
  
- # Directory in which to install documentation info files.
- infodir = @infodir@
-@@ -68,7 +68,7 @@
- DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \
- 	Makefile.in NEWS README TODO $(M4FILES) \
+@@ -70,3 +70,3 @@
  	acconfig.h acfunctions acheaders acidentifiers \
 -	acmakevars acprograms autoconf.info* \
-+	acmakevars acprograms autoconf213.info* \
++	acmakevars acprograms autoconf-2.13.info* \
  	autoconf.sh autoconf.texi install.texi \
- 	autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \
- 	config.guess config.sub configure configure.in \
-@@ -106,10 +106,10 @@
- autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4
- autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4
+@@ -108,6 +108,6 @@
  
 -info: autoconf.info @standards_info@ INSTALL
-+info: autoconf213.info
++info: autoconf-2.13.info
  
  # Use --no-split to avoid creating filenames > 14 chars.
 -autoconf.info: autoconf.texi install.texi
-+autoconf213.info: autoconf.texi install.texi
++autoconf-2.13.info: autoconf.texi install.texi
  	$(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@
- 
- INSTALL: install.texi
-@@ -119,7 +119,7 @@
- standards.info: standards.texi make-stds.texi
- 	$(MAKEINFO) -I$(srcdir) $(srcdir)/standards.texi --no-split --output=$@
- 
--dvi: autoconf.dvi @standards_dvi@
-+dvi: autoconf.dvi
- 
- autoconf.dvi: autoconf.texi
- 	$(TEXI2DVI) $(srcdir)/autoconf.texi
-@@ -141,7 +141,7 @@
- 
- install: all $(M4FILES) acconfig.h installdirs install-info
- 	for p in $(ASCRIPTS); do \
--	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
- 	done
- 	for i in $(M4FROZEN); do \
- 	  $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-@@ -150,16 +150,16 @@
- 	  $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
- 	done
- 	-if test -f autoscan; then \
--	$(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+	$(INSTALL) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
+@@ -154,3 +154,3 @@
  	for i in acfunctions acheaders acidentifiers acprograms \
 -	  acmakevars; do \
 +	  acmakevars config.guess config.sub; do \
  	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
- 	done; \
- 	else :; fi
- 
- # Don't cd, to avoid breaking install-sh references.
+@@ -161,3 +161,3 @@
  install-info: info installdirs
 -	if test -f autoconf.info; then \
-+	if test -f autoconf213.info; then \
++	if test -f autoconf-2.13.info; then \
  	  for i in *.info*; do \
- 	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
- 	  done; \
-@@ -174,7 +174,7 @@
- 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
- 	done
+@@ -176,3 +176,3 @@
  	rm -fr $(acdatadir)
 -	cd $(infodir) && rm -f autoconf.info*
-+	cd $(infodir) && rm -f autoconf213.info*
++	cd $(infodir) && rm -f autoconf-2.13.info*
  	if test -f standards.info || test -f $(srcdir)/standards.info; \
- 	then cd $(infodir) && rm -f standards.info*; fi
- 
diff --git a/devel/autoconf213/files/patch-autoconf.texi b/devel/autoconf213/files/patch-autoconf.texi
index 7f621a6e827e..85f0dbb08b70 100644
--- a/devel/autoconf213/files/patch-autoconf.texi
+++ b/devel/autoconf213/files/patch-autoconf.texi
@@ -5,8 +5,8 @@
  @c %**start of header
 -@setfilename autoconf.info
 -@settitle Autoconf
-+@setfilename autoconf213.info
-+@settitle Autoconf213
++@setfilename autoconf-2.13.info
++@settitle Autoconf-2.13
  @c For double-sided printing, uncomment:
  @c @setchapternewpage odd
 +@dircategory Programming & development tools
@@ -18,7 +18,7 @@
  @format
  START-INFO-DIR-ENTRY
 -* Autoconf: (autoconf).         Create source code configuration scripts.
-+* Autoconf213: (autoconf213).   Create source code configuration scripts.
++* Autoconf-2.13: (autoconf-2.13).   Create source code configuration scripts.
  END-INFO-DIR-ENTRY
  @end format
  
diff --git a/devel/autoconf213/pkg-plist b/devel/autoconf213/pkg-plist
index bc5307aebbbe..a9bb8e2e926d 100644
--- a/devel/autoconf213/pkg-plist
+++ b/devel/autoconf213/pkg-plist
@@ -1,30 +1,23 @@
-bin/autoconf%%BUILD_VERSION%%
-bin/autoheader%%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%%/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%%
+bin/autoconf-%%BUILD_VERSION%%
+bin/autoheader-%%BUILD_VERSION%%
+bin/autoreconf-%%BUILD_VERSION%%
+bin/autoscan-%%BUILD_VERSION%%
+bin/autoupdate-%%BUILD_VERSION%%
+bin/ifnames-%%BUILD_VERSION%%
+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 share/autoconf-%%BUILD_VERSION%%