3 files changed, 43 insertions, 26 deletions

diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index bb51bf4c0421..904a37ab1c50 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -11,7 +11,7 @@
 
 PORTNAME=	autoconf213
 PORTVERSION=	2.13.000227
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} ${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	binutils autoconf
@@ -25,7 +25,7 @@ RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=213 --datadir=${PREFIX}/share/autoconf213
+CONFIGURE_ARGS=	--program-suffix=213
 WRKSRC=		${WRKDIR}/autoconf
 
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
@@ -33,16 +33,16 @@ WRKSRC=		${WRKDIR}/autoconf
 .endif
 
 post-patch:
-	@-${RM} ${WRKSRC}/*.info*
+	@${RM} ${WRKSRC}/*.info* >/dev/null 2>&1 || true
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/install-sh \
-		${PREFIX}/share/autoconf213/autoconf
+	@${CHMOD} +x ${PREFIX}/share/autoconf213/config.*
+	@${INSTALL_SCRIPT} ${WRKSRC}/install-sh ${PREFIX}/share/autoconf213
 	@-${RM} -fr ${PREFIX}/libexec/autoconf213
-	@${MKDIR} ${PREFIX}/libexec/autoconf213
+	${MKDIR} ${PREFIX}/libexec/autoconf213
 .for i in autoconf autoheader autoreconf autoscan autoupdate ifnames
-	@${LN} -s ../../bin/${i}213 ${PREFIX}/libexec/autoconf213/${i}
+	${LN} -s ../../bin/${i}213 ${PREFIX}/libexec/autoconf213/${i}
 .endfor
-	@install-info ${PREFIX}/info/autoconf213.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/autoconf213.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf213/files/patch-Makefile.in b/devel/autoconf213/files/patch-Makefile.in
index f4209996cb78..c2f58f6abbb7 100644
--- a/devel/autoconf213/files/patch-Makefile.in
+++ b/devel/autoconf213/files/patch-Makefile.in
@@ -1,5 +1,14 @@
 --- Makefile.in.orig	Sun Feb 27 11:18:10 2000
-+++ Makefile.in	Mon Mar 18 21:10:20 2002
++++ Makefile.in	Sat Oct 12 19:40:56 2002
+@@ -49,7 +49,7 @@
+ 
+ # Directory in which to install library files.
+ datadir = @datadir@
+-acdatadir = $(datadir)/autoconf
++acdatadir = $(datadir)/autoconf213
+ 
+ # 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) \
@@ -22,6 +31,15 @@
  	$(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
diff --git a/devel/autoconf213/pkg-plist b/devel/autoconf213/pkg-plist
index c38132a7befc..fa84b581ed6a 100644
--- a/devel/autoconf213/pkg-plist
+++ b/devel/autoconf213/pkg-plist
@@ -13,22 +13,21 @@ libexec/autoconf213/autoreconf
 libexec/autoconf213/autoscan
 libexec/autoconf213/autoupdate
 libexec/autoconf213/ifnames
-share/autoconf213/autoconf/acconfig.h
-share/autoconf213/autoconf/acfunctions
-share/autoconf213/autoconf/acgeneral.m4
-share/autoconf213/autoconf/acheaders
-share/autoconf213/autoconf/acidentifiers
-share/autoconf213/autoconf/acmakevars
-share/autoconf213/autoconf/acoldnames.m4
-share/autoconf213/autoconf/acprograms
-share/autoconf213/autoconf/acspecific.m4
-share/autoconf213/autoconf/autoconf.m4
-share/autoconf213/autoconf/autoconf.m4f
-share/autoconf213/autoconf/autoheader.m4
-share/autoconf213/autoconf/autoheader.m4f
-share/autoconf213/autoconf/config.guess
-share/autoconf213/autoconf/config.sub
-share/autoconf213/autoconf/install-sh
+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/autoconf
 @dirrm share/autoconf213