4 files changed, 86 insertions, 82 deletions

diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 135bd42c2cf6..a9f6c4340f72 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -5,19 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=	automake
+PORTNAME=	automake14
 PORTVERSION=	1.4.5
-PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
-DISTNAME=	${PORTNAME}-1.4-p5
+DISTNAME=	automake-1.4-p5
 
 MAINTAINER=	portmgr@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL5}
+CONFIGURE_ARGS=	--program-suffix=14 --datadir=${PREFIX}/share/automake14
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/devel/automake14/pkg-comment b/devel/automake14/pkg-comment
index dc2986f74176..6fb4da2f7e8a 100644
--- a/devel/automake14/pkg-comment
+++ b/devel/automake14/pkg-comment
@@ -1 +1 @@
-GNU Standards-compliant Makefile generator
+GNU Standards-compliant Makefile generator (legacy version 1.4)
diff --git a/devel/automake14/pkg-descr b/devel/automake14/pkg-descr
index eeb8b96a2128..22f2396db80f 100644
--- a/devel/automake14/pkg-descr
+++ b/devel/automake14/pkg-descr
@@ -1,3 +1,6 @@
+This is the legacy 1.4 version of automake.  It is explictly for use with
+older software packages that are not buildable with the current automake.
+
 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.
diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist
index 1e62d5883c1f..98ccc3b9697c 100644
--- a/devel/automake14/pkg-plist
+++ b/devel/automake14/pkg-plist
@@ -1,80 +1,82 @@
-bin/aclocal
-bin/automake
+bin/aclocal14
+bin/automake14
 @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/automake14/aclocal/ccstdc.m4
+share/automake14/aclocal/cond.m4
+share/automake14/aclocal/dmalloc.m4
+share/automake14/aclocal/error.m4
+share/automake14/aclocal/header.m4
+share/automake14/aclocal/init.m4
+share/automake14/aclocal/lex.m4
+share/automake14/aclocal/lispdir.m4
+share/automake14/aclocal/maintainer.m4
+share/automake14/aclocal/missing.m4
+share/automake14/aclocal/mktime.m4
+share/automake14/aclocal/multi.m4
+share/automake14/aclocal/obstack.m4
+share/automake14/aclocal/protos.m4
+share/automake14/aclocal/ptrdiff.m4
+share/automake14/aclocal/regex.m4
+share/automake14/aclocal/sanity.m4
+share/automake14/aclocal/strtod.m4
+share/automake14/aclocal/termios.m4
+share/automake14/aclocal/winsz.m4
+share/automake14/automake/COPYING
+share/automake14/automake/INSTALL
+share/automake14/automake/acinstall
+share/automake14/automake/ansi2knr.1
+share/automake14/automake/ansi2knr.c
+share/automake14/automake/clean-hdr.am
+share/automake14/automake/clean-kr.am
+share/automake14/automake/clean.am
+share/automake14/automake/comp-vars.am
+share/automake14/automake/compile.am
+share/automake14/automake/config.guess
+share/automake14/automake/config.sub
+share/automake14/automake/data-clean.am
+share/automake14/automake/data.am
+share/automake14/automake/dejagnu.am
+share/automake14/automake/depend.am
+share/automake14/automake/depend2.am
+share/automake14/automake/dist-vars.am
+share/automake14/automake/elisp-comp
+share/automake14/automake/footer.am
+share/automake14/automake/header-vars.am
+share/automake14/automake/header.am
+share/automake14/automake/install-sh
+share/automake14/automake/java-clean.am
+share/automake14/automake/java.am
+share/automake14/automake/kr-extra.am
+share/automake14/automake/library.am
+share/automake14/automake/libs-clean.am
+share/automake14/automake/libs.am
+share/automake14/automake/libtool.am
+share/automake14/automake/lisp-clean.am
+share/automake14/automake/lisp.am
+share/automake14/automake/ltlib-clean.am
+share/automake14/automake/ltlib.am
+share/automake14/automake/ltlibrary.am
+share/automake14/automake/mans-vars.am
+share/automake14/automake/mans.am
+share/automake14/automake/mdate-sh
+share/automake14/automake/missing
+share/automake14/automake/mkinstalldirs
+share/automake14/automake/multilib.am
+share/automake14/automake/program.am
+share/automake14/automake/progs-clean.am
+share/automake14/automake/progs.am
+share/automake14/automake/remake-hdr.am
+share/automake14/automake/remake.am
+share/automake14/automake/scripts.am
+share/automake14/automake/subdirs.am
+share/automake14/automake/tags-clean.am
+share/automake14/automake/tags.am
+share/automake14/automake/texi-vers.am
+share/automake14/automake/texinfo.tex
+share/automake14/automake/texinfos.am
+share/automake14/automake/ylwrap
+@dirrm share/automake14/aclocal
+@dirrm share/automake14/automake
+@dirrm share/automake14