Fix pkg-plist.

Submitted by:	Udo Schweigert <udo.schweigert@siemens.com>

8 files changed, 432 insertions, 328 deletions

diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/automake/pkg-plist
+++ b/devel/automake/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake
diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/automake110/pkg-plist
+++ b/devel/automake110/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake
diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/automake15/pkg-plist
+++ b/devel/automake15/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake
diff --git a/devel/automake16/pkg-plist b/devel/automake16/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/automake16/pkg-plist
+++ b/devel/automake16/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake
diff --git a/devel/automake17/pkg-plist b/devel/automake17/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/automake17/pkg-plist
+++ b/devel/automake17/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake
diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/automake18/pkg-plist
+++ b/devel/automake18/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake
diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/automake19/pkg-plist
+++ b/devel/automake19/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index 1e62d5883c1f..dfd228f23618 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -3,78 +3,91 @@ 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/mktime.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/clean-hdr.am
-share/automake/clean-kr.am
-share/automake/clean.am
-share/automake/comp-vars.am
-share/automake/compile.am
+share/automake/compile
 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/depcomp
 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/py-compile
 share/automake/texinfo.tex
-share/automake/texinfos.am
 share/automake/ylwrap
+@dirrm share/automake/am
+@dirrm share/automake/Automake
 @dirrm share/automake