7 files changed, 21 insertions, 29 deletions

diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index a0f79d3491cd..ea256424ef99 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	autoconf
-PORTVERSION=	2.59
-PORTREVISION=	2
+PORTVERSION=	2.61
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf
 DISTNAME=	autoconf-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
-COMMENT=	Automatically configure source code on many Un*x platforms (2.59)
+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
 
-BUILD_VERSION=	259
+BUILD_VERSION=	261
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 LATEST_LINK=	autoconf${BUILD_VERSION}
 USE_BZIP2=	yes
@@ -31,11 +30,11 @@ INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir \
+		--infodir=${PREFIX}/info --mandir=${PREFIX}/man
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
-		missing	mkinstalldirs
+GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh missing
 
 MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
@@ -57,7 +56,7 @@ post-patch:
 
 post-install:
 .for FILE in ${GENERIC_TOOLS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
+	@${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}
diff --git a/devel/autoconf262/distinfo b/devel/autoconf262/distinfo
index 054995511c19..ac474e6d44ce 100644
--- a/devel/autoconf262/distinfo
+++ b/devel/autoconf262/distinfo
@@ -1,3 +1,3 @@
-MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f
-SHA256 (autoconf-2.59.tar.bz2) = f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7
-SIZE (autoconf-2.59.tar.bz2) = 925073
+MD5 (autoconf-2.61.tar.bz2) = 36d3fe706ad0950f1be10c46a429efe0
+SHA256 (autoconf-2.61.tar.bz2) = 93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1
+SIZE (autoconf-2.61.tar.bz2) = 1042439
diff --git a/devel/autoconf262/files/patch-autoconf.texi b/devel/autoconf262/files/patch-autoconf.texi
index 32c58797956f..f561aee323f9 100644
--- a/devel/autoconf262/files/patch-autoconf.texi
+++ b/devel/autoconf262/files/patch-autoconf.texi
@@ -3,10 +3,10 @@
 @@ -3,5 +3,5 @@
  @comment %**start of header
 -@setfilename autoconf.info
-+@setfilename autoconf259.info
++@setfilename autoconf261.info
  @include version.texi
 -@settitle Autoconf
-+@settitle Autoconf259
++@settitle Autoconf261
  @setchapternewpage odd
 @@ -212,23 +212,3 @@
  @direntry
@@ -31,5 +31,5 @@
 -                                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.
++* Autoconf261: (autoconf261).         Create source code configuration scripts.
  @end direntry
diff --git a/devel/autoconf262/files/patch-autoreconf.in b/devel/autoconf262/files/patch-autoreconf.in
deleted file mode 100644
index e0545245db62..000000000000
--- a/devel/autoconf262/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/autoconf262/files/patch-configure b/devel/autoconf262/files/patch-configure
index bc622f2b52b1..0d805971c245 100644
--- a/devel/autoconf262/files/patch-configure
+++ b/devel/autoconf262/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig	Thu Nov  6 01:33:28 2003
-+++ configure	Sun Mar 14 16:53:34 2004
-@@ -1536,3 +1536,3 @@
+--- 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='autoconf259'
-  VERSION='2.59'
++ PACKAGE='autoconf261'
+  VERSION='2.61'
diff --git a/devel/autoconf262/files/patch-standards.texi b/devel/autoconf262/files/patch-standards.texi
index 9d6134950668..7ecda7e79ef4 100644
--- a/devel/autoconf262/files/patch-standards.texi
+++ b/devel/autoconf262/files/patch-standards.texi
@@ -3,10 +3,10 @@
 @@ -2,3 +2,3 @@
  @c %**start of header
 -@setfilename standards.info
-+@setfilename standards259.info
++@setfilename standards261.info
  @settitle GNU Coding Standards
 @@ -10,3 +10,3 @@
  @direntry
 -* Standards: (standards).        GNU coding standards.
-+* Standards259: (standards259).        GNU coding standards.
++* Standards261: (standards261).        GNU coding standards.
  @end direntry
diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist
index ac4409d55537..cb89cfdb2c54 100644
--- a/devel/autoconf262/pkg-plist
+++ b/devel/autoconf262/pkg-plist
@@ -28,6 +28,7 @@ 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
@@ -55,7 +56,6 @@ 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