2 files changed, 97 insertions, 94 deletions

diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 2a5fc0963c74..ccc29f88759a 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	automake14
+PORTNAME=	automake
 PORTVERSION=	1.4.5
 PORTREVISION=	9
 CATEGORIES=	devel
@@ -16,9 +16,12 @@ DISTNAME=	automake-1.4-p5
 MAINTAINER=	ade@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator (legacy version 1.4)
 
+BUILD_VERSION=	14
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	automake${BUILD_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL5}
-CONFIGURE_ARGS=	--program-suffix=14
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
@@ -35,7 +38,7 @@ pre-everything::
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
 post-patch:
-	@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake14.texi
+	@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake${BUILD_VERSION}.texi
 	@${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true
 
 pre-configure:
@@ -43,17 +46,17 @@ pre-configure:
 		${WRKSRC}/aclocal.in
 
 pre-install:
-	${RM} -fr ${PREFIX}/share/automake14
-	${MKDIR} ${PREFIX}/share/automake14
-	${MKDIR} ${PREFIX}/share/aclocal14
-	${MKDIR} ${PREFIX}/libexec/automake14
+	${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
+	${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
+	${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
+	${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
 
 post-install:
 .for i in aclocal automake
-	${LN} -sf ${PREFIX}/bin/${i}14 \
-		${PREFIX}/libexec/automake14/${i}
+	${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
+		${PREFIX}/libexec/automake${BUILD_VERSION}/${i}
 .endfor
-	@install-info ${PREFIX}/info/automake14.info \
+	@install-info ${PREFIX}/info/automake${BUILD_VERSION}.info \
 		${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist
index 00506cacc6e9..10ba0b711736 100644
--- a/devel/automake14/pkg-plist
+++ b/devel/automake14/pkg-plist
@@ -1,84 +1,84 @@
-bin/aclocal14
-bin/automake14
-@unexec install-info --delete %D/info/automake14.info %D/info/dir
-info/automake14.info
-@exec install-info %D/info/automake14.info %D/info/dir
-libexec/automake14/aclocal
-libexec/automake14/automake
-share/aclocal14/ccstdc.m4
-share/aclocal14/cond.m4
-share/aclocal14/dmalloc.m4
-share/aclocal14/error.m4
-share/aclocal14/header.m4
-share/aclocal14/init.m4
-share/aclocal14/lex.m4
-share/aclocal14/lispdir.m4
-share/aclocal14/maintainer.m4
-share/aclocal14/missing.m4
-share/aclocal14/mktime.m4
-share/aclocal14/multi.m4
-share/aclocal14/obstack.m4
-share/aclocal14/protos.m4
-share/aclocal14/ptrdiff.m4
-share/aclocal14/regex.m4
-share/aclocal14/sanity.m4
-share/aclocal14/strtod.m4
-share/aclocal14/termios.m4
-share/aclocal14/winsz.m4
-share/automake14/COPYING
-share/automake14/INSTALL
-share/automake14/acinstall
-share/automake14/ansi2knr.1
-share/automake14/ansi2knr.c
-share/automake14/clean-hdr.am
-share/automake14/clean-kr.am
-share/automake14/clean.am
-share/automake14/comp-vars.am
-share/automake14/compile.am
-share/automake14/config.guess
-share/automake14/config.sub
-share/automake14/data-clean.am
-share/automake14/data.am
-share/automake14/dejagnu.am
-share/automake14/depend.am
-share/automake14/depend2.am
-share/automake14/dist-vars.am
-share/automake14/elisp-comp
-share/automake14/footer.am
-share/automake14/header-vars.am
-share/automake14/header.am
-share/automake14/install-sh
-share/automake14/java-clean.am
-share/automake14/java.am
-share/automake14/kr-extra.am
-share/automake14/library.am
-share/automake14/libs-clean.am
-share/automake14/libs.am
-share/automake14/libtool.am
-share/automake14/lisp-clean.am
-share/automake14/lisp.am
-share/automake14/ltlib-clean.am
-share/automake14/ltlib.am
-share/automake14/ltlibrary.am
-share/automake14/mans-vars.am
-share/automake14/mans.am
-share/automake14/mdate-sh
-share/automake14/missing
-share/automake14/mkinstalldirs
-share/automake14/multilib.am
-share/automake14/program.am
-share/automake14/progs-clean.am
-share/automake14/progs.am
-share/automake14/remake-hdr.am
-share/automake14/remake.am
-share/automake14/scripts.am
-share/automake14/subdirs.am
-share/automake14/tags-clean.am
-share/automake14/tags.am
-share/automake14/texi-vers.am
-share/automake14/texinfo.tex
-share/automake14/texinfos.am
-share/automake14/ylwrap
-@dirrm libexec/automake14
-@dirrm share/aclocal14
-@dirrm share/automake14
+bin/aclocal%%BUILD_VERSION%%
+bin/automake%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir
+info/automake%%BUILD_VERSION%%.info
+@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir
+libexec/automake%%BUILD_VERSION%%/aclocal
+libexec/automake%%BUILD_VERSION%%/automake
+share/aclocal%%BUILD_VERSION%%/ccstdc.m4
+share/aclocal%%BUILD_VERSION%%/cond.m4
+share/aclocal%%BUILD_VERSION%%/dmalloc.m4
+share/aclocal%%BUILD_VERSION%%/error.m4
+share/aclocal%%BUILD_VERSION%%/header.m4
+share/aclocal%%BUILD_VERSION%%/init.m4
+share/aclocal%%BUILD_VERSION%%/lex.m4
+share/aclocal%%BUILD_VERSION%%/lispdir.m4
+share/aclocal%%BUILD_VERSION%%/maintainer.m4
+share/aclocal%%BUILD_VERSION%%/missing.m4
+share/aclocal%%BUILD_VERSION%%/mktime.m4
+share/aclocal%%BUILD_VERSION%%/multi.m4
+share/aclocal%%BUILD_VERSION%%/obstack.m4
+share/aclocal%%BUILD_VERSION%%/protos.m4
+share/aclocal%%BUILD_VERSION%%/ptrdiff.m4
+share/aclocal%%BUILD_VERSION%%/regex.m4
+share/aclocal%%BUILD_VERSION%%/sanity.m4
+share/aclocal%%BUILD_VERSION%%/strtod.m4
+share/aclocal%%BUILD_VERSION%%/termios.m4
+share/aclocal%%BUILD_VERSION%%/winsz.m4
+share/automake%%BUILD_VERSION%%/COPYING
+share/automake%%BUILD_VERSION%%/INSTALL
+share/automake%%BUILD_VERSION%%/acinstall
+share/automake%%BUILD_VERSION%%/ansi2knr.1
+share/automake%%BUILD_VERSION%%/ansi2knr.c
+share/automake%%BUILD_VERSION%%/clean-hdr.am
+share/automake%%BUILD_VERSION%%/clean-kr.am
+share/automake%%BUILD_VERSION%%/clean.am
+share/automake%%BUILD_VERSION%%/comp-vars.am
+share/automake%%BUILD_VERSION%%/compile.am
+share/automake%%BUILD_VERSION%%/config.guess
+share/automake%%BUILD_VERSION%%/config.sub
+share/automake%%BUILD_VERSION%%/data-clean.am
+share/automake%%BUILD_VERSION%%/data.am
+share/automake%%BUILD_VERSION%%/dejagnu.am
+share/automake%%BUILD_VERSION%%/depend.am
+share/automake%%BUILD_VERSION%%/depend2.am
+share/automake%%BUILD_VERSION%%/dist-vars.am
+share/automake%%BUILD_VERSION%%/elisp-comp
+share/automake%%BUILD_VERSION%%/footer.am
+share/automake%%BUILD_VERSION%%/header-vars.am
+share/automake%%BUILD_VERSION%%/header.am
+share/automake%%BUILD_VERSION%%/install-sh
+share/automake%%BUILD_VERSION%%/java-clean.am
+share/automake%%BUILD_VERSION%%/java.am
+share/automake%%BUILD_VERSION%%/kr-extra.am
+share/automake%%BUILD_VERSION%%/library.am
+share/automake%%BUILD_VERSION%%/libs-clean.am
+share/automake%%BUILD_VERSION%%/libs.am
+share/automake%%BUILD_VERSION%%/libtool.am
+share/automake%%BUILD_VERSION%%/lisp-clean.am
+share/automake%%BUILD_VERSION%%/lisp.am
+share/automake%%BUILD_VERSION%%/ltlib-clean.am
+share/automake%%BUILD_VERSION%%/ltlib.am
+share/automake%%BUILD_VERSION%%/ltlibrary.am
+share/automake%%BUILD_VERSION%%/mans-vars.am
+share/automake%%BUILD_VERSION%%/mans.am
+share/automake%%BUILD_VERSION%%/mdate-sh
+share/automake%%BUILD_VERSION%%/missing
+share/automake%%BUILD_VERSION%%/mkinstalldirs
+share/automake%%BUILD_VERSION%%/multilib.am
+share/automake%%BUILD_VERSION%%/program.am
+share/automake%%BUILD_VERSION%%/progs-clean.am
+share/automake%%BUILD_VERSION%%/progs.am
+share/automake%%BUILD_VERSION%%/remake-hdr.am
+share/automake%%BUILD_VERSION%%/remake.am
+share/automake%%BUILD_VERSION%%/scripts.am
+share/automake%%BUILD_VERSION%%/subdirs.am
+share/automake%%BUILD_VERSION%%/tags-clean.am
+share/automake%%BUILD_VERSION%%/tags.am
+share/automake%%BUILD_VERSION%%/texi-vers.am
+share/automake%%BUILD_VERSION%%/texinfo.tex
+share/automake%%BUILD_VERSION%%/texinfos.am
+share/automake%%BUILD_VERSION%%/ylwrap
+@dirrm libexec/automake%%BUILD_VERSION%%
+@dirrm share/aclocal%%BUILD_VERSION%%
+@dirrm share/automake%%BUILD_VERSION%%