bring automake in line with autoconf

w/ help from mbalmer@

devel/automake/1.4/Makefile

@@ -0,0 +1,35 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+
+COMMENT=	"GNU Standards-compliant Makefile generator"
+
+VERSION=	1.4
+DISTNAME=	automake-${VERSION}-p6
+PKGNAME=	${DISTNAME}p2
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU:=automake/}
+
+HOMEPAGE=	http://www.gnu.org/software/automake/
+
+MAINTAINER=	Jason Ish <ish@openbsd.org>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+CONFIGURE_STYLE=gnu
+
+MAKE_FLAGS=	MAKEINFO="makeinfo --no-split"
+FAKE_FLAGS=	${MAKE_FLAGS} ${DESTDIRNAME}="${WRKINST}"
+
+REGRESS_DEPENDS=:gmake-*:devel/gmake
+
+SUFFIX=		-${VERSION}
+SUBST_VARS=	SUFFIX
+
+do-regress:
+	cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} MAKE=gmake gmake -f \
+	    ${MAKE_FILE} ${REGRESS_FLAGS} ${REGRESS_TARGET}
+
+.include <bsd.port.mk>

devel/automake/1.4/distinfo

@@ -0,0 +1,3 @@
+MD5 (automake-1.4-p6.tar.gz) = 24872b81b95d78d05834c39af2cfcf05
+RMD160 (automake-1.4-p6.tar.gz) = ae40b2200eec95b601ebc65bc3cc916bb2a54066
+SHA1 (automake-1.4-p6.tar.gz) = 330c75c98e6dcdf21cbb63cf94ced8ea564b9438

devel/automake/1.4/patches/patch-aclocal_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-aclocal_in,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+--- aclocal.in.orig	Thu Jul 25 12:51:42 2002
++++ aclocal.in	Wed Aug  7 11:10:20 2002
+@@ -374,6 +374,10 @@ sub add_file
+ 	    push (@rlist, $1);
+ 	}
+ 
++	# Remove comments from current line.
++	s/\bdnl\b.*$//;
++	s/\#.*$//;
++
+ 	# This function constructed dynamically.
+ 	if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)/)
+ 	{

devel/automake/1.4/patches/patch-automake_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-automake_in,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+--- automake.in.orig	Sun Jul 15 12:47:28 2001
++++ automake.in	Fri Aug 17 12:47:25 2001
+@@ -2012,7 +2012,7 @@ sub handle_texinfo
+ 	# dependency list.
+ 	@texi_deps = ();
+ 	push (@texi_deps, $info_cursor);
+-	push (@texi_deps, $vtexi) if $vtexi;
++	push (@texi_deps, '$(srcdir)/'.$vtexi) if $vtexi;
+ 
+ 	# Canonicalize name first.
+ 	($canonical = $infobase) =~ tr/A-Za-z0-9_/_/c;

devel/automake/1.4/patches/patch-automake_texi

@@ -0,0 +1,26 @@
+$OpenBSD: patch-automake_texi,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+--- automake.texi.orig	Wed Jan  6 08:01:26 1999
++++ automake.texi	Thu May 10 12:33:10 2001
+@@ -1,6 +1,7 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
+ @setfilename automake.info
++@dircategory Programming & development tools 
+ @settitle automake
+ @setchapternewpage off
+ @c %**end of header
+@@ -9,12 +10,12 @@
+ 
+ @dircategory GNU admin
+ @direntry
+-* automake: (automake).		Making Makefile.in's
++* Automake: (automake).		Making Makefile.in's
+ @end direntry
+ 
+ @dircategory Individual utilities
+ @direntry
+-* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4
++* Aclocal: (automake)           Invoking aclocal. Generating aclocal.m4
+ @end direntry
+ 
+ @ifinfo

devel/automake/1.4/patches/patch-subdirs_am

@@ -0,0 +1,11 @@
+$OpenBSD: patch-subdirs_am,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+--- subdirs.am.orig	Sun Jul 15 11:44:42 2001
++++ subdirs.am	Fri Aug 17 12:50:33 2001
+@@ -60,6 +60,7 @@ maintainer-clean-recursive:
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
+ 	  test "$$subdir" != "." || dot_seen=yes; \
++	  true; \
+ 	done; \
+ ## If we haven't seen `.', then add it at the beginning.
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \

devel/automake/1.4/patches/patch-tests_vtexi_test

@@ -0,0 +1,9 @@
+$OpenBSD: patch-tests_vtexi_test,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+--- tests/vtexi.test.orig	Sun Oct  7 14:02:36 2001
++++ tests/vtexi.test	Sun Oct  7 14:02:52 2001
+@@ -24,4 +24,4 @@ END
+ 
+ $AUTOMAKE || exit 1
+ 
+-grep '^textutils\.info: textutils\.texi version\.texi$' Makefile.in
++grep '^textutils\.info: textutils\.texi \$(srcdir)/version\.texi$' Makefile.in

devel/automake/1.4/patches/patch-texi-vers_am

@@ -0,0 +1,12 @@
+$OpenBSD: patch-texi-vers_am,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+--- texi-vers.am.orig	Sun Jun 10 05:46:36 2001
++++ texi-vers.am	Sat Jun 30 13:41:22 2001
+@@ -15,7 +15,7 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ ## 02111-1307, USA.
+-$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@
++$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-@VTI@
+ 	@:
+ 
+ ## Depend on configure.ac so that version number updates cause a

devel/automake/1.4/pkg/DESCR

@@ -0,0 +1,6 @@
+Automake is an experimental Makefile generator.  It was inspired by
+the 4.4BSD make and include files, but aims to be portable and to
+conform to the GNU standards for Makefile variables and targets.
+
+Automake assumes the project uses autoconf.  If you want automatic
+dependency tracking support, the use of GNU make is also required.

devel/automake/1.4/pkg/PLIST

@@ -0,0 +1,85 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2005/01/11 07:11:00 sturm Exp $
+@option no-default-conflict
+@conflict automake->=1.4,<1.5
+@comment bin/aclocal
+bin/aclocal${SUFFIX}
+@comment bin/automake
+bin/automake${SUFFIX}
+@comment @info info/automake.info
+share/aclocal${SUFFIX}/
+share/aclocal${SUFFIX}/amversion.m4
+share/aclocal${SUFFIX}/ccstdc.m4
+share/aclocal${SUFFIX}/cond.m4
+share/aclocal${SUFFIX}/dmalloc.m4
+share/aclocal${SUFFIX}/error.m4
+share/aclocal${SUFFIX}/header.m4
+share/aclocal${SUFFIX}/init.m4
+share/aclocal${SUFFIX}/lex.m4
+share/aclocal${SUFFIX}/lispdir.m4
+share/aclocal${SUFFIX}/maintainer.m4
+share/aclocal${SUFFIX}/missing.m4
+share/aclocal${SUFFIX}/mktime.m4
+share/aclocal${SUFFIX}/multi.m4
+share/aclocal${SUFFIX}/obstack.m4
+share/aclocal${SUFFIX}/protos.m4
+share/aclocal${SUFFIX}/ptrdiff.m4
+share/aclocal${SUFFIX}/regex.m4
+share/aclocal${SUFFIX}/sanity.m4
+share/aclocal${SUFFIX}/strtod.m4
+share/aclocal${SUFFIX}/termios.m4
+share/aclocal${SUFFIX}/winsz.m4
+share/automake${SUFFIX}/
+share/automake${SUFFIX}/COPYING
+share/automake${SUFFIX}/INSTALL
+share/automake${SUFFIX}/acinstall
+share/automake${SUFFIX}/ansi2knr.1
+share/automake${SUFFIX}/ansi2knr.c
+share/automake${SUFFIX}/clean-hdr.am
+share/automake${SUFFIX}/clean-kr.am
+share/automake${SUFFIX}/clean.am
+share/automake${SUFFIX}/comp-vars.am
+share/automake${SUFFIX}/compile.am
+share/automake${SUFFIX}/config.guess
+share/automake${SUFFIX}/config.sub
+share/automake${SUFFIX}/data-clean.am
+share/automake${SUFFIX}/data.am
+share/automake${SUFFIX}/dejagnu.am
+share/automake${SUFFIX}/depend.am
+share/automake${SUFFIX}/depend2.am
+share/automake${SUFFIX}/dist-vars.am
+share/automake${SUFFIX}/elisp-comp
+share/automake${SUFFIX}/footer.am
+share/automake${SUFFIX}/header-vars.am
+share/automake${SUFFIX}/header.am
+share/automake${SUFFIX}/install-sh
+share/automake${SUFFIX}/java-clean.am
+share/automake${SUFFIX}/java.am
+share/automake${SUFFIX}/kr-extra.am
+share/automake${SUFFIX}/library.am
+share/automake${SUFFIX}/libs-clean.am
+share/automake${SUFFIX}/libs.am
+share/automake${SUFFIX}/libtool.am
+share/automake${SUFFIX}/lisp-clean.am
+share/automake${SUFFIX}/lisp.am
+share/automake${SUFFIX}/ltlib-clean.am
+share/automake${SUFFIX}/ltlib.am
+share/automake${SUFFIX}/ltlibrary.am
+share/automake${SUFFIX}/mans-vars.am
+share/automake${SUFFIX}/mans.am
+share/automake${SUFFIX}/mdate-sh
+share/automake${SUFFIX}/missing
+share/automake${SUFFIX}/mkinstalldirs
+share/automake${SUFFIX}/multilib.am
+share/automake${SUFFIX}/program.am
+share/automake${SUFFIX}/progs-clean.am
+share/automake${SUFFIX}/progs.am
+share/automake${SUFFIX}/remake-hdr.am
+share/automake${SUFFIX}/remake.am
+share/automake${SUFFIX}/scripts.am
+share/automake${SUFFIX}/subdirs.am
+share/automake${SUFFIX}/tags-clean.am
+share/automake${SUFFIX}/tags.am
+share/automake${SUFFIX}/texi-vers.am
+share/automake${SUFFIX}/texinfo.tex
+share/automake${SUFFIX}/texinfos.am
+share/automake${SUFFIX}/ylwrap