Update to automake 1.7 (from automake-devel package).

Does not conflict with automake14 package.

5 files changed, 115 insertions, 106 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 449b167b721..e914d9843d9 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,23 +1,31 @@
-# $NetBSD: Makefile,v 1.30 2002/09/25 19:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2002/10/03 19:31:51 wiz Exp $
 #
 
-DISTNAME=	automake-1.4-p6
-PKGNAME=	${DISTNAME:C/-p/./}
+DISTNAME=	automake-1.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=automake/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/automake/automake.html
 COMMENT=	GNU Standards-compliant Makefile generator
 
-DEPENDS=	autoconf>=2.13:../../devel/autoconf
+DEPENDS=	autoconf>=2.54:../../devel/autoconf
 
+PLIST_SUBST+=		PKG_DIR_VERSION=1.7
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV=		PERL=${PERL5}
 _STRIPFLAG_INSTALL=	# none
+M4=			${PREFIX}/bin/gm4
+
+MAKEINFOFLAGS=		--no-split
+MAKE_ENV+=		MAKEINFOFLAGS="${MAKEINFOFLAGS}"
 
 INFO_FILES=		automake.info
+
+PERL5_REQD=		5.5
+TEXINFO_REQD=		4.0
 TEXINFO_OVERRIDE=	YES
 
 .include "../../lang/perl5/buildlink2.mk"
diff --git a/devel/automake/PLIST b/devel/automake/PLIST
index ae231f4cf4e..fcd1d065e02 100644
--- a/devel/automake/PLIST
+++ b/devel/automake/PLIST
@@ -1,85 +1,100 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/25 19:22:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/10/03 19:31:51 wiz Exp $
 bin/aclocal
-bin/aclocal-1.4
+bin/aclocal-${PKG_DIR_VERSION}
 bin/automake
-bin/automake-1.4
+bin/automake-${PKG_DIR_VERSION}
 @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-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
+share/aclocal-${PKG_DIR_VERSION}/amversion.m4
+share/aclocal-${PKG_DIR_VERSION}/as.m4
+share/aclocal-${PKG_DIR_VERSION}/auxdir.m4
+share/aclocal-${PKG_DIR_VERSION}/ccstdc.m4
+share/aclocal-${PKG_DIR_VERSION}/cond.m4
+share/aclocal-${PKG_DIR_VERSION}/depend.m4
+share/aclocal-${PKG_DIR_VERSION}/depout.m4
+share/aclocal-${PKG_DIR_VERSION}/dmalloc.m4
+share/aclocal-${PKG_DIR_VERSION}/gcj.m4
+share/aclocal-${PKG_DIR_VERSION}/header.m4
+share/aclocal-${PKG_DIR_VERSION}/init.m4
+share/aclocal-${PKG_DIR_VERSION}/install-sh.m4
+share/aclocal-${PKG_DIR_VERSION}/lex.m4
+share/aclocal-${PKG_DIR_VERSION}/lispdir.m4
+share/aclocal-${PKG_DIR_VERSION}/maintainer.m4
+share/aclocal-${PKG_DIR_VERSION}/make.m4
+share/aclocal-${PKG_DIR_VERSION}/minuso.m4
+share/aclocal-${PKG_DIR_VERSION}/missing.m4
+share/aclocal-${PKG_DIR_VERSION}/multi.m4
+share/aclocal-${PKG_DIR_VERSION}/obsol-gt.m4
+share/aclocal-${PKG_DIR_VERSION}/obsol-lt.m4
+share/aclocal-${PKG_DIR_VERSION}/obsolete.m4
+share/aclocal-${PKG_DIR_VERSION}/options.m4
+share/aclocal-${PKG_DIR_VERSION}/protos.m4
+share/aclocal-${PKG_DIR_VERSION}/python.m4
+share/aclocal-${PKG_DIR_VERSION}/regex.m4
+share/aclocal-${PKG_DIR_VERSION}/runlog.m4
+share/aclocal-${PKG_DIR_VERSION}/sanity.m4
+share/aclocal-${PKG_DIR_VERSION}/strip.m4
+share/automake-${PKG_DIR_VERSION}/Automake/Channels.pm
+share/automake-${PKG_DIR_VERSION}/Automake/Struct.pm
+share/automake-${PKG_DIR_VERSION}/Automake/General.pm
+share/automake-${PKG_DIR_VERSION}/Automake/XFile.pm
+share/automake-${PKG_DIR_VERSION}/am/ansi2knr.am
+share/automake-${PKG_DIR_VERSION}/am/check.am
+share/automake-${PKG_DIR_VERSION}/am/clean-hdr.am
+share/automake-${PKG_DIR_VERSION}/am/clean.am
+share/automake-${PKG_DIR_VERSION}/am/compile.am
+share/automake-${PKG_DIR_VERSION}/am/configure.am
+share/automake-${PKG_DIR_VERSION}/am/data.am
+share/automake-${PKG_DIR_VERSION}/am/dejagnu.am
+share/automake-${PKG_DIR_VERSION}/am/depend.am
+share/automake-${PKG_DIR_VERSION}/am/depend2.am
+share/automake-${PKG_DIR_VERSION}/am/distdir.am
+share/automake-${PKG_DIR_VERSION}/am/footer.am
+share/automake-${PKG_DIR_VERSION}/am/header-vars.am
+share/automake-${PKG_DIR_VERSION}/am/header.am
+share/automake-${PKG_DIR_VERSION}/am/install.am
+share/automake-${PKG_DIR_VERSION}/am/java.am
+share/automake-${PKG_DIR_VERSION}/am/lang-compile.am
+share/automake-${PKG_DIR_VERSION}/am/lex.am
+share/automake-${PKG_DIR_VERSION}/am/library.am
+share/automake-${PKG_DIR_VERSION}/am/libs.am
+share/automake-${PKG_DIR_VERSION}/am/libtool.am
+share/automake-${PKG_DIR_VERSION}/am/lisp.am
+share/automake-${PKG_DIR_VERSION}/am/ltlib.am
+share/automake-${PKG_DIR_VERSION}/am/ltlibrary.am
+share/automake-${PKG_DIR_VERSION}/am/mans-vars.am
+share/automake-${PKG_DIR_VERSION}/am/mans.am
+share/automake-${PKG_DIR_VERSION}/am/multilib.am
+share/automake-${PKG_DIR_VERSION}/am/program.am
+share/automake-${PKG_DIR_VERSION}/am/progs.am
+share/automake-${PKG_DIR_VERSION}/am/python.am
+share/automake-${PKG_DIR_VERSION}/am/remake-hdr.am
+share/automake-${PKG_DIR_VERSION}/am/scripts.am
+share/automake-${PKG_DIR_VERSION}/am/subdirs.am
+share/automake-${PKG_DIR_VERSION}/am/tags.am
+share/automake-${PKG_DIR_VERSION}/am/texi-vers.am
+share/automake-${PKG_DIR_VERSION}/am/texibuild.am
+share/automake-${PKG_DIR_VERSION}/am/texinfos.am
+share/automake-${PKG_DIR_VERSION}/am/yacc.am
+share/automake-${PKG_DIR_VERSION}/COPYING
+share/automake-${PKG_DIR_VERSION}/INSTALL
+share/automake-${PKG_DIR_VERSION}/texinfo.tex
+share/automake-${PKG_DIR_VERSION}/ansi2knr.c
+share/automake-${PKG_DIR_VERSION}/ansi2knr.1
+share/automake-${PKG_DIR_VERSION}/config.guess
+share/automake-${PKG_DIR_VERSION}/config.sub
+share/automake-${PKG_DIR_VERSION}/install-sh
+share/automake-${PKG_DIR_VERSION}/mdate-sh
+share/automake-${PKG_DIR_VERSION}/missing
+share/automake-${PKG_DIR_VERSION}/mkinstalldirs
+share/automake-${PKG_DIR_VERSION}/elisp-comp
+share/automake-${PKG_DIR_VERSION}/ylwrap
+share/automake-${PKG_DIR_VERSION}/acinstall
+share/automake-${PKG_DIR_VERSION}/depcomp
+share/automake-${PKG_DIR_VERSION}/compile
+share/automake-${PKG_DIR_VERSION}/py-compile
+@dirrm share/aclocal-${PKG_DIR_VERSION}
+@dirrm share/automake-${PKG_DIR_VERSION}/Automake
+@dirrm share/automake-${PKG_DIR_VERSION}/am
+@dirrm share/automake-${PKG_DIR_VERSION}
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index d844ea7a462..970eacdc8e4 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/09/25 19:22:30 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/10/03 19:31:51 wiz Exp $
 
-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 (automake-1.7.tar.bz2) = 37bc530b44f9d784d23b07e89b3ed8aea8e86cdd
+Size (automake-1.7.tar.bz2) = 514456 bytes
+SHA1 (patch-aa) = 1c13380a46dc6c3bbd233164da547526c9cc5679
diff --git a/devel/automake/patches/patch-aa b/devel/automake/patches/patch-aa
index 7b6ef62095c..f806aca9d86 100644
--- a/devel/automake/patches/patch-aa
+++ b/devel/automake/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:20 agc Exp $
+$NetBSD: patch-aa,v 1.4 2002/10/03 19:31:52 wiz Exp $
 
---- automake.texi.orig	Fri Apr  3 22:04:07 1998
-+++ automake.texi	Tue Apr 14 03:29:25 1998
+--- automake.texi.orig	Tue Mar  5 13:57:24 2002
++++ automake.texi	Thu May  2 23:24:44 2002
 @@ -1,6 +1,7 @@
  \input texinfo   @c -*-texinfo-*-
  @c %**start of header
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:20 agc Exp $
  @c %**end of header
 @@ -9,12 +10,12 @@
  
- @dircategory GNU admin
+ @dircategory GNU programming tools
  @direntry
 -* automake: (automake).		Making Makefile.in's
 +* Automake: (automake).		Making Makefile.in's
diff --git a/devel/automake/patches/patch-ab b/devel/automake/patches/patch-ab
deleted file mode 100644
index b70c08b82a1..00000000000
--- a/devel/automake/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/11/14 19:53:09 fredb Exp $
-
---- Makefile.in.orig	Sun Nov 14 13:35:06 1999
-+++ Makefile.in	Sun Nov 14 13:35:07 1999
-@@ -178,7 +178,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,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS=.:$$TEXINPUTS \