5 files changed, 112 insertions, 47 deletions

diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 564e7cde0891..ece5cb75e527 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	automake
-# Version required:	1.0
+# Version required:	1.2
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/06/13 06:49:31 max Exp $
+# $Id: Makefile,v 1.3 1997/06/13 20:01:42 max Exp $
 #
 
-DISTNAME=	automake-1.0
+DISTNAME=	automake-1.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 
@@ -16,9 +16,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=/usr/bin/perl
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
-	@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
+	@ ${RM} -f ${PREFIX}/info/automake.info-1
+	@ ${RM} -f ${PREFIX}/info/automake.info-2
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo
index 1fb5ad6e543d..62c429e5c478 100644
--- a/devel/gnu-automake/distinfo
+++ b/devel/gnu-automake/distinfo
@@ -1 +1 @@
-MD5 (automake-1.0.tar.gz) = e40ede8b273e2bf57e40e5489c8b4e9a
+MD5 (automake-1.2.tar.gz) = 87c072945c73d0ab64db051bfae9c664
diff --git a/devel/gnu-automake/files/patch-aa b/devel/gnu-automake/files/patch-aa
index f1913a9348ae..321fdf9ef4af 100644
--- a/devel/gnu-automake/files/patch-aa
+++ b/devel/gnu-automake/files/patch-aa
@@ -1,5 +1,5 @@
---- automake.texi.orig	Sun May 26 01:43:17 1996
-+++ automake.texi	Fri Jun 13 16:15:48 1997
+--- automake.texi.orig	Fri Sep 19 06:13:10 1997
++++ automake.texi	Fri Sep 19 06:17:06 1997
 @@ -1,6 +1,7 @@
  \input texinfo   @c -*-texinfo-*-
  @c %**start of header
@@ -8,12 +8,18 @@
  @settitle automake
  @setchapternewpage off
  @c %**end of header
-@@ -18,7 +19,7 @@
- @ifinfo
- @format
- START-INFO-DIR-ENTRY
+@@ -9,12 +10,12 @@
+ 
+ @dircategory GNU admin
+ @direntry
 -* automake: (automake).		Making Makefile.in's
-+* Automake: (automake).		Making Makefile.in's.
- END-INFO-DIR-ENTRY
- @end format
- @end ifinfo
++* 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
diff --git a/devel/gnu-automake/files/patch-ab b/devel/gnu-automake/files/patch-ab
index 0dab08bfa450..00b7a640a19e 100644
--- a/devel/gnu-automake/files/patch-ab
+++ b/devel/gnu-automake/files/patch-ab
@@ -1,6 +1,38 @@
---- Makefile.in.orig	Sat Jun  1 11:37:37 1996
-+++ Makefile.in	Thu Jun 12 21:47:10 1997
-@@ -449,3 +449,5 @@
+--- Makefile.in.orig	Fri Sep 19 06:13:16 1997
++++ Makefile.in	Fri Sep 19 06:15:31 1997
+@@ -131,11 +131,11 @@
+ 	$(mkinstalldirs) $(bindir)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++	    echo " $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	  else if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++	    echo " $(INSTALL) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	  else :; fi; fi; \
+ 	done
+ 
+@@ -150,11 +150,11 @@
+ 	$(mkinstalldirs) $(pkgdatadir)
+ 	@list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_SCRIPT) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
++	    echo " $(INSTALL) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
+ 	  else if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
++	    echo " $(INSTALL) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
+ 	  else :; fi; fi; \
+ 	done
+ 
+@@ -569,3 +569,5 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index d5f3c93117f6..e578b6f486f8 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -1,49 +1,78 @@
+bin/aclocal
 bin/automake
 @unexec install-info --delete %D/info/automake.info %D/info/dir
 info/automake.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/automake.info %D/info/dir
-share/automake/config.guess
-share/automake/config.sub
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/mkinstalldirs
+share/aclocal/ccstdc.m4
+share/aclocal/cond.m4
+share/aclocal/cygwin.m4
+share/aclocal/dmalloc.m4
+share/aclocal/error.m4
+share/aclocal/header.m4
+share/aclocal/init.m4
+share/aclocal/install.m4
+share/aclocal/lispdir.m4
+share/aclocal/maintainer.m4
+share/aclocal/missing.m4
+share/aclocal/mktime.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/compile-kr.am
-share/automake/compile-vars.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.am
 share/automake/header-vars.am
-share/automake/kr-vars.am
-share/automake/libraries.am
+share/automake/header.am
+share/automake/install-sh
+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/mdate-sh
+share/automake/missing
+share/automake/mkinstalldirs
 share/automake/program.am
-share/automake/programs.am
+share/automake/progs-clean.am
+share/automake/progs.am
 share/automake/remake-hdr.am
-share/automake/remake-subd.am
 share/automake/remake.am
 share/automake/scripts.am
 share/automake/subdirs.am
-share/automake/tags.am
-share/automake/tags-subd.am
 share/automake/tags-clean.am
-share/automake/texi-version.am
-share/automake/texinfos-vars.am
-share/automake/texinfos.am
-share/automake/libraries-clean.am
-share/automake/programs-clean.am
-share/automake/data-clean.am
-share/automake/COPYING
-share/automake/INSTALL
+share/automake/tags.am
+share/automake/texi-vers.am
 share/automake/texinfo.tex
-share/automake/ansi2knr.c
-share/automake/ansi2knr.1
-share/automake/aclocal.m4
-@dirrm share/automake.
+share/automake/texinfos.am
+share/automake/ylwrap
+@dirrm share/aclocal
+@dirrm share/automake