Index: head/devel/autogen/pkg-plist
===================================================================
--- head/devel/autogen/pkg-plist	(revision 374358)
+++ head/devel/autogen/pkg-plist	(revision 374359)
@@ -1,82 +1,81 @@
 bin/autogen
 bin/autoopts-config
 bin/columns
 bin/getdefs
 bin/xml2ag
 include/autoopts/options.h
 include/autoopts/usage-txt.h
 lib/libopts.a
 lib/libopts.so
 lib/libopts.so.25
 lib/libopts.so.25.10.0
 libdata/pkgconfig/autoopts.pc
 share/aclocal/autoopts.m4
 %%DATADIR%%/aginfo.tpl
 %%DATADIR%%/aginfo3.tpl
 %%DATADIR%%/agman-cmd.tpl
 %%DATADIR%%/agman.tlib
 %%DATADIR%%/agman1.tpl
 %%DATADIR%%/agman3.tpl
 %%DATADIR%%/agmdoc-cmd.tpl
 %%DATADIR%%/agpl.lic
 %%DATADIR%%/agtexi-cmd.tpl
 %%DATADIR%%/autoopts.m4
 %%DATADIR%%/bits.tpl
 %%DATADIR%%/cmd-doc.tlib
 %%DATADIR%%/confmacs.tlib
 %%DATADIR%%/conftest.tpl
 %%DATADIR%%/fsm-macro.tlib
 %%DATADIR%%/fsm-trans.tlib
 %%DATADIR%%/fsm.tpl
 %%DATADIR%%/getopt.tpl
 %%DATADIR%%/gpl.lic
 %%DATADIR%%/gplv2.lic
 %%DATADIR%%/lgpl.lic
 %%DATADIR%%/libopts-35.0.10.tar.gz
 %%DATADIR%%/liboptschk.m4
 %%DATADIR%%/man2man
 %%DATADIR%%/man2mdoc
 %%DATADIR%%/man2texi
 %%DATADIR%%/mbsd.lic
 %%DATADIR%%/mdoc2man
 %%DATADIR%%/mdoc2mdoc
 %%DATADIR%%/mdoc2texi
 %%DATADIR%%/optcode.tlib
 %%DATADIR%%/opthead.tlib
 %%DATADIR%%/options.tpl
 %%DATADIR%%/optlib.tlib
 %%DATADIR%%/optmain.tlib
 %%DATADIR%%/rc-sample.tpl
 %%DATADIR%%/stdoptions.def
 %%DATADIR%%/texi2man
 %%DATADIR%%/texi2mdoc
 %%DATADIR%%/texi2texi
 %%DATADIR%%/tpl-config.tlib
 %%DATADIR%%/usage.tlib
 man/man1/autogen.1.gz
 man/man1/autoopts-config.1.gz
 man/man1/columns.1.gz
 man/man1/getdefs.1.gz
 man/man1/xml2ag.1.gz
 man/man3/ao_string_tokenize.3.gz
 man/man3/configFileLoad.3.gz
 man/man3/optionFileLoad.3.gz
 man/man3/optionFindNextValue.3.gz
 man/man3/optionFindValue.3.gz
 man/man3/optionFree.3.gz
 man/man3/optionGetValue.3.gz
 man/man3/optionLoadLine.3.gz
 man/man3/optionNextValue.3.gz
 man/man3/optionOnlyUsage.3.gz
 man/man3/optionProcess.3.gz
 man/man3/optionRestore.3.gz
 man/man3/optionSaveFile.3.gz
 man/man3/optionSaveState.3.gz
 man/man3/optionUnloadNested.3.gz
 man/man3/optionVersion.3.gz
 man/man3/strequate.3.gz
 man/man3/streqvcmp.3.gz
 man/man3/streqvmap.3.gz
 man/man3/strneqvcmp.3.gz
 man/man3/strtransform.3.gz
-@dirrm include/autoopts
Index: head/devel/automake/pkg-plist
===================================================================
--- head/devel/automake/pkg-plist	(revision 374358)
+++ head/devel/automake/pkg-plist	(revision 374359)
@@ -1,122 +1,117 @@
 bin/aclocal-%%BUILD_VERSION%%
 bin/automake-%%BUILD_VERSION%%
 man/man1/aclocal-1.14-1.14.1.gz
 man/man1/aclocal-1.14.1.gz
 man/man1/automake-1.14-1.14.1.gz
 man/man1/automake-1.14.1.gz
 share/aclocal-%%BUILD_VERSION%%/amversion.m4
 share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
 share/aclocal-%%BUILD_VERSION%%/as.m4
 share/aclocal-%%BUILD_VERSION%%/auxdir.m4
 share/aclocal-%%BUILD_VERSION%%/cond.m4
 share/aclocal-%%BUILD_VERSION%%/cond-if.m4
 share/aclocal-%%BUILD_VERSION%%/depend.m4
 share/aclocal-%%BUILD_VERSION%%/depout.m4
 share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
 share/aclocal-%%BUILD_VERSION%%/extra-recurs.m4
 share/aclocal-%%BUILD_VERSION%%/gcj.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%%/missing.m4
 share/aclocal-%%BUILD_VERSION%%/mkdirp.m4
 share/aclocal-%%BUILD_VERSION%%/obsolete.m4
 share/aclocal-%%BUILD_VERSION%%/options.m4
 share/aclocal-%%BUILD_VERSION%%/prog-cc-c-o.m4
 share/aclocal-%%BUILD_VERSION%%/python.m4
 share/aclocal-%%BUILD_VERSION%%/runlog.m4
 share/aclocal-%%BUILD_VERSION%%/sanity.m4
 share/aclocal-%%BUILD_VERSION%%/silent.m4
 share/aclocal-%%BUILD_VERSION%%/strip.m4
 share/aclocal-%%BUILD_VERSION%%/substnot.m4
 share/aclocal-%%BUILD_VERSION%%/tar.m4
 share/aclocal-%%BUILD_VERSION%%/upc.m4
 share/aclocal-%%BUILD_VERSION%%/vala.m4
 share/aclocal-%%BUILD_VERSION%%/internal/ac-config-macro-dirs.m4
 share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
 share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
 share/automake-%%BUILD_VERSION%%/Automake/Condition.pm
 share/automake-%%BUILD_VERSION%%/Automake/Config.pm
 share/automake-%%BUILD_VERSION%%/Automake/Configure_ac.pm
 share/automake-%%BUILD_VERSION%%/Automake/DisjConditions.pm
 share/automake-%%BUILD_VERSION%%/Automake/FileUtils.pm
 share/automake-%%BUILD_VERSION%%/Automake/General.pm
 share/automake-%%BUILD_VERSION%%/Automake/Getopt.pm
 share/automake-%%BUILD_VERSION%%/Automake/Item.pm
 share/automake-%%BUILD_VERSION%%/Automake/ItemDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/Language.pm
 share/automake-%%BUILD_VERSION%%/Automake/Location.pm
 share/automake-%%BUILD_VERSION%%/Automake/Options.pm
 share/automake-%%BUILD_VERSION%%/Automake/Rule.pm
 share/automake-%%BUILD_VERSION%%/Automake/RuleDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/VarDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/Variable.pm
 share/automake-%%BUILD_VERSION%%/Automake/Version.pm
 share/automake-%%BUILD_VERSION%%/Automake/Wrap.pm
 share/automake-%%BUILD_VERSION%%/Automake/XFile.pm
 share/automake-%%BUILD_VERSION%%/COPYING
 share/automake-%%BUILD_VERSION%%/INSTALL
 share/automake-%%BUILD_VERSION%%/am/check.am
 share/automake-%%BUILD_VERSION%%/am/check2.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/inst-vars.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/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/vala.am
 share/automake-%%BUILD_VERSION%%/am/yacc.am
 share/automake-%%BUILD_VERSION%%/ar-lib
 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%%/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%%/tap-driver.pl
 share/automake-%%BUILD_VERSION%%/tap-driver.sh
 share/automake-%%BUILD_VERSION%%/test-driver
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/ylwrap
 @dir share/aclocal
-@dirrm share/aclocal-%%BUILD_VERSION%%/internal
-@dirrm share/aclocal-%%BUILD_VERSION%%
-@dirrm share/automake-%%BUILD_VERSION%%/Automake
-@dirrm share/automake-%%BUILD_VERSION%%/am
-@dirrm share/automake-%%BUILD_VERSION%%
Index: head/devel/automake14/pkg-plist
===================================================================
--- head/devel/automake14/pkg-plist	(revision 374358)
+++ head/devel/automake14/pkg-plist	(revision 374359)
@@ -1,80 +1,78 @@
 bin/aclocal-%%BUILD_VERSION%%
 bin/automake-%%BUILD_VERSION%%
 share/aclocal-%%BUILD_VERSION%%/amversion.m4
 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
 @dir share/aclocal
-@dirrm share/aclocal-%%BUILD_VERSION%%
-@dirrm share/automake-%%BUILD_VERSION%%
Index: head/devel/automoc4/pkg-plist
===================================================================
--- head/devel/automoc4/pkg-plist	(revision 374358)
+++ head/devel/automoc4/pkg-plist	(revision 374359)
@@ -1,5 +1,4 @@
 bin/automoc4
 lib/automoc4/Automoc4Config.cmake
 lib/automoc4/Automoc4Version.cmake
 lib/automoc4/automoc4.files.in
-@dirrmtry lib/automoc4