Update to 1.4.6.

Changes:
* Versioned install support back-ported from 1.6

4 files changed, 85 insertions, 97 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 3686d15c183..449b167b721 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2002/08/25 21:49:39 jlam Exp $
-# FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp
+# $NetBSD: Makefile,v 1.30 2002/09/25 19:22:30 wiz Exp $
 #
 
-DISTNAME=	automake-1.4-p5
+DISTNAME=	automake-1.4-p6
 PKGNAME=	${DISTNAME:C/-p/./}
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=automake/}
 
diff --git a/devel/automake/PLIST b/devel/automake/PLIST
index caf3c086daf..ae231f4cf4e 100644
--- a/devel/automake/PLIST
+++ b/devel/automake/PLIST
@@ -1,81 +1,85 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:07 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/25 19:22:30 wiz Exp $
 bin/aclocal
+bin/aclocal-1.4
 bin/automake
+bin/automake-1.4
 @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/ccstdc.m4
-share/aclocal/cond.m4
-share/aclocal/dmalloc.m4
-share/aclocal/error.m4
-share/aclocal/header.m4
-share/aclocal/init.m4
-share/aclocal/lex.m4
-share/aclocal/lispdir.m4
-share/aclocal/maintainer.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/regex.m4
-share/aclocal/sanity.m4
-share/aclocal/strtod.m4
-share/aclocal/termios.m4
-share/aclocal/winsz.m4
-share/automake/COPYING
-share/automake/INSTALL
-share/automake/acinstall
-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/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/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/texinfo.tex
-share/automake/texinfos.am
-share/automake/ylwrap
-@dirrm share/automake
+share/aclocal-1.4/amversion.m4
+share/aclocal-1.4/ccstdc.m4
+share/aclocal-1.4/cond.m4
+share/aclocal-1.4/dmalloc.m4
+share/aclocal-1.4/error.m4
+share/aclocal-1.4/header.m4
+share/aclocal-1.4/init.m4
+share/aclocal-1.4/lex.m4
+share/aclocal-1.4/lispdir.m4
+share/aclocal-1.4/maintainer.m4
+share/aclocal-1.4/missing.m4
+share/aclocal-1.4/mktime.m4
+share/aclocal-1.4/multi.m4
+share/aclocal-1.4/obstack.m4
+share/aclocal-1.4/protos.m4
+share/aclocal-1.4/ptrdiff.m4
+share/aclocal-1.4/regex.m4
+share/aclocal-1.4/sanity.m4
+share/aclocal-1.4/strtod.m4
+share/aclocal-1.4/termios.m4
+share/aclocal-1.4/winsz.m4
+share/automake-1.4/COPYING
+share/automake-1.4/INSTALL
+share/automake-1.4/acinstall
+share/automake-1.4/ansi2knr.1
+share/automake-1.4/ansi2knr.c
+share/automake-1.4/clean-hdr.am
+share/automake-1.4/clean-kr.am
+share/automake-1.4/clean.am
+share/automake-1.4/comp-vars.am
+share/automake-1.4/compile.am
+share/automake-1.4/config.guess
+share/automake-1.4/config.sub
+share/automake-1.4/data-clean.am
+share/automake-1.4/data.am
+share/automake-1.4/dejagnu.am
+share/automake-1.4/depend.am
+share/automake-1.4/depend2.am
+share/automake-1.4/dist-vars.am
+share/automake-1.4/elisp-comp
+share/automake-1.4/footer.am
+share/automake-1.4/header-vars.am
+share/automake-1.4/header.am
+share/automake-1.4/install-sh
+share/automake-1.4/java-clean.am
+share/automake-1.4/java.am
+share/automake-1.4/kr-extra.am
+share/automake-1.4/library.am
+share/automake-1.4/libs-clean.am
+share/automake-1.4/libs.am
+share/automake-1.4/libtool.am
+share/automake-1.4/lisp-clean.am
+share/automake-1.4/lisp.am
+share/automake-1.4/ltlib-clean.am
+share/automake-1.4/ltlib.am
+share/automake-1.4/ltlibrary.am
+share/automake-1.4/mans-vars.am
+share/automake-1.4/mans.am
+share/automake-1.4/mdate-sh
+share/automake-1.4/missing
+share/automake-1.4/mkinstalldirs
+share/automake-1.4/multilib.am
+share/automake-1.4/program.am
+share/automake-1.4/progs-clean.am
+share/automake-1.4/progs.am
+share/automake-1.4/remake-hdr.am
+share/automake-1.4/remake.am
+share/automake-1.4/scripts.am
+share/automake-1.4/subdirs.am
+share/automake-1.4/tags-clean.am
+share/automake-1.4/tags.am
+share/automake-1.4/texi-vers.am
+share/automake-1.4/texinfo.tex
+share/automake-1.4/texinfos.am
+share/automake-1.4/ylwrap
+@dirrm share/aclocal-1.4
+@dirrm share/automake-1.4
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index 11042da3c2d..d844ea7a462 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/01/10 16:22:37 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/09/25 19:22:30 wiz Exp $
 
-SHA1 (automake-1.4-p5.tar.gz) = f8368e47a7b8f879aaa0c828664b680efd9e455f
-Size (automake-1.4-p5.tar.gz) = 376992 bytes
+SHA1 (automake-1.4-p6.tar.gz) = 330c75c98e6dcdf21cbb63cf94ced8ea564b9438
+Size (automake-1.4-p6.tar.gz) = 375060 bytes
 SHA1 (patch-aa) = 70ecb085bfe05f256bcaf4315e7a6e296b2749c0
 SHA1 (patch-ab) = 0c4936c28c39efff28b3d388d5b6849a3f9b2eab
-SHA1 (patch-ac) = bfd7f21810c5bf368afa168c4c39a858cc1fc3c3
diff --git a/devel/automake/patches/patch-ac b/devel/automake/patches/patch-ac
deleted file mode 100644
index 60f24d3c534..00000000000
--- a/devel/automake/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/01/10 16:22:38 skrll Exp $
-
---- lisp.am.orig	Sun Jul 15 17:22:09 2001
-+++ lisp.am
-@@ -21,7 +21,7 @@
- 	  $(mkinstalldirs) $(DESTDIR)$(@DIR@dir); \
- ## Funny invocation because Makefile variable can be empty, leading to
- ## a syntax error in sh.
--	  @list='$(@DIR@_LISP)'; for p in $$list; do \
-+	  list='$(@DIR@_LISP)'; for p in $$list; do \
- ## A header file can be in the source directory or the build directory.
- 	    if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- 	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \