Use the cosmetic BUILD_VERSION variable (a la libtool), switch portnames

away from using the version number twice.

Unbreak automake17, base on work from Rui Lopes <rui@ruilopes.com>

1 files changed, 98 insertions, 101 deletions

diff --git a/devel/automake17/pkg-plist b/devel/automake17/pkg-plist
index e46339fdbef..a7f80f4a279 100644
--- a/devel/automake17/pkg-plist
+++ b/devel/automake17/pkg-plist
@@ -1,101 +1,98 @@
-@comment $FreeBSD$
-bin/aclocal17
-bin/automake17
-@unexec install-info --delete %D/info/automake17.info %D/info/dir
-info/automake17.info
-@exec install-info %D/info/automake17.info %D/info/dir
-libexec/automake17/aclocal
-libexec/automake17/automake
-share/aclocal17/amversion.m4
-share/aclocal17/as.m4
-share/aclocal17/auxdir.m4
-share/aclocal17/ccstdc.m4
-share/aclocal17/cond.m4
-share/aclocal17/depend.m4
-share/aclocal17/depout.m4
-share/aclocal17/dmalloc.m4
-share/aclocal17/gcj.m4
-share/aclocal17/header.m4
-share/aclocal17/init.m4
-share/aclocal17/install-sh.m4
-share/aclocal17/lex.m4
-share/aclocal17/lispdir.m4
-share/aclocal17/maintainer.m4
-share/aclocal17/make.m4
-share/aclocal17/minuso.m4
-share/aclocal17/missing.m4
-share/aclocal17/multi.m4
-share/aclocal17/obsol-gt.m4
-share/aclocal17/obsol-lt.m4
-share/aclocal17/obsolete.m4
-share/aclocal17/options.m4
-share/aclocal17/protos.m4
-share/aclocal17/python.m4
-share/aclocal17/regex.m4
-share/aclocal17/runlog.m4
-share/aclocal17/sanity.m4
-share/aclocal17/strip.m4
-share/automake17/Automake/Channels.pm
-share/automake17/Automake/General.pm
-share/automake17/Automake/Struct.pm
-share/automake17/Automake/XFile.pm
-share/automake17/COPYING
-share/automake17/INSTALL
-share/automake17/acinstall
-share/automake17/am/ansi2knr.am
-share/automake17/am/check.am
-share/automake17/am/clean-hdr.am
-share/automake17/am/clean.am
-share/automake17/am/compile.am
-share/automake17/am/configure.am
-share/automake17/am/data.am
-share/automake17/am/dejagnu.am
-share/automake17/am/depend.am
-share/automake17/am/depend2.am
-share/automake17/am/distdir.am
-share/automake17/am/footer.am
-share/automake17/am/header-vars.am
-share/automake17/am/header.am
-share/automake17/am/install.am
-share/automake17/am/java.am
-share/automake17/am/lang-compile.am
-share/automake17/am/lex.am
-share/automake17/am/library.am
-share/automake17/am/libs.am
-share/automake17/am/libtool.am
-share/automake17/am/lisp.am
-share/automake17/am/ltlib.am
-share/automake17/am/ltlibrary.am
-share/automake17/am/mans-vars.am
-share/automake17/am/mans.am
-share/automake17/am/multilib.am
-share/automake17/am/program.am
-share/automake17/am/progs.am
-share/automake17/am/python.am
-share/automake17/am/remake-hdr.am
-share/automake17/am/scripts.am
-share/automake17/am/subdirs.am
-share/automake17/am/tags.am
-share/automake17/am/texi-vers.am
-share/automake17/am/texibuild.am
-share/automake17/am/texinfos.am
-share/automake17/am/yacc.am
-share/automake17/ansi2knr.1
-share/automake17/ansi2knr.c
-share/automake17/compile
-share/automake17/config.guess
-share/automake17/config.sub
-share/automake17/depcomp
-share/automake17/elisp-comp
-share/automake17/install-sh
-share/automake17/mdate-sh
-share/automake17/missing
-share/automake17/mkinstalldirs
-share/automake17/py-compile
-share/automake17/texinfo.tex
-share/automake17/ylwrap
-@dirrm libexec/automake17
-@dirrm share/aclocal17
-@dirrm share/automake17/Automake
-@dirrm share/automake17/am
-@dirrm share/automake17
+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
+share/aclocal%%BUILD_VERSION%%/amversion.m4
+share/aclocal%%BUILD_VERSION%%/as.m4
+share/aclocal%%BUILD_VERSION%%/auxdir.m4
+share/aclocal%%BUILD_VERSION%%/ccstdc.m4
+share/aclocal%%BUILD_VERSION%%/cond.m4
+share/aclocal%%BUILD_VERSION%%/depend.m4
+share/aclocal%%BUILD_VERSION%%/depout.m4
+share/aclocal%%BUILD_VERSION%%/dmalloc.m4
+share/aclocal%%BUILD_VERSION%%/gcj.m4
+share/aclocal%%BUILD_VERSION%%/header.m4
+share/aclocal%%BUILD_VERSION%%/init.m4
+share/aclocal%%BUILD_VERSION%%/install-sh.m4
+share/aclocal%%BUILD_VERSION%%/lead-dot.m4
+share/aclocal%%BUILD_VERSION%%/lex.m4
+share/aclocal%%BUILD_VERSION%%/lispdir.m4
+share/aclocal%%BUILD_VERSION%%/maintainer.m4
+share/aclocal%%BUILD_VERSION%%/make.m4
+share/aclocal%%BUILD_VERSION%%/minuso.m4
+share/aclocal%%BUILD_VERSION%%/missing.m4
+share/aclocal%%BUILD_VERSION%%/multi.m4
+share/aclocal%%BUILD_VERSION%%/obsol-gt.m4
+share/aclocal%%BUILD_VERSION%%/obsol-lt.m4
+share/aclocal%%BUILD_VERSION%%/obsolete.m4
+share/aclocal%%BUILD_VERSION%%/options.m4
+share/aclocal%%BUILD_VERSION%%/protos.m4
+share/aclocal%%BUILD_VERSION%%/python.m4
+share/aclocal%%BUILD_VERSION%%/regex.m4
+share/aclocal%%BUILD_VERSION%%/runlog.m4
+share/aclocal%%BUILD_VERSION%%/sanity.m4
+share/aclocal%%BUILD_VERSION%%/strip.m4
+share/automake%%BUILD_VERSION%%/Automake/Channels.pm
+share/automake%%BUILD_VERSION%%/Automake/General.pm
+share/automake%%BUILD_VERSION%%/Automake/Struct.pm
+share/automake%%BUILD_VERSION%%/Automake/XFile.pm
+share/automake%%BUILD_VERSION%%/COPYING
+share/automake%%BUILD_VERSION%%/INSTALL
+share/automake%%BUILD_VERSION%%/acinstall
+share/automake%%BUILD_VERSION%%/am/ansi2knr.am
+share/automake%%BUILD_VERSION%%/am/check.am
+share/automake%%BUILD_VERSION%%/am/clean-hdr.am
+share/automake%%BUILD_VERSION%%/am/clean.am
+share/automake%%BUILD_VERSION%%/am/compile.am
+share/automake%%BUILD_VERSION%%/am/configure.am
+share/automake%%BUILD_VERSION%%/am/data.am
+share/automake%%BUILD_VERSION%%/am/dejagnu.am
+share/automake%%BUILD_VERSION%%/am/depend.am
+share/automake%%BUILD_VERSION%%/am/depend2.am
+share/automake%%BUILD_VERSION%%/am/distdir.am
+share/automake%%BUILD_VERSION%%/am/footer.am
+share/automake%%BUILD_VERSION%%/am/header-vars.am
+share/automake%%BUILD_VERSION%%/am/header.am
+share/automake%%BUILD_VERSION%%/am/install.am
+share/automake%%BUILD_VERSION%%/am/java.am
+share/automake%%BUILD_VERSION%%/am/lang-compile.am
+share/automake%%BUILD_VERSION%%/am/lex.am
+share/automake%%BUILD_VERSION%%/am/library.am
+share/automake%%BUILD_VERSION%%/am/libs.am
+share/automake%%BUILD_VERSION%%/am/libtool.am
+share/automake%%BUILD_VERSION%%/am/lisp.am
+share/automake%%BUILD_VERSION%%/am/ltlib.am
+share/automake%%BUILD_VERSION%%/am/ltlibrary.am
+share/automake%%BUILD_VERSION%%/am/mans-vars.am
+share/automake%%BUILD_VERSION%%/am/mans.am
+share/automake%%BUILD_VERSION%%/am/multilib.am
+share/automake%%BUILD_VERSION%%/am/program.am
+share/automake%%BUILD_VERSION%%/am/progs.am
+share/automake%%BUILD_VERSION%%/am/python.am
+share/automake%%BUILD_VERSION%%/am/remake-hdr.am
+share/automake%%BUILD_VERSION%%/am/scripts.am
+share/automake%%BUILD_VERSION%%/am/subdirs.am
+share/automake%%BUILD_VERSION%%/am/tags.am
+share/automake%%BUILD_VERSION%%/am/texi-vers.am
+share/automake%%BUILD_VERSION%%/am/texibuild.am
+share/automake%%BUILD_VERSION%%/am/texinfos.am
+share/automake%%BUILD_VERSION%%/am/yacc.am
+share/automake%%BUILD_VERSION%%/ansi2knr.1
+share/automake%%BUILD_VERSION%%/ansi2knr.c
+share/automake%%BUILD_VERSION%%/compile
+share/automake%%BUILD_VERSION%%/config.guess
+share/automake%%BUILD_VERSION%%/config.sub
+share/automake%%BUILD_VERSION%%/depcomp
+share/automake%%BUILD_VERSION%%/elisp-comp
+share/automake%%BUILD_VERSION%%/install-sh
+share/automake%%BUILD_VERSION%%/mdate-sh
+share/automake%%BUILD_VERSION%%/missing
+share/automake%%BUILD_VERSION%%/mkinstalldirs
+share/automake%%BUILD_VERSION%%/py-compile
+share/automake%%BUILD_VERSION%%/texinfo.tex
+share/automake%%BUILD_VERSION%%/ylwrap
+@dirrm share/aclocal%%BUILD_VERSION%%
+@dirrm share/automake%%BUILD_VERSION%%/Automake
+@dirrm share/automake%%BUILD_VERSION%%/am
+@dirrm share/automake%%BUILD_VERSION%%