Update to version 1.5.

45 files changed, 639 insertions, 657 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake/files/patch-ab b/devel/automake/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake/files/patch-ab
+++ b/devel/automake/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake/files/patch-ad b/devel/automake/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake/files/patch-ad
+++ b/devel/automake/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake/pkg-plist
+++ b/devel/automake/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake110/distinfo
+++ b/devel/automake110/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake110/files/patch-ab b/devel/automake110/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake110/files/patch-ab
+++ b/devel/automake110/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake110/files/patch-ad b/devel/automake110/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake110/files/patch-ad
+++ b/devel/automake110/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake110/pkg-plist
+++ b/devel/automake110/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake14/distinfo b/devel/automake14/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake14/distinfo
+++ b/devel/automake14/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake14/files/patch-ab b/devel/automake14/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake14/files/patch-ab
+++ b/devel/automake14/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake14/files/patch-ad b/devel/automake14/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake14/files/patch-ad
+++ b/devel/automake14/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake14/pkg-plist
+++ b/devel/automake14/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake15/distinfo b/devel/automake15/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake15/distinfo
+++ b/devel/automake15/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake15/files/patch-ab b/devel/automake15/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake15/files/patch-ab
+++ b/devel/automake15/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake15/files/patch-ad b/devel/automake15/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake15/files/patch-ad
+++ b/devel/automake15/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake15/pkg-plist
+++ b/devel/automake15/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake16/distinfo b/devel/automake16/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake16/distinfo
+++ b/devel/automake16/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake16/files/patch-ab b/devel/automake16/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake16/files/patch-ab
+++ b/devel/automake16/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake16/files/patch-ad b/devel/automake16/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake16/files/patch-ad
+++ b/devel/automake16/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake16/pkg-plist b/devel/automake16/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake16/pkg-plist
+++ b/devel/automake16/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake17/distinfo b/devel/automake17/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake17/distinfo
+++ b/devel/automake17/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake17/files/patch-ab b/devel/automake17/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake17/files/patch-ab
+++ b/devel/automake17/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake17/files/patch-ad b/devel/automake17/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake17/files/patch-ad
+++ b/devel/automake17/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake17/pkg-plist b/devel/automake17/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake17/pkg-plist
+++ b/devel/automake17/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake18/distinfo b/devel/automake18/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake18/distinfo
+++ b/devel/automake18/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake18/files/patch-ab b/devel/automake18/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake18/files/patch-ab
+++ b/devel/automake18/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake18/files/patch-ad b/devel/automake18/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake18/files/patch-ad
+++ b/devel/automake18/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake18/pkg-plist
+++ b/devel/automake18/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/automake19/distinfo
+++ b/devel/automake19/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/automake19/files/patch-ab b/devel/automake19/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/automake19/files/patch-ab
+++ b/devel/automake19/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/automake19/files/patch-ad b/devel/automake19/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/automake19/files/patch-ad
+++ b/devel/automake19/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/automake19/pkg-plist
+++ b/devel/automake19/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 940618519106..6e167721b446 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
 
 MAINTAINER=	fujimoto@oscar.elec.waseda.ac.jp
 
diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo
index f48e4e4a1cdb..76063323ca70 100644
--- a/devel/gnu-automake/distinfo
+++ b/devel/gnu-automake/distinfo
@@ -1 +1 @@
-MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
+MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
diff --git a/devel/gnu-automake/files/patch-ab b/devel/gnu-automake/files/patch-ab
index 4dcfc66fcd29..5f1a7a86a4c2 100644
--- a/devel/gnu-automake/files/patch-ab
+++ b/devel/gnu-automake/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- 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) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+-	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
+ 	       `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
diff --git a/devel/gnu-automake/files/patch-ad b/devel/gnu-automake/files/patch-ad
index ddf7317ff655..3cd773443ae7 100644
--- a/devel/gnu-automake/files/patch-ad
+++ b/devel/gnu-automake/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
+--- aclocal.in.orig	Sun Sep  9 11:31:39 2001
++++ aclocal.in	Sun Sep  9 11:37:54 2001
 @@ -34,6 +34,8 @@
  # Note that this isn't pkgdatadir, but a separate directory.
  $acdir = "@datadir@/aclocal";
@@ -12,17 +9,17 @@ $FreeBSD$
  # Some globals.
  
  # Exit status.
-@@ -106,6 +108,9 @@
+@@ -115,6 +117,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
- &scan_m4_files ($acdir, @dirlist);
+ &scan_m4_files (@dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -279,12 +284,13 @@
+@@ -299,11 +304,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -31,13 +28,12 @@ $FreeBSD$
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
--	local ($file, $fullfile, $expr);
-+	local ($file, $fullfile, $ino, $expr);
+ 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
++	local ($file, $fullfile, $expr);
+ 	local ($file, $fullfile);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
- 	    # Only examine .m4 files.
-@@ -294,6 +300,12 @@
+@@ -314,6 +321,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -50,12 +46,3 @@ $FreeBSD$
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
-@@ -400,7 +412,7 @@
- 	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
- 	    {
- 		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
--		$exit_status = 1;
-+		# $exit_status = 1;
- 	    }
- 	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
- 	}
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index 1e62d5883c1f..7f5d93d0d15f 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -3,78 +3,91 @@ bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal/as.m4
+share/aclocal/auxdir.m4
 share/aclocal/ccstdc.m4
 share/aclocal/cond.m4
+share/aclocal/depend.m4
+share/aclocal/depout.m4
 share/aclocal/dmalloc.m4
 share/aclocal/error.m4
+share/aclocal/gcj.m4
 share/aclocal/header.m4
 share/aclocal/init.m4
+share/aclocal/install-sh.m4
 share/aclocal/lex.m4
 share/aclocal/lispdir.m4
 share/aclocal/maintainer.m4
+share/aclocal/make.m4
+share/aclocal/minuso.m4
 share/aclocal/missing.m4
-share/aclocal/mktime.m4
 share/aclocal/multi.m4
 share/aclocal/obstack.m4
 share/aclocal/protos.m4
 share/aclocal/ptrdiff.m4
+share/aclocal/python.m4
 share/aclocal/regex.m4
 share/aclocal/sanity.m4
+share/aclocal/strip.m4
 share/aclocal/strtod.m4
 share/aclocal/termios.m4
 share/aclocal/winsz.m4
+share/automake/Automake/Struct.pm
 share/automake/COPYING
 share/automake/INSTALL
 share/automake/acinstall
+share/automake/am/ansi2knr.am
+share/automake/am/check.am
+share/automake/am/clean-hdr.am
+share/automake/am/clean.am
+share/automake/am/compile.am
+share/automake/am/configure.am
+share/automake/am/data.am
+share/automake/am/dejagnu.am
+share/automake/am/depend.am
+share/automake/am/depend2.am
+share/automake/am/distdir.am
+share/automake/am/footer.am
+share/automake/am/header-vars.am
+share/automake/am/header.am
+share/automake/am/install.am
+share/automake/am/java.am
+share/automake/am/lang-compile.am
+share/automake/am/lex.am
+share/automake/am/library.am
+share/automake/am/libs.am
+share/automake/am/libtool.am
+share/automake/am/lisp.am
+share/automake/am/ltlib.am
+share/automake/am/ltlibrary.am
+share/automake/am/mans-vars.am
+share/automake/am/mans.am
+share/automake/am/multilib.am
+share/automake/am/program.am
+share/automake/am/progs.am
+share/automake/am/python.am
+share/automake/am/remake-hdr.am
+share/automake/am/scripts.am
+share/automake/am/subdirs.am
+share/automake/am/tags.am
+share/automake/am/texi-vers.am
+share/automake/am/texibuild.am
+share/automake/am/texinfos.am
+share/automake/am/yacc.am
 share/automake/ansi2knr.1
 share/automake/ansi2knr.c
-share/automake/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 share/automake/config.guess
 share/automake/config.sub
-share/automake/data-clean.am
-share/automake/data.am
-share/automake/dejagnu.am
-share/automake/depend.am
-share/automake/depend2.am
-share/automake/dist-vars.am
+share/automake/depcomp
 share/automake/elisp-comp
-share/automake/footer.am
-share/automake/header-vars.am
-share/automake/header.am
 share/automake/install-sh
-share/automake/java-clean.am
-share/automake/java.am
-share/automake/kr-extra.am
-share/automake/library.am
-share/automake/libs-clean.am
-share/automake/libs.am
-share/automake/libtool.am
-share/automake/lisp-clean.am
-share/automake/lisp.am
-share/automake/ltlib-clean.am
-share/automake/ltlib.am
-share/automake/ltlibrary.am
-share/automake/mans-vars.am
-share/automake/mans.am
 share/automake/mdate-sh
 share/automake/missing
 share/automake/mkinstalldirs
-share/automake/multilib.am
-share/automake/program.am
-share/automake/progs-clean.am
-share/automake/progs.am
-share/automake/remake-hdr.am
-share/automake/remake.am
-share/automake/scripts.am
-share/automake/subdirs.am
-share/automake/tags-clean.am
-share/automake/tags.am
-share/automake/texi-vers.am
+share/automake/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/Automake
+@dirrm share/automake/am
 @dirrm share/automake