8 files changed, 162 insertions, 159 deletions

diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 804ef0a8c32a..29f3f6c9ebf9 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -16,38 +16,33 @@ MASTER_SITE_SUBDIR=	automake
 MAINTAINER=	ade@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator (1.5)
 
-RUN_DEPENDS=	${AUTOCONF_DEPENDS}
+RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
+		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
 
-USE_AUTOTOOLS=	autoconf:253:env
-BUILD_VERSION=	15
+USE_AUTOTOOLS=	autoconf:261:env
+BUILD_VERSION=	1.5
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	automake${BUILD_VERSION}
+LATEST_LINK=	automake15
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	AUTOCONF=autoconf253 AUTOHEADER=autoheader253 MAKEINFO=makeinfo
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INFO=		automake${BUILD_VERSION}
+INFO=		automake-${BUILD_VERSION}
 
 post-patch:
-	@(cd ${WRKSRC} && \
-		${RM} -f *.info && \
-		${MV} automake.texi automake${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in  && \
-		${REINPLACE_CMD} -e 's,%%BUILD_VERSION%%,${BUILD_VERSION},g' aclocal.in \
-	)
+	@${RM} ${WRKSRC}/*.info
+	@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake-${BUILD_VERSION}.texi
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@PACKAGE@$$|@PACKAGE@-@VERSION@|'
+	@${REINPLACE_CMD} -e 's|aclocal$$|aclocal-@VERSION@|' \
+		${WRKSRC}/m4/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/aclocal.in
 
 pre-su-install:
-	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
-
-post-install:
-.for i in aclocal automake
-	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
-		${PREFIX}/libexec/automake${BUILD_VERSION}/${i}
-.endfor
+	@${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/automake15/files/patch-Makefile.in b/devel/automake15/files/patch-Makefile.in
index 5f1a7a86a4c2..7e3d1c21d01e 100644
--- a/devel/automake15/files/patch-Makefile.in
+++ b/devel/automake15/files/patch-Makefile.in
@@ -1,11 +1,17 @@
---- Makefile.in.orig	Sun Sep  9 11:42:15 2001
-+++ Makefile.in	Sun Sep  9 11:42:51 2001
-@@ -180,7 +180,7 @@
- .texi.info:
- 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- 	cd $(srcdir) \
--	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
- 	       `echo $< | sed 's,.*/,,'`
+--- Makefile.in.orig	Wed Aug 22 22:49:54 2001
++++ Makefile.in	Thu Apr  5 02:38:15 2007
+@@ -98,5 +98,5 @@
+ TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
+-INFO_DEPS = automake.info
++INFO_DEPS = automake-@VERSION@.info
+ DVIS = automake.dvi
+-TEXINFOS = automake.texi
++TEXINFOS = automake-@VERSION@.texi
  
- .texi.dvi:
+@@ -158,4 +158,4 @@
+ 	@:
+-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in
+-	@(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake.texi`; \
++$(srcdir)/stamp-vti: automake-@VERSION@.texi $(top_srcdir)/configure.in
++	@(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake-@VERSION@.texi`; \
+ 	echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in
index d72fe290f094..947ba7e01f19 100644
--- a/devel/automake15/files/patch-aclocal.in
+++ b/devel/automake15/files/patch-aclocal.in
@@ -1,10 +1,15 @@
 --- aclocal.in.orig	Mon Jul 16 22:36:23 2001
-+++ aclocal.in	Sun May  6 13:52:34 2007
-@@ -35,2 +35,3 @@
- $acdir = "@datadir@/aclocal";
-+$acdir_ver = "@datadir@/aclocal%%BUILD_VERSION%%";
- 
-@@ -210,2 +211,3 @@
-     push (@dirlist, $acdir);
-+    push (@dirlist, $acdir_ver) if (-d "$acdir_ver/.");
++++ aclocal.in	Thu Apr  5 03:19:44 2007
+@@ -34,3 +34,3 @@
+ # Note that this isn't pkgdatadir, but a separate directory.
+-$acdir = "@datadir@/aclocal";
++$acdir = "@datadir@/aclocal-@VERSION@";
  
+@@ -117,2 +117,3 @@
+ local (@dirlist) = &parse_arguments (@ARGV);
++push (@dirlist, "%%LOCALBASE%%/share/aclocal") if (!grep(/^--acdir/, @ARGV));
+ &scan_m4_files (@dirlist);
+@@ -205,2 +206,3 @@
+ 	print $acdir, "\n";
++	print "%%LOCALBASE%%/share/aclocal", "\n";
+ 	exit 0;
diff --git a/devel/automake15/files/patch-automake.in b/devel/automake15/files/patch-automake.in
new file mode 100644
index 000000000000..1890b826646f
--- /dev/null
+++ b/devel/automake15/files/patch-automake.in
@@ -0,0 +1,12 @@
+--- automake.in.orig	Wed Aug 22 22:26:53 2001
++++ automake.in	Thu Apr  5 03:21:22 2007
+@@ -34,3 +34,3 @@
+   my $prefix = "@prefix@";
+-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
++  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@VERSION@";
+   unshift @INC, "$perllibdir";
+@@ -129,3 +129,3 @@
+ my $prefix = "@prefix@";
+-my $libdir = "@datadir@/@PACKAGE@";
++my $libdir = "@datadir@/@PACKAGE@-@VERSION@";
+ 
diff --git a/devel/automake15/files/patch-automake.texi b/devel/automake15/files/patch-automake.texi
index ab8cc6955ff3..f5ff8df3d272 100644
--- a/devel/automake15/files/patch-automake.texi
+++ b/devel/automake15/files/patch-automake.texi
@@ -1,14 +1,16 @@
---- automake.texi.orig	Thu Aug 23 05:40:36 2001
-+++ automake.texi	Thu Oct 14 20:29:56 2004
-@@ -2,4 +2,5 @@
+--- automake.texi.orig	Wed Aug 22 22:40:36 2001
++++ automake.texi	Sat Apr 14 15:49:21 2007
+@@ -2,4 +2,4 @@
  @c %**start of header
 -@setfilename automake.info
 -@settitle automake
-+@setfilename automake15.info
-+@dircategory Programming & development tools
-+@settitle Automake15
++@setfilename automake-1.5.info
++@settitle Automake-1.5
  @setchapternewpage off
-@@ -11,8 +12,3 @@
+@@ -9,10 +9,5 @@
+ 
+-@dircategory GNU programming tools
++@dircategory Programming & development tools
  @direntry
 -* automake: (automake).		Making Makefile.in's
 -@end direntry
@@ -16,5 +18,5 @@
 -@dircategory Individual utilities
 -@direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4
-+* Automake15: (automake15).		Making Makefile.in's
++* Automake-1.5: (automake-1.5).		Making Makefile.in's.
  @end direntry
diff --git a/devel/automake15/files/patch-configure b/devel/automake15/files/patch-configure
deleted file mode 100644
index 8161cf88af18..000000000000
--- a/devel/automake15/files/patch-configure
+++ /dev/null
@@ -1,7 +0,0 @@
---- configure.orig	Wed Aug 22 22:49:52 2001
-+++ configure	Wed Feb 11 01:01:24 2004
-@@ -795,3 +795,3 @@
- # Define the identity of the package.
--PACKAGE=automake
-+PACKAGE=automake15
- VERSION=1.5
diff --git a/devel/automake15/files/patch-m4::Makefile.in b/devel/automake15/files/patch-m4::Makefile.in
deleted file mode 100644
index 0c0642b1da66..000000000000
--- a/devel/automake15/files/patch-m4::Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- m4/Makefile.in.orig	Wed Aug 22 22:49:56 2001
-+++ m4/Makefile.in	Wed Feb 11 01:05:11 2004
-@@ -70,3 +70,3 @@
- 
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(datadir)/aclocal15
- m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist
index b845d47dd764..283ab31c8d61 100644
--- a/devel/automake15/pkg-plist
+++ b/devel/automake15/pkg-plist
@@ -1,94 +1,91 @@
-bin/aclocal%%BUILD_VERSION%%
-bin/automake%%BUILD_VERSION%%
-libexec/automake%%BUILD_VERSION%%/aclocal
-libexec/automake%%BUILD_VERSION%%/automake
-share/aclocal%%BUILD_VERSION%%/as.m4
-share/aclocal%%BUILD_VERSION%%/auxdir.m4
-share/aclocal%%BUILD_VERSION%%/ccstdc.m4
-share/aclocal%%BUILD_VERSION%%/cond.m4
-share/aclocal%%BUILD_VERSION%%/depend.m4
-share/aclocal%%BUILD_VERSION%%/depout.m4
-share/aclocal%%BUILD_VERSION%%/dmalloc.m4
-share/aclocal%%BUILD_VERSION%%/error.m4
-share/aclocal%%BUILD_VERSION%%/gcj.m4
-share/aclocal%%BUILD_VERSION%%/header.m4
-share/aclocal%%BUILD_VERSION%%/init.m4
-share/aclocal%%BUILD_VERSION%%/install-sh.m4
-share/aclocal%%BUILD_VERSION%%/lex.m4
-share/aclocal%%BUILD_VERSION%%/lispdir.m4
-share/aclocal%%BUILD_VERSION%%/maintainer.m4
-share/aclocal%%BUILD_VERSION%%/make.m4
-share/aclocal%%BUILD_VERSION%%/minuso.m4
-share/aclocal%%BUILD_VERSION%%/missing.m4
-share/aclocal%%BUILD_VERSION%%/multi.m4
-share/aclocal%%BUILD_VERSION%%/obstack.m4
-share/aclocal%%BUILD_VERSION%%/protos.m4
-share/aclocal%%BUILD_VERSION%%/ptrdiff.m4
-share/aclocal%%BUILD_VERSION%%/python.m4
-share/aclocal%%BUILD_VERSION%%/regex.m4
-share/aclocal%%BUILD_VERSION%%/sanity.m4
-share/aclocal%%BUILD_VERSION%%/strip.m4
-share/aclocal%%BUILD_VERSION%%/strtod.m4
-share/aclocal%%BUILD_VERSION%%/termios.m4
-share/aclocal%%BUILD_VERSION%%/winsz.m4
-share/automake%%BUILD_VERSION%%/Automake/Struct.pm
-share/automake%%BUILD_VERSION%%/COPYING
-share/automake%%BUILD_VERSION%%/INSTALL
-share/automake%%BUILD_VERSION%%/acinstall
-share/automake%%BUILD_VERSION%%/am/ansi2knr.am
-share/automake%%BUILD_VERSION%%/am/check.am
-share/automake%%BUILD_VERSION%%/am/clean-hdr.am
-share/automake%%BUILD_VERSION%%/am/clean.am
-share/automake%%BUILD_VERSION%%/am/compile.am
-share/automake%%BUILD_VERSION%%/am/configure.am
-share/automake%%BUILD_VERSION%%/am/data.am
-share/automake%%BUILD_VERSION%%/am/dejagnu.am
-share/automake%%BUILD_VERSION%%/am/depend.am
-share/automake%%BUILD_VERSION%%/am/depend2.am
-share/automake%%BUILD_VERSION%%/am/distdir.am
-share/automake%%BUILD_VERSION%%/am/footer.am
-share/automake%%BUILD_VERSION%%/am/header-vars.am
-share/automake%%BUILD_VERSION%%/am/header.am
-share/automake%%BUILD_VERSION%%/am/install.am
-share/automake%%BUILD_VERSION%%/am/java.am
-share/automake%%BUILD_VERSION%%/am/lang-compile.am
-share/automake%%BUILD_VERSION%%/am/lex.am
-share/automake%%BUILD_VERSION%%/am/library.am
-share/automake%%BUILD_VERSION%%/am/libs.am
-share/automake%%BUILD_VERSION%%/am/libtool.am
-share/automake%%BUILD_VERSION%%/am/lisp.am
-share/automake%%BUILD_VERSION%%/am/ltlib.am
-share/automake%%BUILD_VERSION%%/am/ltlibrary.am
-share/automake%%BUILD_VERSION%%/am/mans-vars.am
-share/automake%%BUILD_VERSION%%/am/mans.am
-share/automake%%BUILD_VERSION%%/am/multilib.am
-share/automake%%BUILD_VERSION%%/am/program.am
-share/automake%%BUILD_VERSION%%/am/progs.am
-share/automake%%BUILD_VERSION%%/am/python.am
-share/automake%%BUILD_VERSION%%/am/remake-hdr.am
-share/automake%%BUILD_VERSION%%/am/scripts.am
-share/automake%%BUILD_VERSION%%/am/subdirs.am
-share/automake%%BUILD_VERSION%%/am/tags.am
-share/automake%%BUILD_VERSION%%/am/texi-vers.am
-share/automake%%BUILD_VERSION%%/am/texibuild.am
-share/automake%%BUILD_VERSION%%/am/texinfos.am
-share/automake%%BUILD_VERSION%%/am/yacc.am
-share/automake%%BUILD_VERSION%%/ansi2knr.1
-share/automake%%BUILD_VERSION%%/ansi2knr.c
-share/automake%%BUILD_VERSION%%/compile
-share/automake%%BUILD_VERSION%%/config.guess
-share/automake%%BUILD_VERSION%%/config.sub
-share/automake%%BUILD_VERSION%%/depcomp
-share/automake%%BUILD_VERSION%%/elisp-comp
-share/automake%%BUILD_VERSION%%/install-sh
-share/automake%%BUILD_VERSION%%/mdate-sh
-share/automake%%BUILD_VERSION%%/missing
-share/automake%%BUILD_VERSION%%/mkinstalldirs
-share/automake%%BUILD_VERSION%%/py-compile
-share/automake%%BUILD_VERSION%%/texinfo.tex
-share/automake%%BUILD_VERSION%%/ylwrap
-@dirrm share/aclocal%%BUILD_VERSION%%
-@dirrm share/automake%%BUILD_VERSION%%/Automake
-@dirrm share/automake%%BUILD_VERSION%%/am
-@dirrm share/automake%%BUILD_VERSION%%
-@dirrm libexec/automake%%BUILD_VERSION%%
+bin/aclocal-%%BUILD_VERSION%%
+bin/automake-%%BUILD_VERSION%%
+share/aclocal-%%BUILD_VERSION%%/as.m4
+share/aclocal-%%BUILD_VERSION%%/auxdir.m4
+share/aclocal-%%BUILD_VERSION%%/ccstdc.m4
+share/aclocal-%%BUILD_VERSION%%/cond.m4
+share/aclocal-%%BUILD_VERSION%%/depend.m4
+share/aclocal-%%BUILD_VERSION%%/depout.m4
+share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
+share/aclocal-%%BUILD_VERSION%%/error.m4
+share/aclocal-%%BUILD_VERSION%%/gcj.m4
+share/aclocal-%%BUILD_VERSION%%/header.m4
+share/aclocal-%%BUILD_VERSION%%/init.m4
+share/aclocal-%%BUILD_VERSION%%/install-sh.m4
+share/aclocal-%%BUILD_VERSION%%/lex.m4
+share/aclocal-%%BUILD_VERSION%%/lispdir.m4
+share/aclocal-%%BUILD_VERSION%%/maintainer.m4
+share/aclocal-%%BUILD_VERSION%%/make.m4
+share/aclocal-%%BUILD_VERSION%%/minuso.m4
+share/aclocal-%%BUILD_VERSION%%/missing.m4
+share/aclocal-%%BUILD_VERSION%%/multi.m4
+share/aclocal-%%BUILD_VERSION%%/obstack.m4
+share/aclocal-%%BUILD_VERSION%%/protos.m4
+share/aclocal-%%BUILD_VERSION%%/ptrdiff.m4
+share/aclocal-%%BUILD_VERSION%%/python.m4
+share/aclocal-%%BUILD_VERSION%%/regex.m4
+share/aclocal-%%BUILD_VERSION%%/sanity.m4
+share/aclocal-%%BUILD_VERSION%%/strip.m4
+share/aclocal-%%BUILD_VERSION%%/strtod.m4
+share/aclocal-%%BUILD_VERSION%%/termios.m4
+share/aclocal-%%BUILD_VERSION%%/winsz.m4
+share/automake-%%BUILD_VERSION%%/Automake/Struct.pm
+share/automake-%%BUILD_VERSION%%/COPYING
+share/automake-%%BUILD_VERSION%%/INSTALL
+share/automake-%%BUILD_VERSION%%/acinstall
+share/automake-%%BUILD_VERSION%%/am/ansi2knr.am
+share/automake-%%BUILD_VERSION%%/am/check.am
+share/automake-%%BUILD_VERSION%%/am/clean-hdr.am
+share/automake-%%BUILD_VERSION%%/am/clean.am
+share/automake-%%BUILD_VERSION%%/am/compile.am
+share/automake-%%BUILD_VERSION%%/am/configure.am
+share/automake-%%BUILD_VERSION%%/am/data.am
+share/automake-%%BUILD_VERSION%%/am/dejagnu.am
+share/automake-%%BUILD_VERSION%%/am/depend.am
+share/automake-%%BUILD_VERSION%%/am/depend2.am
+share/automake-%%BUILD_VERSION%%/am/distdir.am
+share/automake-%%BUILD_VERSION%%/am/footer.am
+share/automake-%%BUILD_VERSION%%/am/header-vars.am
+share/automake-%%BUILD_VERSION%%/am/header.am
+share/automake-%%BUILD_VERSION%%/am/install.am
+share/automake-%%BUILD_VERSION%%/am/java.am
+share/automake-%%BUILD_VERSION%%/am/lang-compile.am
+share/automake-%%BUILD_VERSION%%/am/lex.am
+share/automake-%%BUILD_VERSION%%/am/library.am
+share/automake-%%BUILD_VERSION%%/am/libs.am
+share/automake-%%BUILD_VERSION%%/am/libtool.am
+share/automake-%%BUILD_VERSION%%/am/lisp.am
+share/automake-%%BUILD_VERSION%%/am/ltlib.am
+share/automake-%%BUILD_VERSION%%/am/ltlibrary.am
+share/automake-%%BUILD_VERSION%%/am/mans-vars.am
+share/automake-%%BUILD_VERSION%%/am/mans.am
+share/automake-%%BUILD_VERSION%%/am/multilib.am
+share/automake-%%BUILD_VERSION%%/am/program.am
+share/automake-%%BUILD_VERSION%%/am/progs.am
+share/automake-%%BUILD_VERSION%%/am/python.am
+share/automake-%%BUILD_VERSION%%/am/remake-hdr.am
+share/automake-%%BUILD_VERSION%%/am/scripts.am
+share/automake-%%BUILD_VERSION%%/am/subdirs.am
+share/automake-%%BUILD_VERSION%%/am/tags.am
+share/automake-%%BUILD_VERSION%%/am/texi-vers.am
+share/automake-%%BUILD_VERSION%%/am/texibuild.am
+share/automake-%%BUILD_VERSION%%/am/texinfos.am
+share/automake-%%BUILD_VERSION%%/am/yacc.am
+share/automake-%%BUILD_VERSION%%/ansi2knr.1
+share/automake-%%BUILD_VERSION%%/ansi2knr.c
+share/automake-%%BUILD_VERSION%%/compile
+share/automake-%%BUILD_VERSION%%/config.guess
+share/automake-%%BUILD_VERSION%%/config.sub
+share/automake-%%BUILD_VERSION%%/depcomp
+share/automake-%%BUILD_VERSION%%/elisp-comp
+share/automake-%%BUILD_VERSION%%/install-sh
+share/automake-%%BUILD_VERSION%%/mdate-sh
+share/automake-%%BUILD_VERSION%%/missing
+share/automake-%%BUILD_VERSION%%/mkinstalldirs
+share/automake-%%BUILD_VERSION%%/py-compile
+share/automake-%%BUILD_VERSION%%/texinfo.tex
+share/automake-%%BUILD_VERSION%%/ylwrap
+@dirrm share/aclocal-%%BUILD_VERSION%%
+@dirrm share/automake-%%BUILD_VERSION%%/Automake
+@dirrm share/automake-%%BUILD_VERSION%%/am
+@dirrm share/automake-%%BUILD_VERSION%%