1. Update version to 1.7.1.

2. Rewrote pkg-comment and pkg-descr files.
3. Marked pkg-plist file as not done.
4. Made do-build and do-install targets indicating that this port is
   not at all ready to even be looked at. The repocopy was a placeholder
   for when I can get to it.

48 files changed, 120 insertions, 1146 deletions

diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 5768525..3533463 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake17
-PORTVERSION=	1.7
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -36,11 +36,10 @@ pre-everything:
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
-pre-configure:
-	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+do-build:
+	${ECHO_MSG} This port is not ready yet.
 
-post-install:
-	@install-info ${PREFIX}/info/automake.info \
-		${PREFIX}/info/dir
+do-install:
+	${ECHO_MSG} I told you this port is not ready yet. Now go away.
 
 .include <bsd.port.mk>
diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo
index ee95faf..2d1d3ce 100644
--- a/devel/automake110/distinfo
+++ b/devel/automake110/distinfo
@@ -1 +1 @@
-MD5 (automake-1.7.tar.gz) = 414e7bb4fd462638e3fb0c9d67937218
+MD5 (automake-1.7.1.tar.gz) = e6fae71b4a1fe5af6f10ed9f1e9ca12e
diff --git a/devel/automake110/files/patch-Makefile.in b/devel/automake110/files/patch-Makefile.in
deleted file mode 100644
index 5f1a7a8..0000000
--- a/devel/automake110/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
- 	       `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
diff --git a/devel/automake110/files/patch-aclocal.in b/devel/automake110/files/patch-aclocal.in
deleted file mode 100644
index 3cd7734..0000000
--- a/devel/automake110/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
- 
- # Exit status.
-@@ -115,6 +117,9 @@
- 
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,13 @@
- 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
-     }
- 
-+    local (@skipinolist) = ();
-     local ($m4dir);
-     foreach $m4dir (@dirlist)
-     {
- 	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
-+	local ($file, $fullfile, $expr);
- 	local ($file, $fullfile);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
-@@ -314,6 +321,12 @@
- 	    next if $file eq 'aclocal.m4';
- 
- 	    $fullfile = $m4dir . '/' . $file;
-+
-+	    # Do not scan a file more than once.
-+	    $ino = (stat($fullfile))[1];
-+	    next if grep($ino eq $_, @skipinolist);
-+	    push @skipinolist, $ino;
-+
- 	    $file_contents{$fullfile} = &scan_file ($fullfile);
- 	}
- 	closedir (DIR);
diff --git a/devel/automake110/files/patch-automake.texi b/devel/automake110/files/patch-automake.texi
deleted file mode 100644
index a63884c..0000000
--- a/devel/automake110/files/patch-automake.texi
+++ /dev/null
@@ -1,25 +0,0 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -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
diff --git a/devel/automake110/pkg-comment b/devel/automake110/pkg-comment
index dc2986f..b471700 100644
--- a/devel/automake110/pkg-comment
+++ b/devel/automake110/pkg-comment
@@ -1 +1 @@
-GNU Standards-compliant Makefile generator
+GNU automake generates (not-quite-makefile) input files for GNU autoconf
diff --git a/devel/automake110/pkg-descr b/devel/automake110/pkg-descr
index eeb8b96..c0c2845 100644
--- a/devel/automake110/pkg-descr
+++ b/devel/automake110/pkg-descr
@@ -1,8 +1,14 @@
-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 is a tool for automatically generating Makefiles compliant with
+the GNU Coding Standards. 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 is a Perl script. The input files
+are called Makefile.am. The output files are called Makefile.in; They are
+intended for use with Autoconf. Automake requires certain things to be done
+in your configure.in. This package also includes the "aclocal"
+program. aclocal is a program to generate an 'aclocal.m4' based on the
+contents of 'configure.in'. It is useful as an extensible, maintainable
+mechanism for augmenting autoconf.
 
-Automake assumes the project uses autoconf.  If you want automatic
-dependency tracking support, the use of GNU make is also required.
+WWW: http://www.gnu.org/software/automake/
 
-WWW: http://sources.redhat.com/automake/
+-- AlanE <alane@freebsd.org>
diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist
index dfd228f..24bb5f0 100644
--- a/devel/automake110/pkg-plist
+++ b/devel/automake110/pkg-plist
@@ -1,93 +1 @@
-bin/aclocal
-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/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/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+@comment This port is in progress. Go away.
diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile
index 5768525..3533463 100644
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake17
-PORTVERSION=	1.7
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -36,11 +36,10 @@ pre-everything:
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
-pre-configure:
-	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+do-build:
+	${ECHO_MSG} This port is not ready yet.
 
-post-install:
-	@install-info ${PREFIX}/info/automake.info \
-		${PREFIX}/info/dir
+do-install:
+	${ECHO_MSG} I told you this port is not ready yet. Now go away.
 
 .include <bsd.port.mk>
diff --git a/devel/automake16/distinfo b/devel/automake16/distinfo
index ee95faf..2d1d3ce 100644
--- a/devel/automake16/distinfo
+++ b/devel/automake16/distinfo
@@ -1 +1 @@
-MD5 (automake-1.7.tar.gz) = 414e7bb4fd462638e3fb0c9d67937218
+MD5 (automake-1.7.1.tar.gz) = e6fae71b4a1fe5af6f10ed9f1e9ca12e
diff --git a/devel/automake16/files/patch-Makefile.in b/devel/automake16/files/patch-Makefile.in
deleted file mode 100644
index 5f1a7a8..0000000
--- a/devel/automake16/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
- 	       `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
diff --git a/devel/automake16/files/patch-aclocal.in b/devel/automake16/files/patch-aclocal.in
deleted file mode 100644
index 3cd7734..0000000
--- a/devel/automake16/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
- 
- # Exit status.
-@@ -115,6 +117,9 @@
- 
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,13 @@
- 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
-     }
- 
-+    local (@skipinolist) = ();
-     local ($m4dir);
-     foreach $m4dir (@dirlist)
-     {
- 	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
-+	local ($file, $fullfile, $expr);
- 	local ($file, $fullfile);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
-@@ -314,6 +321,12 @@
- 	    next if $file eq 'aclocal.m4';
- 
- 	    $fullfile = $m4dir . '/' . $file;
-+
-+	    # Do not scan a file more than once.
-+	    $ino = (stat($fullfile))[1];
-+	    next if grep($ino eq $_, @skipinolist);
-+	    push @skipinolist, $ino;
-+
- 	    $file_contents{$fullfile} = &scan_file ($fullfile);
- 	}
- 	closedir (DIR);
diff --git a/devel/automake16/files/patch-automake.texi b/devel/automake16/files/patch-automake.texi
deleted file mode 100644
index a63884c..0000000
--- a/devel/automake16/files/patch-automake.texi
+++ /dev/null
@@ -1,25 +0,0 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -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
diff --git a/devel/automake16/pkg-comment b/devel/automake16/pkg-comment
index dc2986f..b471700 100644
--- a/devel/automake16/pkg-comment
+++ b/devel/automake16/pkg-comment
@@ -1 +1 @@
-GNU Standards-compliant Makefile generator
+GNU automake generates (not-quite-makefile) input files for GNU autoconf
diff --git a/devel/automake16/pkg-descr b/devel/automake16/pkg-descr
index eeb8b96..c0c2845 100644
--- a/devel/automake16/pkg-descr
+++ b/devel/automake16/pkg-descr
@@ -1,8 +1,14 @@
-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 is a tool for automatically generating Makefiles compliant with
+the GNU Coding Standards. 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 is a Perl script. The input files
+are called Makefile.am. The output files are called Makefile.in; They are
+intended for use with Autoconf. Automake requires certain things to be done
+in your configure.in. This package also includes the "aclocal"
+program. aclocal is a program to generate an 'aclocal.m4' based on the
+contents of 'configure.in'. It is useful as an extensible, maintainable
+mechanism for augmenting autoconf.
 
-Automake assumes the project uses autoconf.  If you want automatic
-dependency tracking support, the use of GNU make is also required.
+WWW: http://www.gnu.org/software/automake/
 
-WWW: http://sources.redhat.com/automake/
+-- AlanE <alane@freebsd.org>
diff --git a/devel/automake16/pkg-plist b/devel/automake16/pkg-plist
index dfd228f..24bb5f0 100644
--- a/devel/automake16/pkg-plist
+++ b/devel/automake16/pkg-plist
@@ -1,93 +1 @@
-bin/aclocal
-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/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/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+@comment This port is in progress. Go away.
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index 5768525..3533463 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake17
-PORTVERSION=	1.7
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -36,11 +36,10 @@ pre-everything:
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
-pre-configure:
-	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+do-build:
+	${ECHO_MSG} This port is not ready yet.
 
-post-install:
-	@install-info ${PREFIX}/info/automake.info \
-		${PREFIX}/info/dir
+do-install:
+	${ECHO_MSG} I told you this port is not ready yet. Now go away.
 
 .include <bsd.port.mk>
diff --git a/devel/automake17/distinfo b/devel/automake17/distinfo
index ee95faf..2d1d3ce 100644
--- a/devel/automake17/distinfo
+++ b/devel/automake17/distinfo
@@ -1 +1 @@
-MD5 (automake-1.7.tar.gz) = 414e7bb4fd462638e3fb0c9d67937218
+MD5 (automake-1.7.1.tar.gz) = e6fae71b4a1fe5af6f10ed9f1e9ca12e
diff --git a/devel/automake17/files/patch-Makefile.in b/devel/automake17/files/patch-Makefile.in
deleted file mode 100644
index 5f1a7a8..0000000
--- a/devel/automake17/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
- 	       `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
diff --git a/devel/automake17/files/patch-aclocal.in b/devel/automake17/files/patch-aclocal.in
deleted file mode 100644
index 3cd7734..0000000
--- a/devel/automake17/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
- 
- # Exit status.
-@@ -115,6 +117,9 @@
- 
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,13 @@
- 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
-     }
- 
-+    local (@skipinolist) = ();
-     local ($m4dir);
-     foreach $m4dir (@dirlist)
-     {
- 	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
-+	local ($file, $fullfile, $expr);
- 	local ($file, $fullfile);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
-@@ -314,6 +321,12 @@
- 	    next if $file eq 'aclocal.m4';
- 
- 	    $fullfile = $m4dir . '/' . $file;
-+
-+	    # Do not scan a file more than once.
-+	    $ino = (stat($fullfile))[1];
-+	    next if grep($ino eq $_, @skipinolist);
-+	    push @skipinolist, $ino;
-+
- 	    $file_contents{$fullfile} = &scan_file ($fullfile);
- 	}
- 	closedir (DIR);
diff --git a/devel/automake17/files/patch-automake.texi b/devel/automake17/files/patch-automake.texi
deleted file mode 100644
index a63884c..0000000
--- a/devel/automake17/files/patch-automake.texi
+++ /dev/null
@@ -1,25 +0,0 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -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
diff --git a/devel/automake17/pkg-comment b/devel/automake17/pkg-comment
index dc2986f..b471700 100644
--- a/devel/automake17/pkg-comment
+++ b/devel/automake17/pkg-comment
@@ -1 +1 @@
-GNU Standards-compliant Makefile generator
+GNU automake generates (not-quite-makefile) input files for GNU autoconf
diff --git a/devel/automake17/pkg-descr b/devel/automake17/pkg-descr
index eeb8b96..c0c2845 100644
--- a/devel/automake17/pkg-descr
+++ b/devel/automake17/pkg-descr
@@ -1,8 +1,14 @@
-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 is a tool for automatically generating Makefiles compliant with
+the GNU Coding Standards. 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 is a Perl script. The input files
+are called Makefile.am. The output files are called Makefile.in; They are
+intended for use with Autoconf. Automake requires certain things to be done
+in your configure.in. This package also includes the "aclocal"
+program. aclocal is a program to generate an 'aclocal.m4' based on the
+contents of 'configure.in'. It is useful as an extensible, maintainable
+mechanism for augmenting autoconf.
 
-Automake assumes the project uses autoconf.  If you want automatic
-dependency tracking support, the use of GNU make is also required.
+WWW: http://www.gnu.org/software/automake/
 
-WWW: http://sources.redhat.com/automake/
+-- AlanE <alane@freebsd.org>
diff --git a/devel/automake17/pkg-plist b/devel/automake17/pkg-plist
index dfd228f..24bb5f0 100644
--- a/devel/automake17/pkg-plist
+++ b/devel/automake17/pkg-plist
@@ -1,93 +1 @@
-bin/aclocal
-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/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/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+@comment This port is in progress. Go away.
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
index 5768525..3533463 100644
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake17
-PORTVERSION=	1.7
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -36,11 +36,10 @@ pre-everything:
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
-pre-configure:
-	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+do-build:
+	${ECHO_MSG} This port is not ready yet.
 
-post-install:
-	@install-info ${PREFIX}/info/automake.info \
-		${PREFIX}/info/dir
+do-install:
+	${ECHO_MSG} I told you this port is not ready yet. Now go away.
 
 .include <bsd.port.mk>
diff --git a/devel/automake18/distinfo b/devel/automake18/distinfo
index ee95faf..2d1d3ce 100644
--- a/devel/automake18/distinfo
+++ b/devel/automake18/distinfo
@@ -1 +1 @@
-MD5 (automake-1.7.tar.gz) = 414e7bb4fd462638e3fb0c9d67937218
+MD5 (automake-1.7.1.tar.gz) = e6fae71b4a1fe5af6f10ed9f1e9ca12e
diff --git a/devel/automake18/files/patch-Makefile.in b/devel/automake18/files/patch-Makefile.in
deleted file mode 100644
index 5f1a7a8..0000000
--- a/devel/automake18/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
- 	       `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
diff --git a/devel/automake18/files/patch-aclocal.in b/devel/automake18/files/patch-aclocal.in
deleted file mode 100644
index 3cd7734..0000000
--- a/devel/automake18/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
- 
- # Exit status.
-@@ -115,6 +117,9 @@
- 
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,13 @@
- 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
-     }
- 
-+    local (@skipinolist) = ();
-     local ($m4dir);
-     foreach $m4dir (@dirlist)
-     {
- 	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
-+	local ($file, $fullfile, $expr);
- 	local ($file, $fullfile);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
-@@ -314,6 +321,12 @@
- 	    next if $file eq 'aclocal.m4';
- 
- 	    $fullfile = $m4dir . '/' . $file;
-+
-+	    # Do not scan a file more than once.
-+	    $ino = (stat($fullfile))[1];
-+	    next if grep($ino eq $_, @skipinolist);
-+	    push @skipinolist, $ino;
-+
- 	    $file_contents{$fullfile} = &scan_file ($fullfile);
- 	}
- 	closedir (DIR);
diff --git a/devel/automake18/files/patch-automake.texi b/devel/automake18/files/patch-automake.texi
deleted file mode 100644
index a63884c..0000000
--- a/devel/automake18/files/patch-automake.texi
+++ /dev/null
@@ -1,25 +0,0 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -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
diff --git a/devel/automake18/pkg-comment b/devel/automake18/pkg-comment
index dc2986f..b471700 100644
--- a/devel/automake18/pkg-comment
+++ b/devel/automake18/pkg-comment
@@ -1 +1 @@
-GNU Standards-compliant Makefile generator
+GNU automake generates (not-quite-makefile) input files for GNU autoconf
diff --git a/devel/automake18/pkg-descr b/devel/automake18/pkg-descr
index eeb8b96..c0c2845 100644
--- a/devel/automake18/pkg-descr
+++ b/devel/automake18/pkg-descr
@@ -1,8 +1,14 @@
-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 is a tool for automatically generating Makefiles compliant with
+the GNU Coding Standards. 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 is a Perl script. The input files
+are called Makefile.am. The output files are called Makefile.in; They are
+intended for use with Autoconf. Automake requires certain things to be done
+in your configure.in. This package also includes the "aclocal"
+program. aclocal is a program to generate an 'aclocal.m4' based on the
+contents of 'configure.in'. It is useful as an extensible, maintainable
+mechanism for augmenting autoconf.
 
-Automake assumes the project uses autoconf.  If you want automatic
-dependency tracking support, the use of GNU make is also required.
+WWW: http://www.gnu.org/software/automake/
 
-WWW: http://sources.redhat.com/automake/
+-- AlanE <alane@freebsd.org>
diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist
index dfd228f..24bb5f0 100644
--- a/devel/automake18/pkg-plist
+++ b/devel/automake18/pkg-plist
@@ -1,93 +1 @@
-bin/aclocal
-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/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/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+@comment This port is in progress. Go away.
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 5768525..3533463 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake17
-PORTVERSION=	1.7
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -36,11 +36,10 @@ pre-everything:
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
-pre-configure:
-	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+do-build:
+	${ECHO_MSG} This port is not ready yet.
 
-post-install:
-	@install-info ${PREFIX}/info/automake.info \
-		${PREFIX}/info/dir
+do-install:
+	${ECHO_MSG} I told you this port is not ready yet. Now go away.
 
 .include <bsd.port.mk>
diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo
index ee95faf..2d1d3ce 100644
--- a/devel/automake19/distinfo
+++ b/devel/automake19/distinfo
@@ -1 +1 @@
-MD5 (automake-1.7.tar.gz) = 414e7bb4fd462638e3fb0c9d67937218
+MD5 (automake-1.7.1.tar.gz) = e6fae71b4a1fe5af6f10ed9f1e9ca12e
diff --git a/devel/automake19/files/patch-Makefile.in b/devel/automake19/files/patch-Makefile.in
deleted file mode 100644
index 5f1a7a8..0000000
--- a/devel/automake19/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
- 	       `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
diff --git a/devel/automake19/files/patch-aclocal.in b/devel/automake19/files/patch-aclocal.in
deleted file mode 100644
index 3cd7734..0000000
--- a/devel/automake19/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
- 
- # Exit status.
-@@ -115,6 +117,9 @@
- 
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,13 @@
- 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
-     }
- 
-+    local (@skipinolist) = ();
-     local ($m4dir);
-     foreach $m4dir (@dirlist)
-     {
- 	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
-+	local ($file, $fullfile, $expr);
- 	local ($file, $fullfile);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
-@@ -314,6 +321,12 @@
- 	    next if $file eq 'aclocal.m4';
- 
- 	    $fullfile = $m4dir . '/' . $file;
-+
-+	    # Do not scan a file more than once.
-+	    $ino = (stat($fullfile))[1];
-+	    next if grep($ino eq $_, @skipinolist);
-+	    push @skipinolist, $ino;
-+
- 	    $file_contents{$fullfile} = &scan_file ($fullfile);
- 	}
- 	closedir (DIR);
diff --git a/devel/automake19/files/patch-automake.texi b/devel/automake19/files/patch-automake.texi
deleted file mode 100644
index a63884c..0000000
--- a/devel/automake19/files/patch-automake.texi
+++ /dev/null
@@ -1,25 +0,0 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -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
diff --git a/devel/automake19/pkg-comment b/devel/automake19/pkg-comment
index dc2986f..b471700 100644
--- a/devel/automake19/pkg-comment
+++ b/devel/automake19/pkg-comment
@@ -1 +1 @@
-GNU Standards-compliant Makefile generator
+GNU automake generates (not-quite-makefile) input files for GNU autoconf
diff --git a/devel/automake19/pkg-descr b/devel/automake19/pkg-descr
index eeb8b96..c0c2845 100644
--- a/devel/automake19/pkg-descr
+++ b/devel/automake19/pkg-descr
@@ -1,8 +1,14 @@
-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 is a tool for automatically generating Makefiles compliant with
+the GNU Coding Standards. 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 is a Perl script. The input files
+are called Makefile.am. The output files are called Makefile.in; They are
+intended for use with Autoconf. Automake requires certain things to be done
+in your configure.in. This package also includes the "aclocal"
+program. aclocal is a program to generate an 'aclocal.m4' based on the
+contents of 'configure.in'. It is useful as an extensible, maintainable
+mechanism for augmenting autoconf.
 
-Automake assumes the project uses autoconf.  If you want automatic
-dependency tracking support, the use of GNU make is also required.
+WWW: http://www.gnu.org/software/automake/
 
-WWW: http://sources.redhat.com/automake/
+-- AlanE <alane@freebsd.org>
diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist
index dfd228f..24bb5f0 100644
--- a/devel/automake19/pkg-plist
+++ b/devel/automake19/pkg-plist
@@ -1,93 +1 @@
-bin/aclocal
-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/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/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+@comment This port is in progress. Go away.
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 5768525..3533463 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake17
-PORTVERSION=	1.7
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -36,11 +36,10 @@ pre-everything:
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
-pre-configure:
-	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+do-build:
+	${ECHO_MSG} This port is not ready yet.
 
-post-install:
-	@install-info ${PREFIX}/info/automake.info \
-		${PREFIX}/info/dir
+do-install:
+	${ECHO_MSG} I told you this port is not ready yet. Now go away.
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo
index ee95faf..2d1d3ce 100644
--- a/devel/gnu-automake/distinfo
+++ b/devel/gnu-automake/distinfo
@@ -1 +1 @@
-MD5 (automake-1.7.tar.gz) = 414e7bb4fd462638e3fb0c9d67937218
+MD5 (automake-1.7.1.tar.gz) = e6fae71b4a1fe5af6f10ed9f1e9ca12e
diff --git a/devel/gnu-automake/files/patch-Makefile.in b/devel/gnu-automake/files/patch-Makefile.in
deleted file mode 100644
index 5f1a7a8..0000000
--- a/devel/gnu-automake/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
- 	       `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
diff --git a/devel/gnu-automake/files/patch-aclocal.in b/devel/gnu-automake/files/patch-aclocal.in
deleted file mode 100644
index 3cd7734..0000000
--- a/devel/gnu-automake/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
- 
- # Exit status.
-@@ -115,6 +117,9 @@
- 
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,13 @@
- 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
-     }
- 
-+    local (@skipinolist) = ();
-     local ($m4dir);
-     foreach $m4dir (@dirlist)
-     {
- 	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
-+	local ($file, $fullfile, $expr);
- 	local ($file, $fullfile);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
-@@ -314,6 +321,12 @@
- 	    next if $file eq 'aclocal.m4';
- 
- 	    $fullfile = $m4dir . '/' . $file;
-+
-+	    # Do not scan a file more than once.
-+	    $ino = (stat($fullfile))[1];
-+	    next if grep($ino eq $_, @skipinolist);
-+	    push @skipinolist, $ino;
-+
- 	    $file_contents{$fullfile} = &scan_file ($fullfile);
- 	}
- 	closedir (DIR);
diff --git a/devel/gnu-automake/files/patch-automake.texi b/devel/gnu-automake/files/patch-automake.texi
deleted file mode 100644
index a63884c..0000000
--- a/devel/gnu-automake/files/patch-automake.texi
+++ /dev/null
@@ -1,25 +0,0 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -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
diff --git a/devel/gnu-automake/pkg-comment b/devel/gnu-automake/pkg-comment
index dc2986f..b471700 100644
--- a/devel/gnu-automake/pkg-comment
+++ b/devel/gnu-automake/pkg-comment
@@ -1 +1 @@
-GNU Standards-compliant Makefile generator
+GNU automake generates (not-quite-makefile) input files for GNU autoconf
diff --git a/devel/gnu-automake/pkg-descr b/devel/gnu-automake/pkg-descr
index eeb8b96..c0c2845 100644
--- a/devel/gnu-automake/pkg-descr
+++ b/devel/gnu-automake/pkg-descr
@@ -1,8 +1,14 @@
-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 is a tool for automatically generating Makefiles compliant with
+the GNU Coding Standards. 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 is a Perl script. The input files
+are called Makefile.am. The output files are called Makefile.in; They are
+intended for use with Autoconf. Automake requires certain things to be done
+in your configure.in. This package also includes the "aclocal"
+program. aclocal is a program to generate an 'aclocal.m4' based on the
+contents of 'configure.in'. It is useful as an extensible, maintainable
+mechanism for augmenting autoconf.
 
-Automake assumes the project uses autoconf.  If you want automatic
-dependency tracking support, the use of GNU make is also required.
+WWW: http://www.gnu.org/software/automake/
 
-WWW: http://sources.redhat.com/automake/
+-- AlanE <alane@freebsd.org>
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index dfd228f..24bb5f0 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -1,93 +1 @@
-bin/aclocal
-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/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/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+@comment This port is in progress. Go away.