Rearrange test ports trees a bit

574 files changed, 83 insertions, 0 deletions

diff --git a/test-ports/Makefile b/test-ports/default/Makefile
index b7c176eb..b7c176eb 100644
--- a/test-ports/Makefile
+++ b/test-ports/default/Makefile
diff --git a/test-ports/Mk/Scripts/actual-package-depends.sh b/test-ports/default/Mk/Scripts/actual-package-depends.sh
index d1ff5b29..d1ff5b29 100644
--- a/test-ports/Mk/Scripts/actual-package-depends.sh
+++ b/test-ports/default/Mk/Scripts/actual-package-depends.sh
diff --git a/test-ports/Mk/Scripts/cargo-crates.awk b/test-ports/default/Mk/Scripts/cargo-crates.awk
index 0ee85aaa..0ee85aaa 100644
--- a/test-ports/Mk/Scripts/cargo-crates.awk
+++ b/test-ports/default/Mk/Scripts/cargo-crates.awk
diff --git a/test-ports/Mk/Scripts/check-desktop-entries.sh b/test-ports/default/Mk/Scripts/check-desktop-entries.sh
index 4b02f2b1..4b02f2b1 100644
--- a/test-ports/Mk/Scripts/check-desktop-entries.sh
+++ b/test-ports/default/Mk/Scripts/check-desktop-entries.sh
diff --git a/test-ports/Mk/Scripts/check-stagedir.sh b/test-ports/default/Mk/Scripts/check-stagedir.sh
index a5f111bd..a5f111bd 100644
--- a/test-ports/Mk/Scripts/check-stagedir.sh
+++ b/test-ports/default/Mk/Scripts/check-stagedir.sh
diff --git a/test-ports/Mk/Scripts/check-vulnerable.sh b/test-ports/default/Mk/Scripts/check-vulnerable.sh
index a3e4fdaa..a3e4fdaa 100644
--- a/test-ports/Mk/Scripts/check-vulnerable.sh
+++ b/test-ports/default/Mk/Scripts/check-vulnerable.sh
diff --git a/test-ports/Mk/Scripts/check_leftovers.sh b/test-ports/default/Mk/Scripts/check_leftovers.sh
index 42ffa9eb..42ffa9eb 100644
--- a/test-ports/Mk/Scripts/check_leftovers.sh
+++ b/test-ports/default/Mk/Scripts/check_leftovers.sh
diff --git a/test-ports/Mk/Scripts/checksum.sh b/test-ports/default/Mk/Scripts/checksum.sh
index 9b859b0f..9b859b0f 100644
--- a/test-ports/Mk/Scripts/checksum.sh
+++ b/test-ports/default/Mk/Scripts/checksum.sh
diff --git a/test-ports/Mk/Scripts/create-manifest.sh b/test-ports/default/Mk/Scripts/create-manifest.sh
index 3aa7c380..3aa7c380 100644
--- a/test-ports/Mk/Scripts/create-manifest.sh
+++ b/test-ports/default/Mk/Scripts/create-manifest.sh
diff --git a/test-ports/Mk/Scripts/depends-list.sh b/test-ports/default/Mk/Scripts/depends-list.sh
index 60ea8557..60ea8557 100644
--- a/test-ports/Mk/Scripts/depends-list.sh
+++ b/test-ports/default/Mk/Scripts/depends-list.sh
diff --git a/test-ports/Mk/Scripts/desktop-categories.sh b/test-ports/default/Mk/Scripts/desktop-categories.sh
index 0c4e6ba2..0c4e6ba2 100644
--- a/test-ports/Mk/Scripts/desktop-categories.sh
+++ b/test-ports/default/Mk/Scripts/desktop-categories.sh
diff --git a/test-ports/Mk/Scripts/dialog4ports.sh b/test-ports/default/Mk/Scripts/dialog4ports.sh
index 56722bb8..56722bb8 100644
--- a/test-ports/Mk/Scripts/dialog4ports.sh
+++ b/test-ports/default/Mk/Scripts/dialog4ports.sh
diff --git a/test-ports/Mk/Scripts/do-depends.sh b/test-ports/default/Mk/Scripts/do-depends.sh
index 10dd50cb..10dd50cb 100644
--- a/test-ports/Mk/Scripts/do-depends.sh
+++ b/test-ports/default/Mk/Scripts/do-depends.sh
diff --git a/test-ports/Mk/Scripts/do-fetch.sh b/test-ports/default/Mk/Scripts/do-fetch.sh
index 11dbd2b8..11dbd2b8 100644
--- a/test-ports/Mk/Scripts/do-fetch.sh
+++ b/test-ports/default/Mk/Scripts/do-fetch.sh
diff --git a/test-ports/Mk/Scripts/do-patch.sh b/test-ports/default/Mk/Scripts/do-patch.sh
index 0e6e3ce4..0e6e3ce4 100644
--- a/test-ports/Mk/Scripts/do-patch.sh
+++ b/test-ports/default/Mk/Scripts/do-patch.sh
diff --git a/test-ports/Mk/Scripts/do-users-groups.sh b/test-ports/default/Mk/Scripts/do-users-groups.sh
index 5f2ab1fb..5f2ab1fb 100644
--- a/test-ports/Mk/Scripts/do-users-groups.sh
+++ b/test-ports/default/Mk/Scripts/do-users-groups.sh
diff --git a/test-ports/Mk/Scripts/find-lib.sh b/test-ports/default/Mk/Scripts/find-lib.sh
index 62c604ed..62c604ed 100644
--- a/test-ports/Mk/Scripts/find-lib.sh
+++ b/test-ports/default/Mk/Scripts/find-lib.sh
diff --git a/test-ports/Mk/Scripts/functions.sh b/test-ports/default/Mk/Scripts/functions.sh
index 2acefe9e..2acefe9e 100644
--- a/test-ports/Mk/Scripts/functions.sh
+++ b/test-ports/default/Mk/Scripts/functions.sh
diff --git a/test-ports/Mk/Scripts/generate-symbols.sh b/test-ports/default/Mk/Scripts/generate-symbols.sh
index 05329e61..05329e61 100644
--- a/test-ports/Mk/Scripts/generate-symbols.sh
+++ b/test-ports/default/Mk/Scripts/generate-symbols.sh
diff --git a/test-ports/Mk/Scripts/install-desktop-entries.sh b/test-ports/default/Mk/Scripts/install-desktop-entries.sh
index c46850db..c46850db 100644
--- a/test-ports/Mk/Scripts/install-desktop-entries.sh
+++ b/test-ports/default/Mk/Scripts/install-desktop-entries.sh
diff --git a/test-ports/Mk/Scripts/makesum.sh b/test-ports/default/Mk/Scripts/makesum.sh
index 5531754c..5531754c 100644
--- a/test-ports/Mk/Scripts/makesum.sh
+++ b/test-ports/default/Mk/Scripts/makesum.sh
diff --git a/test-ports/Mk/Scripts/plist_sub_sed_sort.sh b/test-ports/default/Mk/Scripts/plist_sub_sed_sort.sh
index 1daf0884..1daf0884 100644
--- a/test-ports/Mk/Scripts/plist_sub_sed_sort.sh
+++ b/test-ports/default/Mk/Scripts/plist_sub_sed_sort.sh
diff --git a/test-ports/Mk/Scripts/ports_env.sh b/test-ports/default/Mk/Scripts/ports_env.sh
index 495b4c8d..495b4c8d 100644
--- a/test-ports/Mk/Scripts/ports_env.sh
+++ b/test-ports/default/Mk/Scripts/ports_env.sh
diff --git a/test-ports/Mk/Scripts/qa.sh b/test-ports/default/Mk/Scripts/qa.sh
index 716a6a0f..716a6a0f 100644
--- a/test-ports/Mk/Scripts/qa.sh
+++ b/test-ports/default/Mk/Scripts/qa.sh
diff --git a/test-ports/Mk/Scripts/security-check.awk b/test-ports/default/Mk/Scripts/security-check.awk
index 4a661bbc..4a661bbc 100644
--- a/test-ports/Mk/Scripts/security-check.awk
+++ b/test-ports/default/Mk/Scripts/security-check.awk
diff --git a/test-ports/Mk/Scripts/smart_makepatch.sh b/test-ports/default/Mk/Scripts/smart_makepatch.sh
index df91c46a..df91c46a 100644
--- a/test-ports/Mk/Scripts/smart_makepatch.sh
+++ b/test-ports/default/Mk/Scripts/smart_makepatch.sh
diff --git a/test-ports/Mk/Uses/7z.mk b/test-ports/default/Mk/Uses/7z.mk
index 1177b65b..1177b65b 100644
--- a/test-ports/Mk/Uses/7z.mk
+++ b/test-ports/default/Mk/Uses/7z.mk
diff --git a/test-ports/Mk/Uses/ada.mk b/test-ports/default/Mk/Uses/ada.mk
index d5ef869b..d5ef869b 100644
--- a/test-ports/Mk/Uses/ada.mk
+++ b/test-ports/default/Mk/Uses/ada.mk
diff --git a/test-ports/Mk/Uses/alias.mk b/test-ports/default/Mk/Uses/alias.mk
index 65579cec..65579cec 100644
--- a/test-ports/Mk/Uses/alias.mk
+++ b/test-ports/default/Mk/Uses/alias.mk
diff --git a/test-ports/Mk/Uses/apache.mk b/test-ports/default/Mk/Uses/apache.mk
index 2a0ab080..2a0ab080 100644
--- a/test-ports/Mk/Uses/apache.mk
+++ b/test-ports/default/Mk/Uses/apache.mk
diff --git a/test-ports/Mk/Uses/autoreconf.mk b/test-ports/default/Mk/Uses/autoreconf.mk
index af2fe73b..af2fe73b 100644
--- a/test-ports/Mk/Uses/autoreconf.mk
+++ b/test-ports/default/Mk/Uses/autoreconf.mk
diff --git a/test-ports/Mk/Uses/azurepy.mk b/test-ports/default/Mk/Uses/azurepy.mk
index 7e337057..7e337057 100644
--- a/test-ports/Mk/Uses/azurepy.mk
+++ b/test-ports/default/Mk/Uses/azurepy.mk
diff --git a/test-ports/Mk/Uses/bdb.mk b/test-ports/default/Mk/Uses/bdb.mk
index 56a71de7..56a71de7 100644
--- a/test-ports/Mk/Uses/bdb.mk
+++ b/test-ports/default/Mk/Uses/bdb.mk
diff --git a/test-ports/Mk/Uses/bison.mk b/test-ports/default/Mk/Uses/bison.mk
index 72532457..72532457 100644
--- a/test-ports/Mk/Uses/bison.mk
+++ b/test-ports/default/Mk/Uses/bison.mk
diff --git a/test-ports/Mk/Uses/blaslapack.mk b/test-ports/default/Mk/Uses/blaslapack.mk
index 46b8e0d1..46b8e0d1 100644
--- a/test-ports/Mk/Uses/blaslapack.mk
+++ b/test-ports/default/Mk/Uses/blaslapack.mk
diff --git a/test-ports/Mk/Uses/cargo.mk b/test-ports/default/Mk/Uses/cargo.mk
index 43dc9333..43dc9333 100644
--- a/test-ports/Mk/Uses/cargo.mk
+++ b/test-ports/default/Mk/Uses/cargo.mk
diff --git a/test-ports/Mk/Uses/charsetfix.mk b/test-ports/default/Mk/Uses/charsetfix.mk
index a844b4e9..a844b4e9 100644
--- a/test-ports/Mk/Uses/charsetfix.mk
+++ b/test-ports/default/Mk/Uses/charsetfix.mk
diff --git a/test-ports/Mk/Uses/cmake.mk b/test-ports/default/Mk/Uses/cmake.mk
index e85b0ccd..e85b0ccd 100644
--- a/test-ports/Mk/Uses/cmake.mk
+++ b/test-ports/default/Mk/Uses/cmake.mk
diff --git a/test-ports/Mk/Uses/compiler.mk b/test-ports/default/Mk/Uses/compiler.mk
index 5f4a0df4..5f4a0df4 100644
--- a/test-ports/Mk/Uses/compiler.mk
+++ b/test-ports/default/Mk/Uses/compiler.mk
diff --git a/test-ports/Mk/Uses/corosync.mk b/test-ports/default/Mk/Uses/corosync.mk
index a6a57366..a6a57366 100644
--- a/test-ports/Mk/Uses/corosync.mk
+++ b/test-ports/default/Mk/Uses/corosync.mk
diff --git a/test-ports/Mk/Uses/cpe.mk b/test-ports/default/Mk/Uses/cpe.mk
index 071bce49..071bce49 100644
--- a/test-ports/Mk/Uses/cpe.mk
+++ b/test-ports/default/Mk/Uses/cpe.mk
diff --git a/test-ports/Mk/Uses/cran.mk b/test-ports/default/Mk/Uses/cran.mk
index 8353732b..8353732b 100644
--- a/test-ports/Mk/Uses/cran.mk
+++ b/test-ports/default/Mk/Uses/cran.mk
diff --git a/test-ports/Mk/Uses/desktop-file-utils.mk b/test-ports/default/Mk/Uses/desktop-file-utils.mk
index 40a1f866..40a1f866 100644
--- a/test-ports/Mk/Uses/desktop-file-utils.mk
+++ b/test-ports/default/Mk/Uses/desktop-file-utils.mk
diff --git a/test-ports/Mk/Uses/desthack.mk b/test-ports/default/Mk/Uses/desthack.mk
index da137c5f..da137c5f 100644
--- a/test-ports/Mk/Uses/desthack.mk
+++ b/test-ports/default/Mk/Uses/desthack.mk
diff --git a/test-ports/Mk/Uses/display.mk b/test-ports/default/Mk/Uses/display.mk
index af11c4f7..af11c4f7 100644
--- a/test-ports/Mk/Uses/display.mk
+++ b/test-ports/default/Mk/Uses/display.mk
diff --git a/test-ports/Mk/Uses/dos2unix.mk b/test-ports/default/Mk/Uses/dos2unix.mk
index 87ba85ce..87ba85ce 100644
--- a/test-ports/Mk/Uses/dos2unix.mk
+++ b/test-ports/default/Mk/Uses/dos2unix.mk
diff --git a/test-ports/Mk/Uses/drupal.mk b/test-ports/default/Mk/Uses/drupal.mk
index 22504f10..22504f10 100644
--- a/test-ports/Mk/Uses/drupal.mk
+++ b/test-ports/default/Mk/Uses/drupal.mk
diff --git a/test-ports/Mk/Uses/eigen.mk b/test-ports/default/Mk/Uses/eigen.mk
index afcd902e..afcd902e 100644
--- a/test-ports/Mk/Uses/eigen.mk
+++ b/test-ports/default/Mk/Uses/eigen.mk
diff --git a/test-ports/Mk/Uses/elixir.mk b/test-ports/default/Mk/Uses/elixir.mk
index c0ef1eb7..c0ef1eb7 100644
--- a/test-ports/Mk/Uses/elixir.mk
+++ b/test-ports/default/Mk/Uses/elixir.mk
diff --git a/test-ports/Mk/Uses/emacs.mk b/test-ports/default/Mk/Uses/emacs.mk
index c8165c58..c8165c58 100644
--- a/test-ports/Mk/Uses/emacs.mk
+++ b/test-ports/default/Mk/Uses/emacs.mk
diff --git a/test-ports/Mk/Uses/erlang.mk b/test-ports/default/Mk/Uses/erlang.mk
index e1749919..e1749919 100644
--- a/test-ports/Mk/Uses/erlang.mk
+++ b/test-ports/default/Mk/Uses/erlang.mk
diff --git a/test-ports/Mk/Uses/fakeroot.mk b/test-ports/default/Mk/Uses/fakeroot.mk
index e6f7acd9..e6f7acd9 100644
--- a/test-ports/Mk/Uses/fakeroot.mk
+++ b/test-ports/default/Mk/Uses/fakeroot.mk
diff --git a/test-ports/Mk/Uses/fam.mk b/test-ports/default/Mk/Uses/fam.mk
index 86ad49cb..86ad49cb 100644
--- a/test-ports/Mk/Uses/fam.mk
+++ b/test-ports/default/Mk/Uses/fam.mk
diff --git a/test-ports/Mk/Uses/firebird.mk b/test-ports/default/Mk/Uses/firebird.mk
index 10eba396..10eba396 100644
--- a/test-ports/Mk/Uses/firebird.mk
+++ b/test-ports/default/Mk/Uses/firebird.mk
diff --git a/test-ports/Mk/Uses/fonts.mk b/test-ports/default/Mk/Uses/fonts.mk
index 1ee9500b..1ee9500b 100644
--- a/test-ports/Mk/Uses/fonts.mk
+++ b/test-ports/default/Mk/Uses/fonts.mk
diff --git a/test-ports/Mk/Uses/fortran.mk b/test-ports/default/Mk/Uses/fortran.mk
index 06c80057..06c80057 100644
--- a/test-ports/Mk/Uses/fortran.mk
+++ b/test-ports/default/Mk/Uses/fortran.mk
diff --git a/test-ports/Mk/Uses/fpc.mk b/test-ports/default/Mk/Uses/fpc.mk
index 9ffb4f84..9ffb4f84 100644
--- a/test-ports/Mk/Uses/fpc.mk
+++ b/test-ports/default/Mk/Uses/fpc.mk
diff --git a/test-ports/Mk/Uses/fuse.mk b/test-ports/default/Mk/Uses/fuse.mk
index 18fb32ba..18fb32ba 100644
--- a/test-ports/Mk/Uses/fuse.mk
+++ b/test-ports/default/Mk/Uses/fuse.mk
diff --git a/test-ports/Mk/Uses/gecko.mk b/test-ports/default/Mk/Uses/gecko.mk
index 5be7abd7..5be7abd7 100644
--- a/test-ports/Mk/Uses/gecko.mk
+++ b/test-ports/default/Mk/Uses/gecko.mk
diff --git a/test-ports/Mk/Uses/gem.mk b/test-ports/default/Mk/Uses/gem.mk
index c0c48436..c0c48436 100644
--- a/test-ports/Mk/Uses/gem.mk
+++ b/test-ports/default/Mk/Uses/gem.mk
diff --git a/test-ports/Mk/Uses/gettext-runtime.mk b/test-ports/default/Mk/Uses/gettext-runtime.mk
index 6a9624fd..6a9624fd 100644
--- a/test-ports/Mk/Uses/gettext-runtime.mk
+++ b/test-ports/default/Mk/Uses/gettext-runtime.mk
diff --git a/test-ports/Mk/Uses/gettext-tools.mk b/test-ports/default/Mk/Uses/gettext-tools.mk
index ce7e8bd7..ce7e8bd7 100644
--- a/test-ports/Mk/Uses/gettext-tools.mk
+++ b/test-ports/default/Mk/Uses/gettext-tools.mk
diff --git a/test-ports/Mk/Uses/gettext.mk b/test-ports/default/Mk/Uses/gettext.mk
index 91e5b4a5..91e5b4a5 100644
--- a/test-ports/Mk/Uses/gettext.mk
+++ b/test-ports/default/Mk/Uses/gettext.mk
diff --git a/test-ports/Mk/Uses/ghostscript.mk b/test-ports/default/Mk/Uses/ghostscript.mk
index 64476929..64476929 100644
--- a/test-ports/Mk/Uses/ghostscript.mk
+++ b/test-ports/default/Mk/Uses/ghostscript.mk
diff --git a/test-ports/Mk/Uses/gl.mk b/test-ports/default/Mk/Uses/gl.mk
index 86c3fcbb..86c3fcbb 100644
--- a/test-ports/Mk/Uses/gl.mk
+++ b/test-ports/default/Mk/Uses/gl.mk
diff --git a/test-ports/Mk/Uses/gmake.mk b/test-ports/default/Mk/Uses/gmake.mk
index e48da328..e48da328 100644
--- a/test-ports/Mk/Uses/gmake.mk
+++ b/test-ports/default/Mk/Uses/gmake.mk
diff --git a/test-ports/Mk/Uses/gnome.mk b/test-ports/default/Mk/Uses/gnome.mk
index 3a1424b7..3a1424b7 100644
--- a/test-ports/Mk/Uses/gnome.mk
+++ b/test-ports/default/Mk/Uses/gnome.mk
diff --git a/test-ports/Mk/Uses/gnustep.mk b/test-ports/default/Mk/Uses/gnustep.mk
index 4f9b9a0a..4f9b9a0a 100644
--- a/test-ports/Mk/Uses/gnustep.mk
+++ b/test-ports/default/Mk/Uses/gnustep.mk
diff --git a/test-ports/Mk/Uses/go.mk b/test-ports/default/Mk/Uses/go.mk
index 5756c219..5756c219 100644
--- a/test-ports/Mk/Uses/go.mk
+++ b/test-ports/default/Mk/Uses/go.mk
diff --git a/test-ports/Mk/Uses/gperf.mk b/test-ports/default/Mk/Uses/gperf.mk
index 0ff5ded3..0ff5ded3 100644
--- a/test-ports/Mk/Uses/gperf.mk
+++ b/test-ports/default/Mk/Uses/gperf.mk
diff --git a/test-ports/Mk/Uses/grantlee.mk b/test-ports/default/Mk/Uses/grantlee.mk
index e83b4279..e83b4279 100644
--- a/test-ports/Mk/Uses/grantlee.mk
+++ b/test-ports/default/Mk/Uses/grantlee.mk
diff --git a/test-ports/Mk/Uses/groff.mk b/test-ports/default/Mk/Uses/groff.mk
index c35b6c1d..c35b6c1d 100644
--- a/test-ports/Mk/Uses/groff.mk
+++ b/test-ports/default/Mk/Uses/groff.mk
diff --git a/test-ports/Mk/Uses/gssapi.mk b/test-ports/default/Mk/Uses/gssapi.mk
index 30e427c2..30e427c2 100644
--- a/test-ports/Mk/Uses/gssapi.mk
+++ b/test-ports/default/Mk/Uses/gssapi.mk
diff --git a/test-ports/Mk/Uses/horde.mk b/test-ports/default/Mk/Uses/horde.mk
index 6157f4d1..6157f4d1 100644
--- a/test-ports/Mk/Uses/horde.mk
+++ b/test-ports/default/Mk/Uses/horde.mk
diff --git a/test-ports/Mk/Uses/iconv.mk b/test-ports/default/Mk/Uses/iconv.mk
index 137bb442..137bb442 100644
--- a/test-ports/Mk/Uses/iconv.mk
+++ b/test-ports/default/Mk/Uses/iconv.mk
diff --git a/test-ports/Mk/Uses/imake.mk b/test-ports/default/Mk/Uses/imake.mk
index d07359cf..d07359cf 100644
--- a/test-ports/Mk/Uses/imake.mk
+++ b/test-ports/default/Mk/Uses/imake.mk
diff --git a/test-ports/Mk/Uses/jpeg.mk b/test-ports/default/Mk/Uses/jpeg.mk
index 5ed2d2ea..5ed2d2ea 100644
--- a/test-ports/Mk/Uses/jpeg.mk
+++ b/test-ports/default/Mk/Uses/jpeg.mk
diff --git a/test-ports/Mk/Uses/kde.mk b/test-ports/default/Mk/Uses/kde.mk
index 25be628a..25be628a 100644
--- a/test-ports/Mk/Uses/kde.mk
+++ b/test-ports/default/Mk/Uses/kde.mk
diff --git a/test-ports/Mk/Uses/kmod.mk b/test-ports/default/Mk/Uses/kmod.mk
index 3fbc0d96..3fbc0d96 100644
--- a/test-ports/Mk/Uses/kmod.mk
+++ b/test-ports/default/Mk/Uses/kmod.mk
diff --git a/test-ports/Mk/Uses/lazarus.mk b/test-ports/default/Mk/Uses/lazarus.mk
index 45a85487..45a85487 100644
--- a/test-ports/Mk/Uses/lazarus.mk
+++ b/test-ports/default/Mk/Uses/lazarus.mk
diff --git a/test-ports/Mk/Uses/lha.mk b/test-ports/default/Mk/Uses/lha.mk
index 87851feb..87851feb 100644
--- a/test-ports/Mk/Uses/lha.mk
+++ b/test-ports/default/Mk/Uses/lha.mk
diff --git a/test-ports/Mk/Uses/libarchive.mk b/test-ports/default/Mk/Uses/libarchive.mk
index a06b848c..a06b848c 100644
--- a/test-ports/Mk/Uses/libarchive.mk
+++ b/test-ports/default/Mk/Uses/libarchive.mk
diff --git a/test-ports/Mk/Uses/libedit.mk b/test-ports/default/Mk/Uses/libedit.mk
index f6db8196..f6db8196 100644
--- a/test-ports/Mk/Uses/libedit.mk
+++ b/test-ports/default/Mk/Uses/libedit.mk
diff --git a/test-ports/Mk/Uses/libtool.mk b/test-ports/default/Mk/Uses/libtool.mk
index 2cf0af08..2cf0af08 100644
--- a/test-ports/Mk/Uses/libtool.mk
+++ b/test-ports/default/Mk/Uses/libtool.mk
diff --git a/test-ports/Mk/Uses/linux.mk b/test-ports/default/Mk/Uses/linux.mk
index e1535faa..e1535faa 100644
--- a/test-ports/Mk/Uses/linux.mk
+++ b/test-ports/default/Mk/Uses/linux.mk
diff --git a/test-ports/Mk/Uses/localbase.mk b/test-ports/default/Mk/Uses/localbase.mk
index e994da09..e994da09 100644
--- a/test-ports/Mk/Uses/localbase.mk
+++ b/test-ports/default/Mk/Uses/localbase.mk
diff --git a/test-ports/Mk/Uses/lua.mk b/test-ports/default/Mk/Uses/lua.mk
index 8fb0317e..8fb0317e 100644
--- a/test-ports/Mk/Uses/lua.mk
+++ b/test-ports/default/Mk/Uses/lua.mk
diff --git a/test-ports/Mk/Uses/lxqt.mk b/test-ports/default/Mk/Uses/lxqt.mk
index 181bf3b3..181bf3b3 100644
--- a/test-ports/Mk/Uses/lxqt.mk
+++ b/test-ports/default/Mk/Uses/lxqt.mk
diff --git a/test-ports/Mk/Uses/makeinfo.mk b/test-ports/default/Mk/Uses/makeinfo.mk
index 0a053cfb..0a053cfb 100644
--- a/test-ports/Mk/Uses/makeinfo.mk
+++ b/test-ports/default/Mk/Uses/makeinfo.mk
diff --git a/test-ports/Mk/Uses/makeself.mk b/test-ports/default/Mk/Uses/makeself.mk
index a0d45580..a0d45580 100644
--- a/test-ports/Mk/Uses/makeself.mk
+++ b/test-ports/default/Mk/Uses/makeself.mk
diff --git a/test-ports/Mk/Uses/mate.mk b/test-ports/default/Mk/Uses/mate.mk
index 80dddb5d..80dddb5d 100644
--- a/test-ports/Mk/Uses/mate.mk
+++ b/test-ports/default/Mk/Uses/mate.mk
diff --git a/test-ports/Mk/Uses/meson.mk b/test-ports/default/Mk/Uses/meson.mk
index 27a0b19a..27a0b19a 100644
--- a/test-ports/Mk/Uses/meson.mk
+++ b/test-ports/default/Mk/Uses/meson.mk
diff --git a/test-ports/Mk/Uses/metaport.mk b/test-ports/default/Mk/Uses/metaport.mk
index 7ee8a21f..7ee8a21f 100644
--- a/test-ports/Mk/Uses/metaport.mk
+++ b/test-ports/default/Mk/Uses/metaport.mk
diff --git a/test-ports/Mk/Uses/mono.mk b/test-ports/default/Mk/Uses/mono.mk
index a38b5876..a38b5876 100644
--- a/test-ports/Mk/Uses/mono.mk
+++ b/test-ports/default/Mk/Uses/mono.mk
diff --git a/test-ports/Mk/Uses/motif.mk b/test-ports/default/Mk/Uses/motif.mk
index 4dabadcb..4dabadcb 100644
--- a/test-ports/Mk/Uses/motif.mk
+++ b/test-ports/default/Mk/Uses/motif.mk
diff --git a/test-ports/Mk/Uses/mysql.mk b/test-ports/default/Mk/Uses/mysql.mk
index ea5c7a66..ea5c7a66 100644
--- a/test-ports/Mk/Uses/mysql.mk
+++ b/test-ports/default/Mk/Uses/mysql.mk
diff --git a/test-ports/Mk/Uses/ncurses.mk b/test-ports/default/Mk/Uses/ncurses.mk
index 4aa35747..4aa35747 100644
--- a/test-ports/Mk/Uses/ncurses.mk
+++ b/test-ports/default/Mk/Uses/ncurses.mk
diff --git a/test-ports/Mk/Uses/ninja.mk b/test-ports/default/Mk/Uses/ninja.mk
index eb002e1d..eb002e1d 100644
--- a/test-ports/Mk/Uses/ninja.mk
+++ b/test-ports/default/Mk/Uses/ninja.mk
diff --git a/test-ports/Mk/Uses/objc.mk b/test-ports/default/Mk/Uses/objc.mk
index 69194ae6..69194ae6 100644
--- a/test-ports/Mk/Uses/objc.mk
+++ b/test-ports/default/Mk/Uses/objc.mk
diff --git a/test-ports/Mk/Uses/openal.mk b/test-ports/default/Mk/Uses/openal.mk
index ae2000ef..ae2000ef 100644
--- a/test-ports/Mk/Uses/openal.mk
+++ b/test-ports/default/Mk/Uses/openal.mk
diff --git a/test-ports/Mk/Uses/pathfix.mk b/test-ports/default/Mk/Uses/pathfix.mk
index baf2595a..baf2595a 100644
--- a/test-ports/Mk/Uses/pathfix.mk
+++ b/test-ports/default/Mk/Uses/pathfix.mk
diff --git a/test-ports/Mk/Uses/pear.mk b/test-ports/default/Mk/Uses/pear.mk
index 55697b99..55697b99 100644
--- a/test-ports/Mk/Uses/pear.mk
+++ b/test-ports/default/Mk/Uses/pear.mk
diff --git a/test-ports/Mk/Uses/perl5.mk b/test-ports/default/Mk/Uses/perl5.mk
index 1803fbfe..1803fbfe 100644
--- a/test-ports/Mk/Uses/perl5.mk
+++ b/test-ports/default/Mk/Uses/perl5.mk
diff --git a/test-ports/Mk/Uses/pgsql.mk b/test-ports/default/Mk/Uses/pgsql.mk
index 708ce514..708ce514 100644
--- a/test-ports/Mk/Uses/pgsql.mk
+++ b/test-ports/default/Mk/Uses/pgsql.mk
diff --git a/test-ports/Mk/Uses/php.mk b/test-ports/default/Mk/Uses/php.mk
index 292b7615..292b7615 100644
--- a/test-ports/Mk/Uses/php.mk
+++ b/test-ports/default/Mk/Uses/php.mk
diff --git a/test-ports/Mk/Uses/pkgconfig.mk b/test-ports/default/Mk/Uses/pkgconfig.mk
index 6a240921..6a240921 100644
--- a/test-ports/Mk/Uses/pkgconfig.mk
+++ b/test-ports/default/Mk/Uses/pkgconfig.mk
diff --git a/test-ports/Mk/Uses/pure.mk b/test-ports/default/Mk/Uses/pure.mk
index d4f2250b..d4f2250b 100644
--- a/test-ports/Mk/Uses/pure.mk
+++ b/test-ports/default/Mk/Uses/pure.mk
diff --git a/test-ports/Mk/Uses/pyqt.mk b/test-ports/default/Mk/Uses/pyqt.mk
index b80e4802..b80e4802 100644
--- a/test-ports/Mk/Uses/pyqt.mk
+++ b/test-ports/default/Mk/Uses/pyqt.mk
diff --git a/test-ports/Mk/Uses/python.mk b/test-ports/default/Mk/Uses/python.mk
index 1982ad4d..1982ad4d 100644
--- a/test-ports/Mk/Uses/python.mk
+++ b/test-ports/default/Mk/Uses/python.mk
diff --git a/test-ports/Mk/Uses/qmail.mk b/test-ports/default/Mk/Uses/qmail.mk
index 2b5ec539..2b5ec539 100644
--- a/test-ports/Mk/Uses/qmail.mk
+++ b/test-ports/default/Mk/Uses/qmail.mk
diff --git a/test-ports/Mk/Uses/qmake.mk b/test-ports/default/Mk/Uses/qmake.mk
index e495bb08..e495bb08 100644
--- a/test-ports/Mk/Uses/qmake.mk
+++ b/test-ports/default/Mk/Uses/qmake.mk
diff --git a/test-ports/Mk/Uses/qt-dist.mk b/test-ports/default/Mk/Uses/qt-dist.mk
index fcc5b5f0..fcc5b5f0 100644
--- a/test-ports/Mk/Uses/qt-dist.mk
+++ b/test-ports/default/Mk/Uses/qt-dist.mk
diff --git a/test-ports/Mk/Uses/qt.mk b/test-ports/default/Mk/Uses/qt.mk
index f8572544..f8572544 100644
--- a/test-ports/Mk/Uses/qt.mk
+++ b/test-ports/default/Mk/Uses/qt.mk
diff --git a/test-ports/Mk/Uses/readline.mk b/test-ports/default/Mk/Uses/readline.mk
index 372f408c..372f408c 100644
--- a/test-ports/Mk/Uses/readline.mk
+++ b/test-ports/default/Mk/Uses/readline.mk
diff --git a/test-ports/Mk/Uses/samba.mk b/test-ports/default/Mk/Uses/samba.mk
index 19d8ec1f..19d8ec1f 100644
--- a/test-ports/Mk/Uses/samba.mk
+++ b/test-ports/default/Mk/Uses/samba.mk
diff --git a/test-ports/Mk/Uses/scons.mk b/test-ports/default/Mk/Uses/scons.mk
index 2fdad610..2fdad610 100644
--- a/test-ports/Mk/Uses/scons.mk
+++ b/test-ports/default/Mk/Uses/scons.mk
diff --git a/test-ports/Mk/Uses/sdl.mk b/test-ports/default/Mk/Uses/sdl.mk
index 3ac11940..3ac11940 100644
--- a/test-ports/Mk/Uses/sdl.mk
+++ b/test-ports/default/Mk/Uses/sdl.mk
diff --git a/test-ports/Mk/Uses/shared-mime-info.mk b/test-ports/default/Mk/Uses/shared-mime-info.mk
index 61718a67..61718a67 100644
--- a/test-ports/Mk/Uses/shared-mime-info.mk
+++ b/test-ports/default/Mk/Uses/shared-mime-info.mk
diff --git a/test-ports/Mk/Uses/shebangfix.mk b/test-ports/default/Mk/Uses/shebangfix.mk
index 1f16d234..1f16d234 100644
--- a/test-ports/Mk/Uses/shebangfix.mk
+++ b/test-ports/default/Mk/Uses/shebangfix.mk
diff --git a/test-ports/Mk/Uses/sqlite.mk b/test-ports/default/Mk/Uses/sqlite.mk
index d4e047e6..d4e047e6 100644
--- a/test-ports/Mk/Uses/sqlite.mk
+++ b/test-ports/default/Mk/Uses/sqlite.mk
diff --git a/test-ports/Mk/Uses/ssl.mk b/test-ports/default/Mk/Uses/ssl.mk
index 4dba5e9a..4dba5e9a 100644
--- a/test-ports/Mk/Uses/ssl.mk
+++ b/test-ports/default/Mk/Uses/ssl.mk
diff --git a/test-ports/Mk/Uses/tar.mk b/test-ports/default/Mk/Uses/tar.mk
index fc797192..fc797192 100644
--- a/test-ports/Mk/Uses/tar.mk
+++ b/test-ports/default/Mk/Uses/tar.mk
diff --git a/test-ports/Mk/Uses/tcl.mk b/test-ports/default/Mk/Uses/tcl.mk
index e85cfcbc..e85cfcbc 100644
--- a/test-ports/Mk/Uses/tcl.mk
+++ b/test-ports/default/Mk/Uses/tcl.mk
diff --git a/test-ports/Mk/Uses/terminfo.mk b/test-ports/default/Mk/Uses/terminfo.mk
index 82840acd..82840acd 100644
--- a/test-ports/Mk/Uses/terminfo.mk
+++ b/test-ports/default/Mk/Uses/terminfo.mk
diff --git a/test-ports/Mk/Uses/tk.mk b/test-ports/default/Mk/Uses/tk.mk
index af1dc1f9..af1dc1f9 100644
--- a/test-ports/Mk/Uses/tk.mk
+++ b/test-ports/default/Mk/Uses/tk.mk
diff --git a/test-ports/Mk/Uses/uidfix.mk b/test-ports/default/Mk/Uses/uidfix.mk
index 6708b33c..6708b33c 100644
--- a/test-ports/Mk/Uses/uidfix.mk
+++ b/test-ports/default/Mk/Uses/uidfix.mk
diff --git a/test-ports/Mk/Uses/uniquefiles.mk b/test-ports/default/Mk/Uses/uniquefiles.mk
index 39cbb56e..39cbb56e 100644
--- a/test-ports/Mk/Uses/uniquefiles.mk
+++ b/test-ports/default/Mk/Uses/uniquefiles.mk
diff --git a/test-ports/Mk/Uses/varnish.mk b/test-ports/default/Mk/Uses/varnish.mk
index d42131bb..d42131bb 100644
--- a/test-ports/Mk/Uses/varnish.mk
+++ b/test-ports/default/Mk/Uses/varnish.mk
diff --git a/test-ports/Mk/Uses/waf.mk b/test-ports/default/Mk/Uses/waf.mk
index 723c7bc2..723c7bc2 100644
--- a/test-ports/Mk/Uses/waf.mk
+++ b/test-ports/default/Mk/Uses/waf.mk
diff --git a/test-ports/Mk/Uses/webplugin.mk b/test-ports/default/Mk/Uses/webplugin.mk
index c0fd7e4a..c0fd7e4a 100644
--- a/test-ports/Mk/Uses/webplugin.mk
+++ b/test-ports/default/Mk/Uses/webplugin.mk
diff --git a/test-ports/Mk/Uses/xfce.mk b/test-ports/default/Mk/Uses/xfce.mk
index 21603185..21603185 100644
--- a/test-ports/Mk/Uses/xfce.mk
+++ b/test-ports/default/Mk/Uses/xfce.mk
diff --git a/test-ports/Mk/Uses/zip.mk b/test-ports/default/Mk/Uses/zip.mk
index 52d8f8d4..52d8f8d4 100644
--- a/test-ports/Mk/Uses/zip.mk
+++ b/test-ports/default/Mk/Uses/zip.mk
diff --git a/test-ports/Mk/Uses/zope.mk b/test-ports/default/Mk/Uses/zope.mk
index 2b0a309b..2b0a309b 100644
--- a/test-ports/Mk/Uses/zope.mk
+++ b/test-ports/default/Mk/Uses/zope.mk
diff --git a/test-ports/Mk/bsd.ccache.mk b/test-ports/default/Mk/bsd.ccache.mk
index 9ddaf3c8..9ddaf3c8 100644
--- a/test-ports/Mk/bsd.ccache.mk
+++ b/test-ports/default/Mk/bsd.ccache.mk
diff --git a/test-ports/Mk/bsd.commands.mk b/test-ports/default/Mk/bsd.commands.mk
index 39f707de..39f707de 100644
--- a/test-ports/Mk/bsd.commands.mk
+++ b/test-ports/default/Mk/bsd.commands.mk
diff --git a/test-ports/Mk/bsd.default-versions.mk b/test-ports/default/Mk/bsd.default-versions.mk
index fd48b7be..fd48b7be 100644
--- a/test-ports/Mk/bsd.default-versions.mk
+++ b/test-ports/default/Mk/bsd.default-versions.mk
diff --git a/test-ports/Mk/bsd.destdir.mk b/test-ports/default/Mk/bsd.destdir.mk
index 64a1f132..64a1f132 100644
--- a/test-ports/Mk/bsd.destdir.mk
+++ b/test-ports/default/Mk/bsd.destdir.mk
diff --git a/test-ports/Mk/bsd.gcc.mk b/test-ports/default/Mk/bsd.gcc.mk
index 3f42d6b4..3f42d6b4 100644
--- a/test-ports/Mk/bsd.gcc.mk
+++ b/test-ports/default/Mk/bsd.gcc.mk
diff --git a/test-ports/Mk/bsd.gecko.mk b/test-ports/default/Mk/bsd.gecko.mk
index ab78859c..ab78859c 100644
--- a/test-ports/Mk/bsd.gecko.mk
+++ b/test-ports/default/Mk/bsd.gecko.mk
diff --git a/test-ports/Mk/bsd.gstreamer.mk b/test-ports/default/Mk/bsd.gstreamer.mk
index 2e54e2dc..2e54e2dc 100644
--- a/test-ports/Mk/bsd.gstreamer.mk
+++ b/test-ports/default/Mk/bsd.gstreamer.mk
diff --git a/test-ports/Mk/bsd.java.mk b/test-ports/default/Mk/bsd.java.mk
index 854671d8..854671d8 100644
--- a/test-ports/Mk/bsd.java.mk
+++ b/test-ports/default/Mk/bsd.java.mk
diff --git a/test-ports/Mk/bsd.ldap.mk b/test-ports/default/Mk/bsd.ldap.mk
index 3f779c0f..3f779c0f 100644
--- a/test-ports/Mk/bsd.ldap.mk
+++ b/test-ports/default/Mk/bsd.ldap.mk
diff --git a/test-ports/Mk/bsd.licenses.db.mk b/test-ports/default/Mk/bsd.licenses.db.mk
index 56604987..56604987 100644
--- a/test-ports/Mk/bsd.licenses.db.mk
+++ b/test-ports/default/Mk/bsd.licenses.db.mk
diff --git a/test-ports/Mk/bsd.licenses.mk b/test-ports/default/Mk/bsd.licenses.mk
index 0991048e..0991048e 100644
--- a/test-ports/Mk/bsd.licenses.mk
+++ b/test-ports/default/Mk/bsd.licenses.mk
diff --git a/test-ports/Mk/bsd.local.mk b/test-ports/default/Mk/bsd.local.mk
index 9b2159fb..9b2159fb 100644
--- a/test-ports/Mk/bsd.local.mk
+++ b/test-ports/default/Mk/bsd.local.mk
diff --git a/test-ports/Mk/bsd.ocaml.mk b/test-ports/default/Mk/bsd.ocaml.mk
index 7b981354..7b981354 100644
--- a/test-ports/Mk/bsd.ocaml.mk
+++ b/test-ports/default/Mk/bsd.ocaml.mk
diff --git a/test-ports/Mk/bsd.octave.mk b/test-ports/default/Mk/bsd.octave.mk
index c0ff9905..c0ff9905 100644
--- a/test-ports/Mk/bsd.octave.mk
+++ b/test-ports/default/Mk/bsd.octave.mk
diff --git a/test-ports/Mk/bsd.options.desc.mk b/test-ports/default/Mk/bsd.options.desc.mk
index 62b8cced..62b8cced 100644
--- a/test-ports/Mk/bsd.options.desc.mk
+++ b/test-ports/default/Mk/bsd.options.desc.mk
diff --git a/test-ports/Mk/bsd.options.mk b/test-ports/default/Mk/bsd.options.mk
index 9dff9bc6..9dff9bc6 100644
--- a/test-ports/Mk/bsd.options.mk
+++ b/test-ports/default/Mk/bsd.options.mk
diff --git a/test-ports/Mk/bsd.port.mk b/test-ports/default/Mk/bsd.port.mk
index e92b1c37..e92b1c37 100644
--- a/test-ports/Mk/bsd.port.mk
+++ b/test-ports/default/Mk/bsd.port.mk
diff --git a/test-ports/Mk/bsd.port.options.mk b/test-ports/default/Mk/bsd.port.options.mk
index 70ce7cec..70ce7cec 100644
--- a/test-ports/Mk/bsd.port.options.mk
+++ b/test-ports/default/Mk/bsd.port.options.mk
diff --git a/test-ports/Mk/bsd.port.post.mk b/test-ports/default/Mk/bsd.port.post.mk
index 64c2f262..64c2f262 100644
--- a/test-ports/Mk/bsd.port.post.mk
+++ b/test-ports/default/Mk/bsd.port.post.mk
diff --git a/test-ports/Mk/bsd.port.pre.mk b/test-ports/default/Mk/bsd.port.pre.mk
index bd8ced28..bd8ced28 100644
--- a/test-ports/Mk/bsd.port.pre.mk
+++ b/test-ports/default/Mk/bsd.port.pre.mk
diff --git a/test-ports/Mk/bsd.port.subdir.mk b/test-ports/default/Mk/bsd.port.subdir.mk
index 63f23f2e..63f23f2e 100644
--- a/test-ports/Mk/bsd.port.subdir.mk
+++ b/test-ports/default/Mk/bsd.port.subdir.mk
diff --git a/test-ports/Mk/bsd.ruby.mk b/test-ports/default/Mk/bsd.ruby.mk
index 16af29e1..16af29e1 100644
--- a/test-ports/Mk/bsd.ruby.mk
+++ b/test-ports/default/Mk/bsd.ruby.mk
diff --git a/test-ports/Mk/bsd.sanity.mk b/test-ports/default/Mk/bsd.sanity.mk
index 7178a5b3..7178a5b3 100644
--- a/test-ports/Mk/bsd.sanity.mk
+++ b/test-ports/default/Mk/bsd.sanity.mk
diff --git a/test-ports/Mk/bsd.sites.mk b/test-ports/default/Mk/bsd.sites.mk
index f1f75363..f1f75363 100644
--- a/test-ports/Mk/bsd.sites.mk
+++ b/test-ports/default/Mk/bsd.sites.mk
diff --git a/test-ports/Mk/bsd.ssp.mk b/test-ports/default/Mk/bsd.ssp.mk
index 86d8dfe3..86d8dfe3 100644
--- a/test-ports/Mk/bsd.ssp.mk
+++ b/test-ports/default/Mk/bsd.ssp.mk
diff --git a/test-ports/Mk/bsd.tex.mk b/test-ports/default/Mk/bsd.tex.mk
index 561da97c..561da97c 100644
--- a/test-ports/Mk/bsd.tex.mk
+++ b/test-ports/default/Mk/bsd.tex.mk
diff --git a/test-ports/Mk/bsd.wx.mk b/test-ports/default/Mk/bsd.wx.mk
index 8668343c..8668343c 100644
--- a/test-ports/Mk/bsd.wx.mk
+++ b/test-ports/default/Mk/bsd.wx.mk
diff --git a/test-ports/Mk/bsd.xorg.mk b/test-ports/default/Mk/bsd.xorg.mk
index 772dcf2d..772dcf2d 100644
--- a/test-ports/Mk/bsd.xorg.mk
+++ b/test-ports/default/Mk/bsd.xorg.mk
diff --git a/test-ports/Templates/BSD.local.dist b/test-ports/default/Templates/BSD.local.dist
index 8bbdee42..8bbdee42 100644
--- a/test-ports/Templates/BSD.local.dist
+++ b/test-ports/default/Templates/BSD.local.dist
diff --git a/test-ports/Templates/Licenses/APACHE20 b/test-ports/default/Templates/Licenses/APACHE20
index d9a10c0d..d9a10c0d 100644
--- a/test-ports/Templates/Licenses/APACHE20
+++ b/test-ports/default/Templates/Licenses/APACHE20
diff --git a/test-ports/Templates/Licenses/ART10 b/test-ports/default/Templates/Licenses/ART10
index ff7f1609..ff7f1609 100644
--- a/test-ports/Templates/Licenses/ART10
+++ b/test-ports/default/Templates/Licenses/ART10
diff --git a/test-ports/Templates/Licenses/ART20 b/test-ports/default/Templates/Licenses/ART20
index b2caf12b..b2caf12b 100644
--- a/test-ports/Templates/Licenses/ART20
+++ b/test-ports/default/Templates/Licenses/ART20
diff --git a/test-ports/Templates/Licenses/GMGPL b/test-ports/default/Templates/Licenses/GMGPL
index 86be4f2f..86be4f2f 100644
--- a/test-ports/Templates/Licenses/GMGPL
+++ b/test-ports/default/Templates/Licenses/GMGPL
diff --git a/test-ports/Templates/Licenses/GPLv1 b/test-ports/default/Templates/Licenses/GPLv1
index 6bba0f84..6bba0f84 100644
--- a/test-ports/Templates/Licenses/GPLv1
+++ b/test-ports/default/Templates/Licenses/GPLv1
diff --git a/test-ports/Templates/Licenses/GPLv2 b/test-ports/default/Templates/Licenses/GPLv2
index d159169d..d159169d 100644
--- a/test-ports/Templates/Licenses/GPLv2
+++ b/test-ports/default/Templates/Licenses/GPLv2
diff --git a/test-ports/Templates/Licenses/GPLv3 b/test-ports/default/Templates/Licenses/GPLv3
index 94a9ed02..94a9ed02 100644
--- a/test-ports/Templates/Licenses/GPLv3
+++ b/test-ports/default/Templates/Licenses/GPLv3
diff --git a/test-ports/Templates/Licenses/GPLv3RLE b/test-ports/default/Templates/Licenses/GPLv3RLE
index e1b3c69c..e1b3c69c 100644
--- a/test-ports/Templates/Licenses/GPLv3RLE
+++ b/test-ports/default/Templates/Licenses/GPLv3RLE
diff --git a/test-ports/Templates/Licenses/LGPL20 b/test-ports/default/Templates/Licenses/LGPL20
index 5bc8fb2c..5bc8fb2c 100644
--- a/test-ports/Templates/Licenses/LGPL20
+++ b/test-ports/default/Templates/Licenses/LGPL20
diff --git a/test-ports/Templates/Licenses/LGPL21 b/test-ports/default/Templates/Licenses/LGPL21
index 4362b491..4362b491 100644
--- a/test-ports/Templates/Licenses/LGPL21
+++ b/test-ports/default/Templates/Licenses/LGPL21
diff --git a/test-ports/Templates/Licenses/LGPL3 b/test-ports/default/Templates/Licenses/LGPL3
index 65c5ca88..65c5ca88 100644
--- a/test-ports/Templates/Licenses/LGPL3
+++ b/test-ports/default/Templates/Licenses/LGPL3
diff --git a/test-ports/Templates/Licenses/LPPL10 b/test-ports/default/Templates/Licenses/LPPL10
index 9425aab8..9425aab8 100644
--- a/test-ports/Templates/Licenses/LPPL10
+++ b/test-ports/default/Templates/Licenses/LPPL10
diff --git a/test-ports/Templates/Licenses/MPL b/test-ports/default/Templates/Licenses/MPL
index 14e2f777..14e2f777 100644
--- a/test-ports/Templates/Licenses/MPL
+++ b/test-ports/default/Templates/Licenses/MPL
diff --git a/test-ports/Templates/Licenses/OFL10 b/test-ports/default/Templates/Licenses/OFL10
index 8eec3bf0..8eec3bf0 100644
--- a/test-ports/Templates/Licenses/OFL10
+++ b/test-ports/default/Templates/Licenses/OFL10
diff --git a/test-ports/Templates/Licenses/OFL11 b/test-ports/default/Templates/Licenses/OFL11
index 77b17316..77b17316 100644
--- a/test-ports/Templates/Licenses/OFL11
+++ b/test-ports/default/Templates/Licenses/OFL11
diff --git a/test-ports/Templates/Licenses/PHP301 b/test-ports/default/Templates/Licenses/PHP301
index 3cc8b777..3cc8b777 100644
--- a/test-ports/Templates/Licenses/PHP301
+++ b/test-ports/default/Templates/Licenses/PHP301
diff --git a/test-ports/Templates/Licenses/RUBY b/test-ports/default/Templates/Licenses/RUBY
index fa7e9dc9..fa7e9dc9 100644
--- a/test-ports/Templates/Licenses/RUBY
+++ b/test-ports/default/Templates/Licenses/RUBY
diff --git a/test-ports/Templates/Licenses/WTFPL b/test-ports/default/Templates/Licenses/WTFPL
index dd94252a..dd94252a 100644
--- a/test-ports/Templates/Licenses/WTFPL
+++ b/test-ports/default/Templates/Licenses/WTFPL
diff --git a/test-ports/Templates/Licenses/WTFPL1 b/test-ports/default/Templates/Licenses/WTFPL1
index 0f98942c..0f98942c 100644
--- a/test-ports/Templates/Licenses/WTFPL1
+++ b/test-ports/default/Templates/Licenses/WTFPL1
diff --git a/test-ports/Templates/Licenses/ZPL21 b/test-ports/default/Templates/Licenses/ZPL21
index 0c4ba0a4..0c4ba0a4 100644
--- a/test-ports/Templates/Licenses/ZPL21
+++ b/test-ports/default/Templates/Licenses/ZPL21
diff --git a/test-ports/Templates/Makefile b/test-ports/default/Templates/Makefile
index 5a3e40a8..5a3e40a8 100644
--- a/test-ports/Templates/Makefile
+++ b/test-ports/default/Templates/Makefile
diff --git a/test-ports/Templates/README.category b/test-ports/default/Templates/README.category
index 6615726a..6615726a 100644
--- a/test-ports/Templates/README.category
+++ b/test-ports/default/Templates/README.category
diff --git a/test-ports/Templates/README.port b/test-ports/default/Templates/README.port
index 0b21239a..0b21239a 100644
--- a/test-ports/Templates/README.port
+++ b/test-ports/default/Templates/README.port
diff --git a/test-ports/Templates/README.top b/test-ports/default/Templates/README.top
index 91684775..91684775 100644
--- a/test-ports/Templates/README.top
+++ b/test-ports/default/Templates/README.top
diff --git a/test-ports/Templates/config.guess b/test-ports/default/Templates/config.guess
index 0bb53aeb..0bb53aeb 100644
--- a/test-ports/Templates/config.guess
+++ b/test-ports/default/Templates/config.guess
diff --git a/test-ports/Templates/config.site b/test-ports/default/Templates/config.site
index aca988ee..aca988ee 100644
--- a/test-ports/Templates/config.site
+++ b/test-ports/default/Templates/config.site
diff --git a/test-ports/Templates/config.sub b/test-ports/default/Templates/config.sub
index 3580aaf3..3580aaf3 100644
--- a/test-ports/Templates/config.sub
+++ b/test-ports/default/Templates/config.sub
diff --git a/test-ports/Tools/make_index b/test-ports/default/Tools/make_index
index f58ad5c1..f58ad5c1 100644
--- a/test-ports/Tools/make_index
+++ b/test-ports/default/Tools/make_index
diff --git a/test-ports/Tools/make_readmes b/test-ports/default/Tools/make_readmes
index 596b225e..596b225e 100644
--- a/test-ports/Tools/make_readmes
+++ b/test-ports/default/Tools/make_readmes
diff --git a/test-ports/Tools/scripts/BDB-upgrade-helper.sh b/test-ports/default/Tools/scripts/BDB-upgrade-helper.sh
index 0e44d263..0e44d263 100755
--- a/test-ports/Tools/scripts/BDB-upgrade-helper.sh
+++ b/test-ports/default/Tools/scripts/BDB-upgrade-helper.sh
diff --git a/test-ports/Tools/scripts/MOVEDlint.awk b/test-ports/default/Tools/scripts/MOVEDlint.awk
index 85a4f3bc..85a4f3bc 100755
--- a/test-ports/Tools/scripts/MOVEDlint.awk
+++ b/test-ports/default/Tools/scripts/MOVEDlint.awk
diff --git a/test-ports/Tools/scripts/README b/test-ports/default/Tools/scripts/README
index af3bb838..af3bb838 100644
--- a/test-ports/Tools/scripts/README
+++ b/test-ports/default/Tools/scripts/README
diff --git a/test-ports/Tools/scripts/README.getpatch b/test-ports/default/Tools/scripts/README.getpatch
index 37a56741..37a56741 100644
--- a/test-ports/Tools/scripts/README.getpatch
+++ b/test-ports/default/Tools/scripts/README.getpatch
diff --git a/test-ports/Tools/scripts/README.getpatch.sh b/test-ports/default/Tools/scripts/README.getpatch.sh
index be5d7cf1..be5d7cf1 100644
--- a/test-ports/Tools/scripts/README.getpatch.sh
+++ b/test-ports/default/Tools/scripts/README.getpatch.sh
diff --git a/test-ports/Tools/scripts/README.patchtool b/test-ports/default/Tools/scripts/README.patchtool
index 59ee672a..59ee672a 100644
--- a/test-ports/Tools/scripts/README.patchtool
+++ b/test-ports/default/Tools/scripts/README.patchtool
diff --git a/test-ports/Tools/scripts/README.portsearch b/test-ports/default/Tools/scripts/README.portsearch
index 0e1c951a..0e1c951a 100644
--- a/test-ports/Tools/scripts/README.portsearch
+++ b/test-ports/default/Tools/scripts/README.portsearch
diff --git a/test-ports/Tools/scripts/addport b/test-ports/default/Tools/scripts/addport
index d2dbd8b3..d2dbd8b3 100755
--- a/test-ports/Tools/scripts/addport
+++ b/test-ports/default/Tools/scripts/addport
diff --git a/test-ports/Tools/scripts/ardiff b/test-ports/default/Tools/scripts/ardiff
index 1840ec0d..1840ec0d 100755
--- a/test-ports/Tools/scripts/ardiff
+++ b/test-ports/default/Tools/scripts/ardiff
diff --git a/test-ports/Tools/scripts/bad-pkgdescrs.sh b/test-ports/default/Tools/scripts/bad-pkgdescrs.sh
index 109cd594..109cd594 100755
--- a/test-ports/Tools/scripts/bad-pkgdescrs.sh
+++ b/test-ports/default/Tools/scripts/bad-pkgdescrs.sh
diff --git a/test-ports/Tools/scripts/bump-revision.sh b/test-ports/default/Tools/scripts/bump-revision.sh
index 64f6b776..64f6b776 100755
--- a/test-ports/Tools/scripts/bump-revision.sh
+++ b/test-ports/default/Tools/scripts/bump-revision.sh
diff --git a/test-ports/Tools/scripts/bump_revision.pl b/test-ports/default/Tools/scripts/bump_revision.pl
index aee83b75..aee83b75 100755
--- a/test-ports/Tools/scripts/bump_revision.pl
+++ b/test-ports/default/Tools/scripts/bump_revision.pl
diff --git a/test-ports/Tools/scripts/checkcats.py b/test-ports/default/Tools/scripts/checkcats.py
index ec47aae0..ec47aae0 100755
--- a/test-ports/Tools/scripts/checkcats.py
+++ b/test-ports/default/Tools/scripts/checkcats.py
diff --git a/test-ports/Tools/scripts/checknewver.sh b/test-ports/default/Tools/scripts/checknewver.sh
index 75dbbe0a..75dbbe0a 100755
--- a/test-ports/Tools/scripts/checknewver.sh
+++ b/test-ports/default/Tools/scripts/checknewver.sh
diff --git a/test-ports/Tools/scripts/checksize.sh b/test-ports/default/Tools/scripts/checksize.sh
index b86daf7a..b86daf7a 100755
--- a/test-ports/Tools/scripts/checksize.sh
+++ b/test-ports/default/Tools/scripts/checksize.sh
diff --git a/test-ports/Tools/scripts/checksum.sh b/test-ports/default/Tools/scripts/checksum.sh
index 7970d6ae..7970d6ae 100755
--- a/test-ports/Tools/scripts/checksum.sh
+++ b/test-ports/default/Tools/scripts/checksum.sh
diff --git a/test-ports/Tools/scripts/chkorigin.sh b/test-ports/default/Tools/scripts/chkorigin.sh
index 849c9239..849c9239 100755
--- a/test-ports/Tools/scripts/chkorigin.sh
+++ b/test-ports/default/Tools/scripts/chkorigin.sh
diff --git a/test-ports/Tools/scripts/chkversion.pl b/test-ports/default/Tools/scripts/chkversion.pl
index d0c11d02..d0c11d02 100755
--- a/test-ports/Tools/scripts/chkversion.pl
+++ b/test-ports/default/Tools/scripts/chkversion.pl
diff --git a/test-ports/Tools/scripts/distclean.sh b/test-ports/default/Tools/scripts/distclean.sh
index ca56e36c..ca56e36c 100755
--- a/test-ports/Tools/scripts/distclean.sh
+++ b/test-ports/default/Tools/scripts/distclean.sh
diff --git a/test-ports/Tools/scripts/domakedescribe b/test-ports/default/Tools/scripts/domakedescribe
index d45a6cec..d45a6cec 100755
--- a/test-ports/Tools/scripts/domakedescribe
+++ b/test-ports/default/Tools/scripts/domakedescribe
diff --git a/test-ports/Tools/scripts/doportlint b/test-ports/default/Tools/scripts/doportlint
index 0de9bd4a..0de9bd4a 100755
--- a/test-ports/Tools/scripts/doportlint
+++ b/test-ports/default/Tools/scripts/doportlint
diff --git a/test-ports/Tools/scripts/getpatch b/test-ports/default/Tools/scripts/getpatch
index 3c217283..3c217283 100755
--- a/test-ports/Tools/scripts/getpatch
+++ b/test-ports/default/Tools/scripts/getpatch
diff --git a/test-ports/Tools/scripts/getpatch.sh b/test-ports/default/Tools/scripts/getpatch.sh
index acf4dcc3..acf4dcc3 100755
--- a/test-ports/Tools/scripts/getpatch.sh
+++ b/test-ports/default/Tools/scripts/getpatch.sh
diff --git a/test-ports/Tools/scripts/gnomedepends.py b/test-ports/default/Tools/scripts/gnomedepends.py
index ab7d66ed..ab7d66ed 100755
--- a/test-ports/Tools/scripts/gnomedepends.py
+++ b/test-ports/default/Tools/scripts/gnomedepends.py
diff --git a/test-ports/Tools/scripts/indent_make_if.pl b/test-ports/default/Tools/scripts/indent_make_if.pl
index 57bc2b4e..57bc2b4e 100755
--- a/test-ports/Tools/scripts/indent_make_if.pl
+++ b/test-ports/default/Tools/scripts/indent_make_if.pl
diff --git a/test-ports/Tools/scripts/mark_safe.pl b/test-ports/default/Tools/scripts/mark_safe.pl
index 82a7a4b4..82a7a4b4 100755
--- a/test-ports/Tools/scripts/mark_safe.pl
+++ b/test-ports/default/Tools/scripts/mark_safe.pl
diff --git a/test-ports/Tools/scripts/mfh b/test-ports/default/Tools/scripts/mfh
index c77a7d03..c77a7d03 100755
--- a/test-ports/Tools/scripts/mfh
+++ b/test-ports/default/Tools/scripts/mfh
diff --git a/test-ports/Tools/scripts/neededlibs.sh b/test-ports/default/Tools/scripts/neededlibs.sh
index 87002296..87002296 100755
--- a/test-ports/Tools/scripts/neededlibs.sh
+++ b/test-ports/default/Tools/scripts/neededlibs.sh
diff --git a/test-ports/Tools/scripts/notconnected b/test-ports/default/Tools/scripts/notconnected
index 32f2dfb8..32f2dfb8 100755
--- a/test-ports/Tools/scripts/notconnected
+++ b/test-ports/default/Tools/scripts/notconnected
diff --git a/test-ports/Tools/scripts/parse-kdump.tcl b/test-ports/default/Tools/scripts/parse-kdump.tcl
index 4abea3f7..4abea3f7 100644
--- a/test-ports/Tools/scripts/parse-kdump.tcl
+++ b/test-ports/default/Tools/scripts/parse-kdump.tcl
diff --git a/test-ports/Tools/scripts/patchtool.py b/test-ports/default/Tools/scripts/patchtool.py
index 1a6bbb98..1a6bbb98 100755
--- a/test-ports/Tools/scripts/patchtool.py
+++ b/test-ports/default/Tools/scripts/patchtool.py
diff --git a/test-ports/Tools/scripts/pkg-stash/pkg-list.sh b/test-ports/default/Tools/scripts/pkg-stash/pkg-list.sh
index a3da4553..a3da4553 100644
--- a/test-ports/Tools/scripts/pkg-stash/pkg-list.sh
+++ b/test-ports/default/Tools/scripts/pkg-stash/pkg-list.sh
diff --git a/test-ports/Tools/scripts/pkg-stash/pkg-stash.pl b/test-ports/default/Tools/scripts/pkg-stash/pkg-stash.pl
index a120f8f5..a120f8f5 100755
--- a/test-ports/Tools/scripts/pkg-stash/pkg-stash.pl
+++ b/test-ports/default/Tools/scripts/pkg-stash/pkg-stash.pl
diff --git a/test-ports/Tools/scripts/portsearch b/test-ports/default/Tools/scripts/portsearch
index ee394ab5..ee394ab5 100755
--- a/test-ports/Tools/scripts/portsearch
+++ b/test-ports/default/Tools/scripts/portsearch
diff --git a/test-ports/Tools/scripts/portsvar.sh b/test-ports/default/Tools/scripts/portsvar.sh
index aa3d239c..aa3d239c 100755
--- a/test-ports/Tools/scripts/portsvar.sh
+++ b/test-ports/default/Tools/scripts/portsvar.sh
diff --git a/test-ports/Tools/scripts/psvn b/test-ports/default/Tools/scripts/psvn
index 029843fa..029843fa 100755
--- a/test-ports/Tools/scripts/psvn
+++ b/test-ports/default/Tools/scripts/psvn
diff --git a/test-ports/Tools/scripts/redundant-opt-files.sh b/test-ports/default/Tools/scripts/redundant-opt-files.sh
index b9e180e1..b9e180e1 100755
--- a/test-ports/Tools/scripts/redundant-opt-files.sh
+++ b/test-ports/default/Tools/scripts/redundant-opt-files.sh
diff --git a/test-ports/Tools/scripts/rmport b/test-ports/default/Tools/scripts/rmport
index 5a32c2d0..5a32c2d0 100755
--- a/test-ports/Tools/scripts/rmport
+++ b/test-ports/default/Tools/scripts/rmport
diff --git a/test-ports/Tools/scripts/splitpatch.pl b/test-ports/default/Tools/scripts/splitpatch.pl
index 888dec88..888dec88 100755
--- a/test-ports/Tools/scripts/splitpatch.pl
+++ b/test-ports/default/Tools/scripts/splitpatch.pl
diff --git a/test-ports/Tools/scripts/sunshar.rb b/test-ports/default/Tools/scripts/sunshar.rb
index 7410eb1a..7410eb1a 100755
--- a/test-ports/Tools/scripts/sunshar.rb
+++ b/test-ports/default/Tools/scripts/sunshar.rb
diff --git a/test-ports/Tools/scripts/sunshar/Makefile b/test-ports/default/Tools/scripts/sunshar/Makefile
index 9b38dd95..9b38dd95 100644
--- a/test-ports/Tools/scripts/sunshar/Makefile
+++ b/test-ports/default/Tools/scripts/sunshar/Makefile
diff --git a/test-ports/Tools/scripts/sunshar/sunshar.1 b/test-ports/default/Tools/scripts/sunshar/sunshar.1
index d5a1ab44..d5a1ab44 100644
--- a/test-ports/Tools/scripts/sunshar/sunshar.1
+++ b/test-ports/default/Tools/scripts/sunshar/sunshar.1
diff --git a/test-ports/Tools/scripts/tindex b/test-ports/default/Tools/scripts/tindex
index 54e6d04f..54e6d04f 100755
--- a/test-ports/Tools/scripts/tindex
+++ b/test-ports/default/Tools/scripts/tindex
diff --git a/test-ports/Tools/scripts/top-size-offenders.sh b/test-ports/default/Tools/scripts/top-size-offenders.sh
index 77e4dd6a..77e4dd6a 100755
--- a/test-ports/Tools/scripts/top-size-offenders.sh
+++ b/test-ports/default/Tools/scripts/top-size-offenders.sh
diff --git a/test-ports/Tools/scripts/update-patches b/test-ports/default/Tools/scripts/update-patches
index b4c260f3..b4c260f3 100755
--- a/test-ports/Tools/scripts/update-patches
+++ b/test-ports/default/Tools/scripts/update-patches
diff --git a/test-ports/converters/Makefile b/test-ports/default/converters/Makefile
index e32e2dc4..e32e2dc4 100644
--- a/test-ports/converters/Makefile
+++ b/test-ports/default/converters/Makefile
diff --git a/test-ports/converters/libiconv/Makefile b/test-ports/default/converters/libiconv/Makefile
index c935dc78..c935dc78 100644
--- a/test-ports/converters/libiconv/Makefile
+++ b/test-ports/default/converters/libiconv/Makefile
diff --git a/test-ports/converters/libiconv/distinfo b/test-ports/default/converters/libiconv/distinfo
index f7e57c9f..f7e57c9f 100644
--- a/test-ports/converters/libiconv/distinfo
+++ b/test-ports/default/converters/libiconv/distinfo
diff --git a/test-ports/converters/libiconv/files/patch-include-iconv.h.in b/test-ports/default/converters/libiconv/files/patch-include-iconv.h.in
index a11ee841..a11ee841 100644
--- a/test-ports/converters/libiconv/files/patch-include-iconv.h.in
+++ b/test-ports/default/converters/libiconv/files/patch-include-iconv.h.in
diff --git a/test-ports/converters/libiconv/files/patch-libcharset__lib__config.charset b/test-ports/default/converters/libiconv/files/patch-libcharset__lib__config.charset
index ba30603d..ba30603d 100644
--- a/test-ports/converters/libiconv/files/patch-libcharset__lib__config.charset
+++ b/test-ports/default/converters/libiconv/files/patch-libcharset__lib__config.charset
diff --git a/test-ports/converters/libiconv/files/patch-src__Makefile.in b/test-ports/default/converters/libiconv/files/patch-src__Makefile.in
index 04d0b09e..04d0b09e 100644
--- a/test-ports/converters/libiconv/files/patch-src__Makefile.in
+++ b/test-ports/default/converters/libiconv/files/patch-src__Makefile.in
diff --git a/test-ports/converters/libiconv/pkg-descr b/test-ports/default/converters/libiconv/pkg-descr
index 5713f9a9..5713f9a9 100644
--- a/test-ports/converters/libiconv/pkg-descr
+++ b/test-ports/default/converters/libiconv/pkg-descr
diff --git a/test-ports/converters/libiconv/pkg-plist b/test-ports/default/converters/libiconv/pkg-plist
index 64341c2e..64341c2e 100644
--- a/test-ports/converters/libiconv/pkg-plist
+++ b/test-ports/default/converters/libiconv/pkg-plist
diff --git a/test-ports/devel/Makefile b/test-ports/default/devel/Makefile
index 4fd73473..4fd73473 100644
--- a/test-ports/devel/Makefile
+++ b/test-ports/default/devel/Makefile
diff --git a/test-ports/devel/autoconf-wrapper/Makefile b/test-ports/default/devel/autoconf-wrapper/Makefile
index 450e3d8f..450e3d8f 100644
--- a/test-ports/devel/autoconf-wrapper/Makefile
+++ b/test-ports/default/devel/autoconf-wrapper/Makefile
diff --git a/test-ports/devel/autoconf-wrapper/files/autotools-wrapper.sh b/test-ports/default/devel/autoconf-wrapper/files/autotools-wrapper.sh
index f1992378..f1992378 100644
--- a/test-ports/devel/autoconf-wrapper/files/autotools-wrapper.sh
+++ b/test-ports/default/devel/autoconf-wrapper/files/autotools-wrapper.sh
diff --git a/test-ports/devel/autoconf-wrapper/pkg-descr b/test-ports/default/devel/autoconf-wrapper/pkg-descr
index ee8c066c..ee8c066c 100644
--- a/test-ports/devel/autoconf-wrapper/pkg-descr
+++ b/test-ports/default/devel/autoconf-wrapper/pkg-descr
diff --git a/test-ports/devel/autoconf/Makefile b/test-ports/default/devel/autoconf/Makefile
index 6a9c3e8e..6a9c3e8e 100644
--- a/test-ports/devel/autoconf/Makefile
+++ b/test-ports/default/devel/autoconf/Makefile
diff --git a/test-ports/devel/autoconf/distinfo b/test-ports/default/devel/autoconf/distinfo
index 3359cad8..3359cad8 100644
--- a/test-ports/devel/autoconf/distinfo
+++ b/test-ports/default/devel/autoconf/distinfo
diff --git a/test-ports/devel/autoconf/files/patch-autoconf.texi b/test-ports/default/devel/autoconf/files/patch-autoconf.texi
index c9c0da44..c9c0da44 100644
--- a/test-ports/devel/autoconf/files/patch-autoconf.texi
+++ b/test-ports/default/devel/autoconf/files/patch-autoconf.texi
diff --git a/test-ports/devel/autoconf/files/patch-bin-autoscan.in b/test-ports/default/devel/autoconf/files/patch-bin-autoscan.in
index a55345cc..a55345cc 100644
--- a/test-ports/devel/autoconf/files/patch-bin-autoscan.in
+++ b/test-ports/default/devel/autoconf/files/patch-bin-autoscan.in
diff --git a/test-ports/devel/autoconf/files/patch-doc-Makefile.in b/test-ports/default/devel/autoconf/files/patch-doc-Makefile.in
index 1cba4ecf..1cba4ecf 100644
--- a/test-ports/devel/autoconf/files/patch-doc-Makefile.in
+++ b/test-ports/default/devel/autoconf/files/patch-doc-Makefile.in
diff --git a/test-ports/devel/autoconf/pkg-descr b/test-ports/default/devel/autoconf/pkg-descr
index c404cc85..c404cc85 100644
--- a/test-ports/devel/autoconf/pkg-descr
+++ b/test-ports/default/devel/autoconf/pkg-descr
diff --git a/test-ports/devel/autoconf/pkg-plist b/test-ports/default/devel/autoconf/pkg-plist
index 9e806e5a..9e806e5a 100644
--- a/test-ports/devel/autoconf/pkg-plist
+++ b/test-ports/default/devel/autoconf/pkg-plist
diff --git a/test-ports/devel/automake-wrapper/Makefile b/test-ports/default/devel/automake-wrapper/Makefile
index 2b8ff07c..2b8ff07c 100644
--- a/test-ports/devel/automake-wrapper/Makefile
+++ b/test-ports/default/devel/automake-wrapper/Makefile
diff --git a/test-ports/devel/automake-wrapper/pkg-descr b/test-ports/default/devel/automake-wrapper/pkg-descr
index a624f236..a624f236 100644
--- a/test-ports/devel/automake-wrapper/pkg-descr
+++ b/test-ports/default/devel/automake-wrapper/pkg-descr
diff --git a/test-ports/devel/automake/Makefile b/test-ports/default/devel/automake/Makefile
index 361da64f..361da64f 100644
--- a/test-ports/devel/automake/Makefile
+++ b/test-ports/default/devel/automake/Makefile
diff --git a/test-ports/devel/automake/distinfo b/test-ports/default/devel/automake/distinfo
index 7611ba29..7611ba29 100644
--- a/test-ports/devel/automake/distinfo
+++ b/test-ports/default/devel/automake/distinfo
diff --git a/test-ports/devel/automake/files/patch-Makefile.in b/test-ports/default/devel/automake/files/patch-Makefile.in
index ec534cf2..ec534cf2 100644
--- a/test-ports/devel/automake/files/patch-Makefile.in
+++ b/test-ports/default/devel/automake/files/patch-Makefile.in
diff --git a/test-ports/devel/automake/files/patch-bin-automake.in b/test-ports/default/devel/automake/files/patch-bin-automake.in
index c58559ee..c58559ee 100644
--- a/test-ports/devel/automake/files/patch-bin-automake.in
+++ b/test-ports/default/devel/automake/files/patch-bin-automake.in
diff --git a/test-ports/devel/automake/files/patch-doc__automake.texi b/test-ports/default/devel/automake/files/patch-doc__automake.texi
index 9f2f250b..9f2f250b 100644
--- a/test-ports/devel/automake/files/patch-doc__automake.texi
+++ b/test-ports/default/devel/automake/files/patch-doc__automake.texi
diff --git a/test-ports/devel/automake/pkg-descr b/test-ports/default/devel/automake/pkg-descr
index f096d031..f096d031 100644
--- a/test-ports/devel/automake/pkg-descr
+++ b/test-ports/default/devel/automake/pkg-descr
diff --git a/test-ports/devel/automake/pkg-plist b/test-ports/default/devel/automake/pkg-plist
index 0537c7b7..0537c7b7 100644
--- a/test-ports/devel/automake/pkg-plist
+++ b/test-ports/default/devel/automake/pkg-plist
diff --git a/test-ports/devel/ccache/Makefile b/test-ports/default/devel/ccache/Makefile
index eeae3bbc..eeae3bbc 100644
--- a/test-ports/devel/ccache/Makefile
+++ b/test-ports/default/devel/ccache/Makefile
diff --git a/test-ports/devel/ccache/distinfo b/test-ports/default/devel/ccache/distinfo
index 53c4c465..53c4c465 100644
--- a/test-ports/devel/ccache/distinfo
+++ b/test-ports/default/devel/ccache/distinfo
diff --git a/test-ports/devel/ccache/files/ccache-howto-freebsd.txt.in b/test-ports/default/devel/ccache/files/ccache-howto-freebsd.txt.in
index 775126e9..775126e9 100644
--- a/test-ports/devel/ccache/files/ccache-howto-freebsd.txt.in
+++ b/test-ports/default/devel/ccache/files/ccache-howto-freebsd.txt.in
diff --git a/test-ports/devel/ccache/files/ccache-update-links.sh.in b/test-ports/default/devel/ccache/files/ccache-update-links.sh.in
index 15bc180a..15bc180a 100644
--- a/test-ports/devel/ccache/files/ccache-update-links.sh.in
+++ b/test-ports/default/devel/ccache/files/ccache-update-links.sh.in
diff --git a/test-ports/devel/ccache/files/extra-patch-memcached b/test-ports/default/devel/ccache/files/extra-patch-memcached
index f80d6d2d..f80d6d2d 100644
--- a/test-ports/devel/ccache/files/extra-patch-memcached
+++ b/test-ports/default/devel/ccache/files/extra-patch-memcached
diff --git a/test-ports/devel/ccache/files/extra-patch-memcached-Makefile.in b/test-ports/default/devel/ccache/files/extra-patch-memcached-Makefile.in
index 2af101a5..2af101a5 100644
--- a/test-ports/devel/ccache/files/extra-patch-memcached-Makefile.in
+++ b/test-ports/default/devel/ccache/files/extra-patch-memcached-Makefile.in
diff --git a/test-ports/devel/ccache/files/extra-patch-memcached-ccache.c b/test-ports/default/devel/ccache/files/extra-patch-memcached-ccache.c
index 5d04a3b2..5d04a3b2 100644
--- a/test-ports/devel/ccache/files/extra-patch-memcached-ccache.c
+++ b/test-ports/default/devel/ccache/files/extra-patch-memcached-ccache.c
diff --git a/test-ports/devel/ccache/files/extra-patch-memcached-configure.ac b/test-ports/default/devel/ccache/files/extra-patch-memcached-configure.ac
index 3eb136dc..3eb136dc 100644
--- a/test-ports/devel/ccache/files/extra-patch-memcached-configure.ac
+++ b/test-ports/default/devel/ccache/files/extra-patch-memcached-configure.ac
diff --git a/test-ports/devel/ccache/files/patch-ccache.c b/test-ports/default/devel/ccache/files/patch-ccache.c
index c38b96a9..c38b96a9 100644
--- a/test-ports/devel/ccache/files/patch-ccache.c
+++ b/test-ports/default/devel/ccache/files/patch-ccache.c
diff --git a/test-ports/devel/ccache/files/patch-configure b/test-ports/default/devel/ccache/files/patch-configure
index 010d9bf2..010d9bf2 100644
--- a/test-ports/devel/ccache/files/patch-configure
+++ b/test-ports/default/devel/ccache/files/patch-configure
diff --git a/test-ports/devel/ccache/files/patch-configure.ac b/test-ports/default/devel/ccache/files/patch-configure.ac
index 9b15d461..9b15d461 100644
--- a/test-ports/devel/ccache/files/patch-configure.ac
+++ b/test-ports/default/devel/ccache/files/patch-configure.ac
diff --git a/test-ports/devel/ccache/files/pkg-message.in b/test-ports/default/devel/ccache/files/pkg-message.in
index 0ff12447..0ff12447 100644
--- a/test-ports/devel/ccache/files/pkg-message.in
+++ b/test-ports/default/devel/ccache/files/pkg-message.in
diff --git a/test-ports/devel/ccache/files/world-ccache.in b/test-ports/default/devel/ccache/files/world-ccache.in
index 9803d12b..9803d12b 100644
--- a/test-ports/devel/ccache/files/world-ccache.in
+++ b/test-ports/default/devel/ccache/files/world-ccache.in
diff --git a/test-ports/devel/ccache/pkg-descr b/test-ports/default/devel/ccache/pkg-descr
index 0fe4f61a..0fe4f61a 100644
--- a/test-ports/devel/ccache/pkg-descr
+++ b/test-ports/default/devel/ccache/pkg-descr
diff --git a/test-ports/devel/ccache/pkg-plist b/test-ports/default/devel/ccache/pkg-plist
index c3327694..c3327694 100644
--- a/test-ports/devel/ccache/pkg-plist
+++ b/test-ports/default/devel/ccache/pkg-plist
diff --git a/test-ports/devel/gettext-runtime/Makefile b/test-ports/default/devel/gettext-runtime/Makefile
index 89c99c56..89c99c56 100644
--- a/test-ports/devel/gettext-runtime/Makefile
+++ b/test-ports/default/devel/gettext-runtime/Makefile
diff --git a/test-ports/devel/gettext-runtime/files/patch-configure b/test-ports/default/devel/gettext-runtime/files/patch-configure
index d7c3b9c9..d7c3b9c9 100644
--- a/test-ports/devel/gettext-runtime/files/patch-configure
+++ b/test-ports/default/devel/gettext-runtime/files/patch-configure
diff --git a/test-ports/devel/gettext-runtime/files/patch-intl-threadlib.c b/test-ports/default/devel/gettext-runtime/files/patch-intl-threadlib.c
index 8de65d92..8de65d92 100644
--- a/test-ports/devel/gettext-runtime/files/patch-intl-threadlib.c
+++ b/test-ports/default/devel/gettext-runtime/files/patch-intl-threadlib.c
diff --git a/test-ports/devel/gettext-runtime/pkg-descr b/test-ports/default/devel/gettext-runtime/pkg-descr
index ac084016..ac084016 100644
--- a/test-ports/devel/gettext-runtime/pkg-descr
+++ b/test-ports/default/devel/gettext-runtime/pkg-descr
diff --git a/test-ports/devel/gettext-runtime/pkg-plist b/test-ports/default/devel/gettext-runtime/pkg-plist
index a5936e24..a5936e24 100644
--- a/test-ports/devel/gettext-runtime/pkg-plist
+++ b/test-ports/default/devel/gettext-runtime/pkg-plist
diff --git a/test-ports/devel/gettext-tools/Makefile b/test-ports/default/devel/gettext-tools/Makefile
index 0846f08e..0846f08e 100644
--- a/test-ports/devel/gettext-tools/Makefile
+++ b/test-ports/default/devel/gettext-tools/Makefile
diff --git a/test-ports/devel/gettext-tools/files/patch-configure b/test-ports/default/devel/gettext-tools/files/patch-configure
index aae0d524..aae0d524 100644
--- a/test-ports/devel/gettext-tools/files/patch-configure
+++ b/test-ports/default/devel/gettext-tools/files/patch-configure
diff --git a/test-ports/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c b/test-ports/default/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c
index c8a29d7a..c8a29d7a 100644
--- a/test-ports/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c
+++ b/test-ports/default/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c
diff --git a/test-ports/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c b/test-ports/default/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c
index ac8184e4..ac8184e4 100644
--- a/test-ports/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c
+++ b/test-ports/default/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c
diff --git a/test-ports/devel/gettext-tools/pkg-descr b/test-ports/default/devel/gettext-tools/pkg-descr
index f1767e47..f1767e47 100644
--- a/test-ports/devel/gettext-tools/pkg-descr
+++ b/test-ports/default/devel/gettext-tools/pkg-descr
diff --git a/test-ports/devel/gettext-tools/pkg-plist b/test-ports/default/devel/gettext-tools/pkg-plist
index da982118..da982118 100644
--- a/test-ports/devel/gettext-tools/pkg-plist
+++ b/test-ports/default/devel/gettext-tools/pkg-plist
diff --git a/test-ports/devel/gettext/Makefile b/test-ports/default/devel/gettext/Makefile
index 87326a80..87326a80 100644
--- a/test-ports/devel/gettext/Makefile
+++ b/test-ports/default/devel/gettext/Makefile
diff --git a/test-ports/devel/gettext/Makefile.common b/test-ports/default/devel/gettext/Makefile.common
index 9732c29f..9732c29f 100644
--- a/test-ports/devel/gettext/Makefile.common
+++ b/test-ports/default/devel/gettext/Makefile.common
diff --git a/test-ports/devel/gettext/distinfo b/test-ports/default/devel/gettext/distinfo
index f53ca91f..f53ca91f 100644
--- a/test-ports/devel/gettext/distinfo
+++ b/test-ports/default/devel/gettext/distinfo
diff --git a/test-ports/devel/gettext/pkg-descr b/test-ports/default/devel/gettext/pkg-descr
index c5cc171b..c5cc171b 100644
--- a/test-ports/devel/gettext/pkg-descr
+++ b/test-ports/default/devel/gettext/pkg-descr
diff --git a/test-ports/devel/gmake/Makefile b/test-ports/default/devel/gmake/Makefile
index 962fec52..962fec52 100644
--- a/test-ports/devel/gmake/Makefile
+++ b/test-ports/default/devel/gmake/Makefile
diff --git a/test-ports/devel/gmake/distinfo b/test-ports/default/devel/gmake/distinfo
index bdecf1bd..bdecf1bd 100644
--- a/test-ports/devel/gmake/distinfo
+++ b/test-ports/default/devel/gmake/distinfo
diff --git a/test-ports/devel/gmake/files/patch-default.c b/test-ports/default/devel/gmake/files/patch-default.c
index 44588ced..44588ced 100644
--- a/test-ports/devel/gmake/files/patch-default.c
+++ b/test-ports/default/devel/gmake/files/patch-default.c
diff --git a/test-ports/devel/gmake/pkg-descr b/test-ports/default/devel/gmake/pkg-descr
index 456196b9..456196b9 100644
--- a/test-ports/devel/gmake/pkg-descr
+++ b/test-ports/default/devel/gmake/pkg-descr
diff --git a/test-ports/devel/gmake/pkg-plist b/test-ports/default/devel/gmake/pkg-plist
index cb51cf79..cb51cf79 100644
--- a/test-ports/devel/gmake/pkg-plist
+++ b/test-ports/default/devel/gmake/pkg-plist
diff --git a/test-ports/devel/libffi/Makefile b/test-ports/default/devel/libffi/Makefile
index 11385dd2..11385dd2 100644
--- a/test-ports/devel/libffi/Makefile
+++ b/test-ports/default/devel/libffi/Makefile
diff --git a/test-ports/devel/libffi/distinfo b/test-ports/default/devel/libffi/distinfo
index b388b79c..b388b79c 100644
--- a/test-ports/devel/libffi/distinfo
+++ b/test-ports/default/devel/libffi/distinfo
diff --git a/test-ports/devel/libffi/files/patch-b5ade2 b/test-ports/default/devel/libffi/files/patch-b5ade2
index e6933f7e..e6933f7e 100644
--- a/test-ports/devel/libffi/files/patch-b5ade2
+++ b/test-ports/default/devel/libffi/files/patch-b5ade2
diff --git a/test-ports/devel/libffi/files/patch-configure b/test-ports/default/devel/libffi/files/patch-configure
index 913024f8..913024f8 100644
--- a/test-ports/devel/libffi/files/patch-configure
+++ b/test-ports/default/devel/libffi/files/patch-configure
diff --git a/test-ports/devel/libffi/files/patch-src__arm__ffi.c b/test-ports/default/devel/libffi/files/patch-src__arm__ffi.c
index d3058a08..d3058a08 100644
--- a/test-ports/devel/libffi/files/patch-src__arm__ffi.c
+++ b/test-ports/default/devel/libffi/files/patch-src__arm__ffi.c
diff --git a/test-ports/devel/libffi/files/patch-src__mips__ffi.c b/test-ports/default/devel/libffi/files/patch-src__mips__ffi.c
index d93f3737..d93f3737 100644
--- a/test-ports/devel/libffi/files/patch-src__mips__ffi.c
+++ b/test-ports/default/devel/libffi/files/patch-src__mips__ffi.c
diff --git a/test-ports/devel/libffi/files/patch-src__mips__ffitarget.h b/test-ports/default/devel/libffi/files/patch-src__mips__ffitarget.h
index 4c52e326..4c52e326 100644
--- a/test-ports/devel/libffi/files/patch-src__mips__ffitarget.h
+++ b/test-ports/default/devel/libffi/files/patch-src__mips__ffitarget.h
diff --git a/test-ports/devel/libffi/files/patch-src_arm_sysv.S b/test-ports/default/devel/libffi/files/patch-src_arm_sysv.S
index 228dc3de..228dc3de 100644
--- a/test-ports/devel/libffi/files/patch-src_arm_sysv.S
+++ b/test-ports/default/devel/libffi/files/patch-src_arm_sysv.S
diff --git a/test-ports/devel/libffi/pkg-descr b/test-ports/default/devel/libffi/pkg-descr
index 15514cb8..15514cb8 100644
--- a/test-ports/devel/libffi/pkg-descr
+++ b/test-ports/default/devel/libffi/pkg-descr
diff --git a/test-ports/devel/libffi/pkg-plist b/test-ports/default/devel/libffi/pkg-plist
index f4629c73..f4629c73 100644
--- a/test-ports/devel/libffi/pkg-plist
+++ b/test-ports/default/devel/libffi/pkg-plist
diff --git a/test-ports/devel/m4/Makefile b/test-ports/default/devel/m4/Makefile
index d60b08f7..d60b08f7 100644
--- a/test-ports/devel/m4/Makefile
+++ b/test-ports/default/devel/m4/Makefile
diff --git a/test-ports/devel/m4/distinfo b/test-ports/default/devel/m4/distinfo
index acbe3950..acbe3950 100644
--- a/test-ports/devel/m4/distinfo
+++ b/test-ports/default/devel/m4/distinfo
diff --git a/test-ports/devel/m4/pkg-descr b/test-ports/default/devel/m4/pkg-descr
index aee896c9..aee896c9 100644
--- a/test-ports/devel/m4/pkg-descr
+++ b/test-ports/default/devel/m4/pkg-descr
diff --git a/test-ports/devel/m4/pkg-plist b/test-ports/default/devel/m4/pkg-plist
index 659a44b5..659a44b5 100644
--- a/test-ports/devel/m4/pkg-plist
+++ b/test-ports/default/devel/m4/pkg-plist
diff --git a/test-ports/devel/p5-Locale-gettext/Makefile b/test-ports/default/devel/p5-Locale-gettext/Makefile
index 32496f1a..32496f1a 100644
--- a/test-ports/devel/p5-Locale-gettext/Makefile
+++ b/test-ports/default/devel/p5-Locale-gettext/Makefile
diff --git a/test-ports/devel/p5-Locale-gettext/distinfo b/test-ports/default/devel/p5-Locale-gettext/distinfo
index 6d5caf5a..6d5caf5a 100644
--- a/test-ports/devel/p5-Locale-gettext/distinfo
+++ b/test-ports/default/devel/p5-Locale-gettext/distinfo
diff --git a/test-ports/devel/p5-Locale-gettext/files/patch-Makefile.PL b/test-ports/default/devel/p5-Locale-gettext/files/patch-Makefile.PL
index 8434dcba..8434dcba 100644
--- a/test-ports/devel/p5-Locale-gettext/files/patch-Makefile.PL
+++ b/test-ports/default/devel/p5-Locale-gettext/files/patch-Makefile.PL
diff --git a/test-ports/devel/p5-Locale-gettext/pkg-descr b/test-ports/default/devel/p5-Locale-gettext/pkg-descr
index 29108e88..29108e88 100644
--- a/test-ports/devel/p5-Locale-gettext/pkg-descr
+++ b/test-ports/default/devel/p5-Locale-gettext/pkg-descr
diff --git a/test-ports/devel/p5-Locale-gettext/pkg-plist b/test-ports/default/devel/p5-Locale-gettext/pkg-plist
index b3b7ead0..b3b7ead0 100644
--- a/test-ports/devel/p5-Locale-gettext/pkg-plist
+++ b/test-ports/default/devel/p5-Locale-gettext/pkg-plist
diff --git a/test-ports/devel/pkgconf/Makefile b/test-ports/default/devel/pkgconf/Makefile
index 1f3f0e75..1f3f0e75 100644
--- a/test-ports/devel/pkgconf/Makefile
+++ b/test-ports/default/devel/pkgconf/Makefile
diff --git a/test-ports/devel/pkgconf/distinfo b/test-ports/default/devel/pkgconf/distinfo
index cf8844a8..cf8844a8 100644
--- a/test-ports/devel/pkgconf/distinfo
+++ b/test-ports/default/devel/pkgconf/distinfo
diff --git a/test-ports/devel/pkgconf/pkg-descr b/test-ports/default/devel/pkgconf/pkg-descr
index 9ae3b1ab..9ae3b1ab 100644
--- a/test-ports/devel/pkgconf/pkg-descr
+++ b/test-ports/default/devel/pkgconf/pkg-descr
diff --git a/test-ports/devel/pkgconf/pkg-plist b/test-ports/default/devel/pkgconf/pkg-plist
index 0abcbba1..0abcbba1 100644
--- a/test-ports/devel/pkgconf/pkg-plist
+++ b/test-ports/default/devel/pkgconf/pkg-plist
diff --git a/test-ports/devel/port_var_fetch1/Makefile b/test-ports/default/devel/port_var_fetch1/Makefile
index d9853068..d9853068 100644
--- a/test-ports/devel/port_var_fetch1/Makefile
+++ b/test-ports/default/devel/port_var_fetch1/Makefile
diff --git a/test-ports/devel/port_var_fetch2/Makefile b/test-ports/default/devel/port_var_fetch2/Makefile
index 2e8beb24..2e8beb24 100644
--- a/test-ports/devel/port_var_fetch2/Makefile
+++ b/test-ports/default/devel/port_var_fetch2/Makefile
diff --git a/test-ports/devel/port_var_fetch_syntax_error/Makefile b/test-ports/default/devel/port_var_fetch_syntax_error/Makefile
index bff49473..bff49473 100644
--- a/test-ports/devel/port_var_fetch_syntax_error/Makefile
+++ b/test-ports/default/devel/port_var_fetch_syntax_error/Makefile
diff --git a/test-ports/devel/readline/Makefile b/test-ports/default/devel/readline/Makefile
index f669308c..f669308c 100644
--- a/test-ports/devel/readline/Makefile
+++ b/test-ports/default/devel/readline/Makefile
diff --git a/test-ports/devel/readline/distinfo b/test-ports/default/devel/readline/distinfo
index 995614a3..995614a3 100644
--- a/test-ports/devel/readline/distinfo
+++ b/test-ports/default/devel/readline/distinfo
diff --git a/test-ports/devel/readline/files/patch-support-shobj-conf b/test-ports/default/devel/readline/files/patch-support-shobj-conf
index 6c74f989..6c74f989 100644
--- a/test-ports/devel/readline/files/patch-support-shobj-conf
+++ b/test-ports/default/devel/readline/files/patch-support-shobj-conf
diff --git a/test-ports/devel/readline/pkg-descr b/test-ports/default/devel/readline/pkg-descr
index de359ede..de359ede 100644
--- a/test-ports/devel/readline/pkg-descr
+++ b/test-ports/default/devel/readline/pkg-descr
diff --git a/test-ports/devel/readline/pkg-plist b/test-ports/default/devel/readline/pkg-plist
index 021fc460..021fc460 100644
--- a/test-ports/devel/readline/pkg-plist
+++ b/test-ports/default/devel/readline/pkg-plist
diff --git a/test-ports/lang/Makefile b/test-ports/default/lang/Makefile
index e2e030fd..e2e030fd 100644
--- a/test-ports/lang/Makefile
+++ b/test-ports/default/lang/Makefile
diff --git a/test-ports/lang/perl5.24/Makefile b/test-ports/default/lang/perl5.24/Makefile
index 10fe2b89..10fe2b89 100644
--- a/test-ports/lang/perl5.24/Makefile
+++ b/test-ports/default/lang/perl5.24/Makefile
diff --git a/test-ports/lang/perl5.24/distinfo b/test-ports/default/lang/perl5.24/distinfo
index fdef0f6d..fdef0f6d 100644
--- a/test-ports/lang/perl5.24/distinfo
+++ b/test-ports/default/lang/perl5.24/distinfo
diff --git a/test-ports/lang/perl5.24/files/patch-Configure b/test-ports/default/lang/perl5.24/files/patch-Configure
index 29d12e39..29d12e39 100644
--- a/test-ports/lang/perl5.24/files/patch-Configure
+++ b/test-ports/default/lang/perl5.24/files/patch-Configure
diff --git a/test-ports/lang/perl5.24/files/patch-Makefile.SH b/test-ports/default/lang/perl5.24/files/patch-Makefile.SH
index 4c83706d..4c83706d 100644
--- a/test-ports/lang/perl5.24/files/patch-Makefile.SH
+++ b/test-ports/default/lang/perl5.24/files/patch-Makefile.SH
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm
index b84c8fc0..b84c8fc0 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-Install_t_Install.t b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-Install_t_Install.t
index 40955326..40955326 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-Install_t_Install.t
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-Install_t_Install.t
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm
index e064f170..e064f170 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t
index 2857893c..2857893c 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_Math-BigInt_lib_Math_BigInt.pm b/test-ports/default/lang/perl5.24/files/patch-cpan_Math-BigInt_lib_Math_BigInt.pm
index 001358d3..001358d3 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_Math-BigInt_lib_Math_BigInt.pm
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_Math-BigInt_lib_Math_BigInt.pm
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
index 018c68f9..018c68f9 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm
index 600fdf77..600fdf77 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
index 5d414069..5d414069 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
diff --git a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm
index fd401d4e..fd401d4e 100644
--- a/test-ports/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm
+++ b/test-ports/default/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm
diff --git a/test-ports/lang/perl5.24/files/patch-dtrace b/test-ports/default/lang/perl5.24/files/patch-dtrace
index baea5da3..baea5da3 100644
--- a/test-ports/lang/perl5.24/files/patch-dtrace
+++ b/test-ports/default/lang/perl5.24/files/patch-dtrace
diff --git a/test-ports/lang/perl5.24/files/patch-ext_GDBM__File_t_fatal.t b/test-ports/default/lang/perl5.24/files/patch-ext_GDBM__File_t_fatal.t
index b011ba77..b011ba77 100644
--- a/test-ports/lang/perl5.24/files/patch-ext_GDBM__File_t_fatal.t
+++ b/test-ports/default/lang/perl5.24/files/patch-ext_GDBM__File_t_fatal.t
diff --git a/test-ports/lang/perl5.24/files/patch-hints_freebsd.sh b/test-ports/default/lang/perl5.24/files/patch-hints_freebsd.sh
index ad822d32..ad822d32 100644
--- a/test-ports/lang/perl5.24/files/patch-hints_freebsd.sh
+++ b/test-ports/default/lang/perl5.24/files/patch-hints_freebsd.sh
diff --git a/test-ports/lang/perl5.24/files/patch-perl.c b/test-ports/default/lang/perl5.24/files/patch-perl.c
index 5e2eb68d..5e2eb68d 100644
--- a/test-ports/lang/perl5.24/files/patch-perl.c
+++ b/test-ports/default/lang/perl5.24/files/patch-perl.c
diff --git a/test-ports/lang/perl5.24/files/patch-t_porting_customized.dat b/test-ports/default/lang/perl5.24/files/patch-t_porting_customized.dat
index 9395584b..9395584b 100644
--- a/test-ports/lang/perl5.24/files/patch-t_porting_customized.dat
+++ b/test-ports/default/lang/perl5.24/files/patch-t_porting_customized.dat
diff --git a/test-ports/lang/perl5.24/files/patch-vutil.h b/test-ports/default/lang/perl5.24/files/patch-vutil.h
index 0ff04be8..0ff04be8 100644
--- a/test-ports/lang/perl5.24/files/patch-vutil.h
+++ b/test-ports/default/lang/perl5.24/files/patch-vutil.h
diff --git a/test-ports/lang/perl5.24/files/perl-man.conf.in b/test-ports/default/lang/perl5.24/files/perl-man.conf.in
index cbe3a5c5..cbe3a5c5 100644
--- a/test-ports/lang/perl5.24/files/perl-man.conf.in
+++ b/test-ports/default/lang/perl5.24/files/perl-man.conf.in
diff --git a/test-ports/lang/perl5.24/pkg-descr b/test-ports/default/lang/perl5.24/pkg-descr
index 0ef0392e..0ef0392e 100644
--- a/test-ports/lang/perl5.24/pkg-descr
+++ b/test-ports/default/lang/perl5.24/pkg-descr
diff --git a/test-ports/lang/perl5.24/pkg-message b/test-ports/default/lang/perl5.24/pkg-message
index 751268e6..751268e6 100644
--- a/test-ports/lang/perl5.24/pkg-message
+++ b/test-ports/default/lang/perl5.24/pkg-message
diff --git a/test-ports/lang/perl5.24/pkg-plist b/test-ports/default/lang/perl5.24/pkg-plist
index 73810645..73810645 100644
--- a/test-ports/lang/perl5.24/pkg-plist
+++ b/test-ports/default/lang/perl5.24/pkg-plist
diff --git a/test-ports/lang/perl5.24/version.mk b/test-ports/default/lang/perl5.24/version.mk
index d00b83ff..d00b83ff 100644
--- a/test-ports/lang/perl5.24/version.mk
+++ b/test-ports/default/lang/perl5.24/version.mk
diff --git a/test-ports/lang/perl5.28/Makefile b/test-ports/default/lang/perl5.28/Makefile
index 4b2079e3..4b2079e3 100644
--- a/test-ports/lang/perl5.28/Makefile
+++ b/test-ports/default/lang/perl5.28/Makefile
diff --git a/test-ports/lang/perl5.28/distinfo b/test-ports/default/lang/perl5.28/distinfo
index 838bbb6b..838bbb6b 100644
--- a/test-ports/lang/perl5.28/distinfo
+++ b/test-ports/default/lang/perl5.28/distinfo
diff --git a/test-ports/lang/perl5.28/files/patch-Configure b/test-ports/default/lang/perl5.28/files/patch-Configure
index 04c01936..04c01936 100644
--- a/test-ports/lang/perl5.28/files/patch-Configure
+++ b/test-ports/default/lang/perl5.28/files/patch-Configure
diff --git a/test-ports/lang/perl5.28/files/patch-Makefile.SH b/test-ports/default/lang/perl5.28/files/patch-Makefile.SH
index 4c83706d..4c83706d 100644
--- a/test-ports/lang/perl5.28/files/patch-Makefile.SH
+++ b/test-ports/default/lang/perl5.28/files/patch-Makefile.SH
diff --git a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm
index d756b79c..d756b79c 100644
--- a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm
+++ b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-Install_lib_ExtUtils_Install.pm
diff --git a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-Install_t_Install.t b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-Install_t_Install.t
index 40955326..40955326 100644
--- a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-Install_t_Install.t
+++ b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-Install_t_Install.t
diff --git a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm
index 189762cd..189762cd 100644
--- a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm
+++ b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Any.pm
diff --git a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t
index a7ae2c38..a7ae2c38 100644
--- a/test-ports/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t
+++ b/test-ports/default/lang/perl5.28/files/patch-cpan_ExtUtils-MakeMaker_t_INST__PREFIX.t
diff --git a/test-ports/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/test-ports/default/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
index cf800afb..cf800afb 100644
--- a/test-ports/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
+++ b/test-ports/default/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
diff --git a/test-ports/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm b/test-ports/default/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm
index 7fe2fa24..7fe2fa24 100644
--- a/test-ports/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm
+++ b/test-ports/default/lang/perl5.28/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm
diff --git a/test-ports/lang/perl5.28/files/patch-ext_GDBM__File_t_fatal.t b/test-ports/default/lang/perl5.28/files/patch-ext_GDBM__File_t_fatal.t
index ac10b767..ac10b767 100644
--- a/test-ports/lang/perl5.28/files/patch-ext_GDBM__File_t_fatal.t
+++ b/test-ports/default/lang/perl5.28/files/patch-ext_GDBM__File_t_fatal.t
diff --git a/test-ports/lang/perl5.28/files/patch-hints_freebsd.sh b/test-ports/default/lang/perl5.28/files/patch-hints_freebsd.sh
index b2e82205..b2e82205 100644
--- a/test-ports/lang/perl5.28/files/patch-hints_freebsd.sh
+++ b/test-ports/default/lang/perl5.28/files/patch-hints_freebsd.sh
diff --git a/test-ports/lang/perl5.28/files/patch-perl.c b/test-ports/default/lang/perl5.28/files/patch-perl.c
index 6ea19501..6ea19501 100644
--- a/test-ports/lang/perl5.28/files/patch-perl.c
+++ b/test-ports/default/lang/perl5.28/files/patch-perl.c
diff --git a/test-ports/lang/perl5.28/files/patch-t_porting_customized.dat b/test-ports/default/lang/perl5.28/files/patch-t_porting_customized.dat
index e7a41275..e7a41275 100644
--- a/test-ports/lang/perl5.28/files/patch-t_porting_customized.dat
+++ b/test-ports/default/lang/perl5.28/files/patch-t_porting_customized.dat
diff --git a/test-ports/lang/perl5.28/files/perl-man.conf.in b/test-ports/default/lang/perl5.28/files/perl-man.conf.in
index cbe3a5c5..cbe3a5c5 100644
--- a/test-ports/lang/perl5.28/files/perl-man.conf.in
+++ b/test-ports/default/lang/perl5.28/files/perl-man.conf.in
diff --git a/test-ports/lang/perl5.28/pkg-descr b/test-ports/default/lang/perl5.28/pkg-descr
index 0ef0392e..0ef0392e 100644
--- a/test-ports/lang/perl5.28/pkg-descr
+++ b/test-ports/default/lang/perl5.28/pkg-descr
diff --git a/test-ports/lang/perl5.28/pkg-message b/test-ports/default/lang/perl5.28/pkg-message
index 751268e6..751268e6 100644
--- a/test-ports/lang/perl5.28/pkg-message
+++ b/test-ports/default/lang/perl5.28/pkg-message
diff --git a/test-ports/lang/perl5.28/pkg-plist b/test-ports/default/lang/perl5.28/pkg-plist
index 26eb6b7a..26eb6b7a 100644
--- a/test-ports/lang/perl5.28/pkg-plist
+++ b/test-ports/default/lang/perl5.28/pkg-plist
diff --git a/test-ports/lang/perl5.28/version.mk b/test-ports/default/lang/perl5.28/version.mk
index 04888740..04888740 100644
--- a/test-ports/lang/perl5.28/version.mk
+++ b/test-ports/default/lang/perl5.28/version.mk
diff --git a/test-ports/lang/python/Makefile b/test-ports/default/lang/python/Makefile
index 8b7e4029..8b7e4029 100644
--- a/test-ports/lang/python/Makefile
+++ b/test-ports/default/lang/python/Makefile
diff --git a/test-ports/lang/python/pkg-descr b/test-ports/default/lang/python/pkg-descr
index 2468bfb8..2468bfb8 100644
--- a/test-ports/lang/python/pkg-descr
+++ b/test-ports/default/lang/python/pkg-descr
diff --git a/test-ports/lang/python2/Makefile b/test-ports/default/lang/python2/Makefile
index 562e3d0c..562e3d0c 100644
--- a/test-ports/lang/python2/Makefile
+++ b/test-ports/default/lang/python2/Makefile
diff --git a/test-ports/lang/python2/pkg-descr b/test-ports/default/lang/python2/pkg-descr
index bfed22ea..bfed22ea 100644
--- a/test-ports/lang/python2/pkg-descr
+++ b/test-ports/default/lang/python2/pkg-descr
diff --git a/test-ports/lang/python27/Makefile b/test-ports/default/lang/python27/Makefile
index f3533007..f3533007 100644
--- a/test-ports/lang/python27/Makefile
+++ b/test-ports/default/lang/python27/Makefile
diff --git a/test-ports/lang/python27/Makefile.version b/test-ports/default/lang/python27/Makefile.version
index 4e011efe..4e011efe 100644
--- a/test-ports/lang/python27/Makefile.version
+++ b/test-ports/default/lang/python27/Makefile.version
diff --git a/test-ports/lang/python27/distinfo b/test-ports/default/lang/python27/distinfo
index 5e0485f2..5e0485f2 100644
--- a/test-ports/lang/python27/distinfo
+++ b/test-ports/default/lang/python27/distinfo
diff --git a/test-ports/lang/python27/files/patch-Doc__library__fcntl.rst b/test-ports/default/lang/python27/files/patch-Doc__library__fcntl.rst
index 7aa39700..7aa39700 100644
--- a/test-ports/lang/python27/files/patch-Doc__library__fcntl.rst
+++ b/test-ports/default/lang/python27/files/patch-Doc__library__fcntl.rst
diff --git a/test-ports/lang/python27/files/patch-Lib_distutils_command_build__scripts.py b/test-ports/default/lang/python27/files/patch-Lib_distutils_command_build__scripts.py
index 78b3dd6e..78b3dd6e 100644
--- a/test-ports/lang/python27/files/patch-Lib_distutils_command_build__scripts.py
+++ b/test-ports/default/lang/python27/files/patch-Lib_distutils_command_build__scripts.py
diff --git a/test-ports/lang/python27/files/patch-Lib_distutils_command_install__lib.py b/test-ports/default/lang/python27/files/patch-Lib_distutils_command_install__lib.py
index f7dfb21c..f7dfb21c 100644
--- a/test-ports/lang/python27/files/patch-Lib_distutils_command_install__lib.py
+++ b/test-ports/default/lang/python27/files/patch-Lib_distutils_command_install__lib.py
diff --git a/test-ports/lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py b/test-ports/default/lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py
index 9313cf2e..9313cf2e 100644
--- a/test-ports/lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py
+++ b/test-ports/default/lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py
diff --git a/test-ports/lang/python27/files/patch-Makefile.pre.in b/test-ports/default/lang/python27/files/patch-Makefile.pre.in
index cf540acf..cf540acf 100644
--- a/test-ports/lang/python27/files/patch-Makefile.pre.in
+++ b/test-ports/default/lang/python27/files/patch-Makefile.pre.in
diff --git a/test-ports/lang/python27/files/patch-Misc_python-config.in b/test-ports/default/lang/python27/files/patch-Misc_python-config.in
index 3390fc6d..3390fc6d 100644
--- a/test-ports/lang/python27/files/patch-Misc_python-config.in
+++ b/test-ports/default/lang/python27/files/patch-Misc_python-config.in
diff --git a/test-ports/lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c b/test-ports/default/lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
index 43195847..43195847 100644
--- a/test-ports/lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
+++ b/test-ports/default/lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
diff --git a/test-ports/lang/python27/files/patch-Modules__fcntlmodule.c b/test-ports/default/lang/python27/files/patch-Modules__fcntlmodule.c
index 8bda9f62..8bda9f62 100644
--- a/test-ports/lang/python27/files/patch-Modules__fcntlmodule.c
+++ b/test-ports/default/lang/python27/files/patch-Modules__fcntlmodule.c
diff --git a/test-ports/lang/python27/files/patch-pr192365 b/test-ports/default/lang/python27/files/patch-pr192365
index 5f4fbcdc..5f4fbcdc 100644
--- a/test-ports/lang/python27/files/patch-pr192365
+++ b/test-ports/default/lang/python27/files/patch-pr192365
diff --git a/test-ports/lang/python27/files/patch-setup.py b/test-ports/default/lang/python27/files/patch-setup.py
index e3223582..e3223582 100644
--- a/test-ports/lang/python27/files/patch-setup.py
+++ b/test-ports/default/lang/python27/files/patch-setup.py
diff --git a/test-ports/lang/python27/pkg-descr b/test-ports/default/lang/python27/pkg-descr
index 9c7e5a6d..9c7e5a6d 100644
--- a/test-ports/lang/python27/pkg-descr
+++ b/test-ports/default/lang/python27/pkg-descr
diff --git a/test-ports/lang/python27/pkg-message b/test-ports/default/lang/python27/pkg-message
index f9135973..f9135973 100644
--- a/test-ports/lang/python27/pkg-message
+++ b/test-ports/default/lang/python27/pkg-message
diff --git a/test-ports/lang/python27/pkg-plist b/test-ports/default/lang/python27/pkg-plist
index 632eb10d..632eb10d 100644
--- a/test-ports/lang/python27/pkg-plist
+++ b/test-ports/default/lang/python27/pkg-plist
diff --git a/test-ports/lang/python3/Makefile b/test-ports/default/lang/python3/Makefile
index a31c2f39..a31c2f39 100644
--- a/test-ports/lang/python3/Makefile
+++ b/test-ports/default/lang/python3/Makefile
diff --git a/test-ports/lang/python3/pkg-descr b/test-ports/default/lang/python3/pkg-descr
index c2915480..c2915480 100644
--- a/test-ports/lang/python3/pkg-descr
+++ b/test-ports/default/lang/python3/pkg-descr
diff --git a/test-ports/lang/python35/Makefile b/test-ports/default/lang/python35/Makefile
index 43b491ef..43b491ef 100644
--- a/test-ports/lang/python35/Makefile
+++ b/test-ports/default/lang/python35/Makefile
diff --git a/test-ports/lang/python35/Makefile.version b/test-ports/default/lang/python35/Makefile.version
index 9d3fe2ad..9d3fe2ad 100644
--- a/test-ports/lang/python35/Makefile.version
+++ b/test-ports/default/lang/python35/Makefile.version
diff --git a/test-ports/lang/python35/distinfo b/test-ports/default/lang/python35/distinfo
index a629315a..a629315a 100644
--- a/test-ports/lang/python35/distinfo
+++ b/test-ports/default/lang/python35/distinfo
diff --git a/test-ports/lang/python35/files/patch-Lib_distutils_command_install__lib.py b/test-ports/default/lang/python35/files/patch-Lib_distutils_command_install__lib.py
index 6e925311..6e925311 100644
--- a/test-ports/lang/python35/files/patch-Lib_distutils_command_install__lib.py
+++ b/test-ports/default/lang/python35/files/patch-Lib_distutils_command_install__lib.py
diff --git a/test-ports/lang/python35/files/patch-Lib_distutils_tests_test__install__lib.py b/test-ports/default/lang/python35/files/patch-Lib_distutils_tests_test__install__lib.py
index c5531b92..c5531b92 100644
--- a/test-ports/lang/python35/files/patch-Lib_distutils_tests_test__install__lib.py
+++ b/test-ports/default/lang/python35/files/patch-Lib_distutils_tests_test__install__lib.py
diff --git a/test-ports/lang/python35/files/patch-Makefile.pre.in b/test-ports/default/lang/python35/files/patch-Makefile.pre.in
index 653f3892..653f3892 100644
--- a/test-ports/lang/python35/files/patch-Makefile.pre.in
+++ b/test-ports/default/lang/python35/files/patch-Makefile.pre.in
diff --git a/test-ports/lang/python35/files/patch-Misc__python-config.sh.in b/test-ports/default/lang/python35/files/patch-Misc__python-config.sh.in
index ebb0c6a5..ebb0c6a5 100644
--- a/test-ports/lang/python35/files/patch-Misc__python-config.sh.in
+++ b/test-ports/default/lang/python35/files/patch-Misc__python-config.sh.in
diff --git a/test-ports/lang/python35/files/patch-Modules___ctypes__libffi__src__arm__ffi.c b/test-ports/default/lang/python35/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
index 56e43427..56e43427 100644
--- a/test-ports/lang/python35/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
+++ b/test-ports/default/lang/python35/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
diff --git a/test-ports/lang/python35/files/patch-issue20210 b/test-ports/default/lang/python35/files/patch-issue20210
index 90330d8f..90330d8f 100644
--- a/test-ports/lang/python35/files/patch-issue20210
+++ b/test-ports/default/lang/python35/files/patch-issue20210
diff --git a/test-ports/lang/python35/files/patch-issue30622 b/test-ports/default/lang/python35/files/patch-issue30622
index 4a0295a0..4a0295a0 100644
--- a/test-ports/lang/python35/files/patch-issue30622
+++ b/test-ports/default/lang/python35/files/patch-issue30622
diff --git a/test-ports/lang/python35/files/patch-issue33127 b/test-ports/default/lang/python35/files/patch-issue33127
index 0e34cd38..0e34cd38 100644
--- a/test-ports/lang/python35/files/patch-issue33127
+++ b/test-ports/default/lang/python35/files/patch-issue33127
diff --git a/test-ports/lang/python35/files/pkg-message.in b/test-ports/default/lang/python35/files/pkg-message.in
index 5fb6e462..5fb6e462 100644
--- a/test-ports/lang/python35/files/pkg-message.in
+++ b/test-ports/default/lang/python35/files/pkg-message.in
diff --git a/test-ports/lang/python35/pkg-descr b/test-ports/default/lang/python35/pkg-descr
index 9c7e5a6d..9c7e5a6d 100644
--- a/test-ports/lang/python35/pkg-descr
+++ b/test-ports/default/lang/python35/pkg-descr
diff --git a/test-ports/lang/python35/pkg-plist b/test-ports/default/lang/python35/pkg-plist
index 01e56dc8..01e56dc8 100644
--- a/test-ports/lang/python35/pkg-plist
+++ b/test-ports/default/lang/python35/pkg-plist
diff --git a/test-ports/lang/python36/Makefile b/test-ports/default/lang/python36/Makefile
index 931dd499..931dd499 100644
--- a/test-ports/lang/python36/Makefile
+++ b/test-ports/default/lang/python36/Makefile
diff --git a/test-ports/lang/python36/Makefile.version b/test-ports/default/lang/python36/Makefile.version
index bad7f670..bad7f670 100644
--- a/test-ports/lang/python36/Makefile.version
+++ b/test-ports/default/lang/python36/Makefile.version
diff --git a/test-ports/lang/python36/distinfo b/test-ports/default/lang/python36/distinfo
index 94fb89a7..94fb89a7 100644
--- a/test-ports/lang/python36/distinfo
+++ b/test-ports/default/lang/python36/distinfo
diff --git a/test-ports/lang/python36/files/patch-Lib_distutils_command_install__lib.py b/test-ports/default/lang/python36/files/patch-Lib_distutils_command_install__lib.py
index 6e925311..6e925311 100644
--- a/test-ports/lang/python36/files/patch-Lib_distutils_command_install__lib.py
+++ b/test-ports/default/lang/python36/files/patch-Lib_distutils_command_install__lib.py
diff --git a/test-ports/lang/python36/files/patch-Lib_distutils_tests_test__install__lib.py b/test-ports/default/lang/python36/files/patch-Lib_distutils_tests_test__install__lib.py
index c5531b92..c5531b92 100644
--- a/test-ports/lang/python36/files/patch-Lib_distutils_tests_test__install__lib.py
+++ b/test-ports/default/lang/python36/files/patch-Lib_distutils_tests_test__install__lib.py
diff --git a/test-ports/lang/python36/files/patch-Makefile.pre.in b/test-ports/default/lang/python36/files/patch-Makefile.pre.in
index 28d38652..28d38652 100644
--- a/test-ports/lang/python36/files/patch-Makefile.pre.in
+++ b/test-ports/default/lang/python36/files/patch-Makefile.pre.in
diff --git a/test-ports/lang/python36/files/patch-Misc__python-config.sh.in b/test-ports/default/lang/python36/files/patch-Misc__python-config.sh.in
index ebb0c6a5..ebb0c6a5 100644
--- a/test-ports/lang/python36/files/patch-Misc__python-config.sh.in
+++ b/test-ports/default/lang/python36/files/patch-Misc__python-config.sh.in
diff --git a/test-ports/lang/python36/files/patch-Modules___ctypes__libffi__src__arm__ffi.c b/test-ports/default/lang/python36/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
index 56e43427..56e43427 100644
--- a/test-ports/lang/python36/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
+++ b/test-ports/default/lang/python36/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
diff --git a/test-ports/lang/python36/files/patch-issue20210 b/test-ports/default/lang/python36/files/patch-issue20210
index 90330d8f..90330d8f 100644
--- a/test-ports/lang/python36/files/patch-issue20210
+++ b/test-ports/default/lang/python36/files/patch-issue20210
diff --git a/test-ports/lang/python36/files/pkg-message.in b/test-ports/default/lang/python36/files/pkg-message.in
index 5fb6e462..5fb6e462 100644
--- a/test-ports/lang/python36/files/pkg-message.in
+++ b/test-ports/default/lang/python36/files/pkg-message.in
diff --git a/test-ports/lang/python36/pkg-descr b/test-ports/default/lang/python36/pkg-descr
index 9c7e5a6d..9c7e5a6d 100644
--- a/test-ports/lang/python36/pkg-descr
+++ b/test-ports/default/lang/python36/pkg-descr
diff --git a/test-ports/lang/python36/pkg-plist b/test-ports/default/lang/python36/pkg-plist
index 8352405c..8352405c 100644
--- a/test-ports/lang/python36/pkg-plist
+++ b/test-ports/default/lang/python36/pkg-plist
diff --git a/test-ports/lang/python37/Makefile b/test-ports/default/lang/python37/Makefile
index 749a05d5..749a05d5 100644
--- a/test-ports/lang/python37/Makefile
+++ b/test-ports/default/lang/python37/Makefile
diff --git a/test-ports/lang/python37/Makefile.version b/test-ports/default/lang/python37/Makefile.version
index 91e9e4c3..91e9e4c3 100644
--- a/test-ports/lang/python37/Makefile.version
+++ b/test-ports/default/lang/python37/Makefile.version
diff --git a/test-ports/lang/python37/distinfo b/test-ports/default/lang/python37/distinfo
index 49094cc6..49094cc6 100644
--- a/test-ports/lang/python37/distinfo
+++ b/test-ports/default/lang/python37/distinfo
diff --git a/test-ports/lang/python37/files/patch-Lib_distutils_command_install__lib.py b/test-ports/default/lang/python37/files/patch-Lib_distutils_command_install__lib.py
index 6e925311..6e925311 100644
--- a/test-ports/lang/python37/files/patch-Lib_distutils_command_install__lib.py
+++ b/test-ports/default/lang/python37/files/patch-Lib_distutils_command_install__lib.py
diff --git a/test-ports/lang/python37/files/patch-Lib_distutils_tests_test__install__lib.py b/test-ports/default/lang/python37/files/patch-Lib_distutils_tests_test__install__lib.py
index c5531b92..c5531b92 100644
--- a/test-ports/lang/python37/files/patch-Lib_distutils_tests_test__install__lib.py
+++ b/test-ports/default/lang/python37/files/patch-Lib_distutils_tests_test__install__lib.py
diff --git a/test-ports/lang/python37/files/patch-Makefile.pre.in b/test-ports/default/lang/python37/files/patch-Makefile.pre.in
index 6db68756..6db68756 100644
--- a/test-ports/lang/python37/files/patch-Makefile.pre.in
+++ b/test-ports/default/lang/python37/files/patch-Makefile.pre.in
diff --git a/test-ports/lang/python37/files/patch-Misc__python-config.sh.in b/test-ports/default/lang/python37/files/patch-Misc__python-config.sh.in
index ebb0c6a5..ebb0c6a5 100644
--- a/test-ports/lang/python37/files/patch-Misc__python-config.sh.in
+++ b/test-ports/default/lang/python37/files/patch-Misc__python-config.sh.in
diff --git a/test-ports/lang/python37/files/patch-issue20210 b/test-ports/default/lang/python37/files/patch-issue20210
index 90330d8f..90330d8f 100644
--- a/test-ports/lang/python37/files/patch-issue20210
+++ b/test-ports/default/lang/python37/files/patch-issue20210
diff --git a/test-ports/lang/python37/files/pkg-message.in b/test-ports/default/lang/python37/files/pkg-message.in
index 5fb6e462..5fb6e462 100644
--- a/test-ports/lang/python37/files/pkg-message.in
+++ b/test-ports/default/lang/python37/files/pkg-message.in
diff --git a/test-ports/lang/python37/pkg-descr b/test-ports/default/lang/python37/pkg-descr
index 9c7e5a6d..9c7e5a6d 100644
--- a/test-ports/lang/python37/pkg-descr
+++ b/test-ports/default/lang/python37/pkg-descr
diff --git a/test-ports/lang/python37/pkg-plist b/test-ports/default/lang/python37/pkg-plist
index ef52de03..ef52de03 100644
--- a/test-ports/lang/python37/pkg-plist
+++ b/test-ports/default/lang/python37/pkg-plist
diff --git a/test-ports/misc/Makefile b/test-ports/default/misc/Makefile
index 446d6f8a..446d6f8a 100644
--- a/test-ports/misc/Makefile
+++ b/test-ports/default/misc/Makefile
diff --git a/test-ports/misc/foo/Makefile b/test-ports/default/misc/foo/Makefile
index 9a5c3bf7..9a5c3bf7 100644
--- a/test-ports/misc/foo/Makefile
+++ b/test-ports/default/misc/foo/Makefile
diff --git a/test-ports/misc/foo/pkg-descr b/test-ports/default/misc/foo/pkg-descr
index c5d831eb..c5d831eb 100644
--- a/test-ports/misc/foo/pkg-descr
+++ b/test-ports/default/misc/foo/pkg-descr
diff --git a/test-ports/misc/foo/pkg-plist b/test-ports/default/misc/foo/pkg-plist
index cb59bff2..cb59bff2 100644
--- a/test-ports/misc/foo/pkg-plist
+++ b/test-ports/default/misc/foo/pkg-plist
diff --git a/test-ports/misc/freebsd-release-manifests/Makefile b/test-ports/default/misc/freebsd-release-manifests/Makefile
index aaffa7f3..aaffa7f3 100644
--- a/test-ports/misc/freebsd-release-manifests/Makefile
+++ b/test-ports/default/misc/freebsd-release-manifests/Makefile
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.0-RELEASE
index 531600a1..531600a1 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.1-RELEASE
index 260e91a2..260e91a2 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.2-RELEASE
index 3f48282c..3f48282c 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.3-RELEASE
index 638202cf..638202cf 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-10.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.0-RELEASE
index 3b677a0c..3b677a0c 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.0-RELEASE
index f5d1589f..f5d1589f 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.1-RELEASE
index fa9bd1d9..fa9bd1d9 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.2-RELEASE
index a9afb6a9..a9afb6a9 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.3-RELEASE
index 03edc86e..03edc86e 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-9.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.0-RELEASE
index d8181485..d8181485 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.0-RELEASE
index 9ec47e86..9ec47e86 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.1-RELEASE
index 21d8f728..21d8f728 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.2-RELEASE
index ecae386f..ecae386f 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.3-RELEASE
index 20e84835..20e84835 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-10.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.0-RELEASE
index 7e04a6de..7e04a6de 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.0-RELEASE
index 8d9d22da..8d9d22da 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.1-RELEASE
index d02bb341..d02bb341 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.2-RELEASE
index 3b87c438..3b87c438 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.3-RELEASE
index b1105079..b1105079 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-9.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.0-RELEASE
index e0766022..e0766022 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.1-RELEASE
index a6d2d477..a6d2d477 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.2-RELEASE
index 2576ba77..2576ba77 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.3-RELEASE
index 634745d9..634745d9 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-10.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.0-RELEASE
index 303145a3..303145a3 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.2-RELEASE
index e2a2ea3e..e2a2ea3e 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.3-RELEASE
index 3da29e58..3da29e58 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/ia64-ia64-9.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.0-RELEASE
index a35ed49e..a35ed49e 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.1-RELEASE
index 149fbae5..149fbae5 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.2-RELEASE
index 64d3db1e..64d3db1e 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.3-RELEASE
index fff28eb8..fff28eb8 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-10.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.0-RELEASE
index 6cf0c046..6cf0c046 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.0-RELEASE
index c331908a..c331908a 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.2-RELEASE
index 32bca502..32bca502 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.3-RELEASE
index 436960bd..436960bd 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-9.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
index 85bc3fc9..85bc3fc9 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
index a9fe8473..a9fe8473 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
index 20f12bfc..20f12bfc 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
index 5b1fc8e4..5b1fc8e4 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
index 7404f29c..7404f29c 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
index f7382db4..f7382db4 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
index 0df90e90..0df90e90 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
index ed757c21..ed757c21 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
index 4b9f5bdb..4b9f5bdb 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.0-RELEASE
index 6d93beaa..6d93beaa 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.1-RELEASE
index ab1d2c42..ab1d2c42 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.2-RELEASE
index dde47622..dde47622 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.3-RELEASE
index 7cfff614..7cfff614 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-10.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.0-RELEASE
index e29ea53e..e29ea53e 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.0-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.0-RELEASE
index fd2888c5..fd2888c5 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.0-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.0-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.1-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.1-RELEASE
index 639d128d..639d128d 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.1-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.1-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.2-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.2-RELEASE
index 8b1f96dd..8b1f96dd 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.2-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.2-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.3-RELEASE b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.3-RELEASE
index fbab0af5..fbab0af5 100644
--- a/test-ports/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.3-RELEASE
+++ b/test-ports/default/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-9.3-RELEASE
diff --git a/test-ports/misc/freebsd-release-manifests/pkg-descr b/test-ports/default/misc/freebsd-release-manifests/pkg-descr
index c5d831eb..c5d831eb 100644
--- a/test-ports/misc/freebsd-release-manifests/pkg-descr
+++ b/test-ports/default/misc/freebsd-release-manifests/pkg-descr
diff --git a/test-ports/misc/freebsd-release-manifests/pkg-plist b/test-ports/default/misc/freebsd-release-manifests/pkg-plist
index cb59bff2..cb59bff2 100644
--- a/test-ports/misc/freebsd-release-manifests/pkg-plist
+++ b/test-ports/default/misc/freebsd-release-manifests/pkg-plist
diff --git a/test-ports/misc/help2man/Makefile b/test-ports/default/misc/help2man/Makefile
index 49c0024f..49c0024f 100644
--- a/test-ports/misc/help2man/Makefile
+++ b/test-ports/default/misc/help2man/Makefile
diff --git a/test-ports/misc/help2man/blah b/test-ports/default/misc/help2man/blah
index 0d4e99d6..0d4e99d6 100644
--- a/test-ports/misc/help2man/blah
+++ b/test-ports/default/misc/help2man/blah
diff --git a/test-ports/misc/help2man/distinfo b/test-ports/default/misc/help2man/distinfo
index 5ff4a243..5ff4a243 100644
--- a/test-ports/misc/help2man/distinfo
+++ b/test-ports/default/misc/help2man/distinfo
diff --git a/test-ports/misc/help2man/pkg-descr b/test-ports/default/misc/help2man/pkg-descr
index 93303ddb..93303ddb 100644
--- a/test-ports/misc/help2man/pkg-descr
+++ b/test-ports/default/misc/help2man/pkg-descr
diff --git a/test-ports/ports-mgmt/Makefile b/test-ports/default/ports-mgmt/Makefile
index da3e49d4..da3e49d4 100644
--- a/test-ports/ports-mgmt/Makefile
+++ b/test-ports/default/ports-mgmt/Makefile
diff --git a/test-ports/ports-mgmt/pkg/Makefile b/test-ports/default/ports-mgmt/pkg/Makefile
index 25b137d3..25b137d3 100644
--- a/test-ports/ports-mgmt/pkg/Makefile
+++ b/test-ports/default/ports-mgmt/pkg/Makefile
diff --git a/test-ports/ports-mgmt/pkg/distinfo b/test-ports/default/ports-mgmt/pkg/distinfo
index f87080ed..f87080ed 100644
--- a/test-ports/ports-mgmt/pkg/distinfo
+++ b/test-ports/default/ports-mgmt/pkg/distinfo
diff --git a/test-ports/ports-mgmt/pkg/files/extra-patch-docs_pkg.8 b/test-ports/default/ports-mgmt/pkg/files/extra-patch-docs_pkg.8
index afd5e9d4..afd5e9d4 100644
--- a/test-ports/ports-mgmt/pkg/files/extra-patch-docs_pkg.8
+++ b/test-ports/default/ports-mgmt/pkg/files/extra-patch-docs_pkg.8
diff --git a/test-ports/ports-mgmt/pkg/files/patch-javavmwrapper b/test-ports/default/ports-mgmt/pkg/files/patch-javavmwrapper
index 1d3c37c0..1d3c37c0 100644
--- a/test-ports/ports-mgmt/pkg/files/patch-javavmwrapper
+++ b/test-ports/default/ports-mgmt/pkg/files/patch-javavmwrapper
diff --git a/test-ports/ports-mgmt/pkg/pkg-descr b/test-ports/default/ports-mgmt/pkg/pkg-descr
index 532c3086..532c3086 100644
--- a/test-ports/ports-mgmt/pkg/pkg-descr
+++ b/test-ports/default/ports-mgmt/pkg/pkg-descr
diff --git a/test-ports/ports-mgmt/pkg/pkg-plist b/test-ports/default/ports-mgmt/pkg/pkg-plist
index 34e25664..34e25664 100644
--- a/test-ports/ports-mgmt/pkg/pkg-plist
+++ b/test-ports/default/ports-mgmt/pkg/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/Makefile
index 4bb55e0a..4bb55e0a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED-and-skipped/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/Makefile
index 9b35f44c..9b35f44c 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-IGNORED/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-IGNORED/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-IGNORED/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/Makefile
index 95d17c05..95d17c05 100644
--- a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-bad-dep_args/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-bad-dep_args/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/Makefile
index eef44f46..eef44f46 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-DEFAULT/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/Makefile
index 95289416..95289416 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-FOO/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-FOO/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/Makefile
index 1199ba3a..1199ba3a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-IGNORED/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/Makefile
index 21e58c6f..21e58c6f 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep-INVALID/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep-INVALID/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/Makefile b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/Makefile
index 57181c5c..57181c5c 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/distinfo b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel-dep2-IGNORED/pkg-plist
diff --git a/test-ports/ports-mgmt/poudriere-devel/Makefile b/test-ports/default/ports-mgmt/poudriere-devel/Makefile
index af0e0618..af0e0618 100644
--- a/test-ports/ports-mgmt/poudriere-devel/Makefile
+++ b/test-ports/default/ports-mgmt/poudriere-devel/Makefile
diff --git a/test-ports/ports-mgmt/poudriere-devel/distinfo b/test-ports/default/ports-mgmt/poudriere-devel/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/poudriere-devel/distinfo
+++ b/test-ports/default/ports-mgmt/poudriere-devel/distinfo
diff --git a/test-ports/ports-mgmt/poudriere-devel/pkg-descr b/test-ports/default/ports-mgmt/poudriere-devel/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/poudriere-devel/pkg-descr
+++ b/test-ports/default/ports-mgmt/poudriere-devel/pkg-descr
diff --git a/test-ports/ports-mgmt/poudriere-devel/pkg-plist b/test-ports/default/ports-mgmt/poudriere-devel/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/poudriere-devel/pkg-plist
+++ b/test-ports/default/ports-mgmt/poudriere-devel/pkg-plist
diff --git a/test-ports/ports-mgmt/yyyy/Makefile b/test-ports/default/ports-mgmt/yyyy/Makefile
index 74b0cdf8..74b0cdf8 100644
--- a/test-ports/ports-mgmt/yyyy/Makefile
+++ b/test-ports/default/ports-mgmt/yyyy/Makefile
diff --git a/test-ports/ports-mgmt/yyyy/distinfo b/test-ports/default/ports-mgmt/yyyy/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/yyyy/distinfo
+++ b/test-ports/default/ports-mgmt/yyyy/distinfo
diff --git a/test-ports/ports-mgmt/yyyy/pkg-descr b/test-ports/default/ports-mgmt/yyyy/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/yyyy/pkg-descr
+++ b/test-ports/default/ports-mgmt/yyyy/pkg-descr
diff --git a/test-ports/ports-mgmt/yyyy/pkg-plist b/test-ports/default/ports-mgmt/yyyy/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/yyyy/pkg-plist
+++ b/test-ports/default/ports-mgmt/yyyy/pkg-plist
diff --git a/test-ports/ports-mgmt/zzzz/Makefile b/test-ports/default/ports-mgmt/zzzz/Makefile
index 9fdcca13..9fdcca13 100644
--- a/test-ports/ports-mgmt/zzzz/Makefile
+++ b/test-ports/default/ports-mgmt/zzzz/Makefile
diff --git a/test-ports/ports-mgmt/zzzz/distinfo b/test-ports/default/ports-mgmt/zzzz/distinfo
index ae627c4a..ae627c4a 100644
--- a/test-ports/ports-mgmt/zzzz/distinfo
+++ b/test-ports/default/ports-mgmt/zzzz/distinfo
diff --git a/test-ports/ports-mgmt/zzzz/pkg-descr b/test-ports/default/ports-mgmt/zzzz/pkg-descr
index 3e950072..3e950072 100644
--- a/test-ports/ports-mgmt/zzzz/pkg-descr
+++ b/test-ports/default/ports-mgmt/zzzz/pkg-descr
diff --git a/test-ports/ports-mgmt/zzzz/pkg-plist b/test-ports/default/ports-mgmt/zzzz/pkg-plist
index b271ff6a..b271ff6a 100644
--- a/test-ports/ports-mgmt/zzzz/pkg-plist
+++ b/test-ports/default/ports-mgmt/zzzz/pkg-plist
diff --git a/test-ports/print/Makefile b/test-ports/default/print/Makefile
index cf12a856..cf12a856 100644
--- a/test-ports/print/Makefile
+++ b/test-ports/default/print/Makefile
diff --git a/test-ports/print/indexinfo/Makefile b/test-ports/default/print/indexinfo/Makefile
index a4c586ae..a4c586ae 100644
--- a/test-ports/print/indexinfo/Makefile
+++ b/test-ports/default/print/indexinfo/Makefile
diff --git a/test-ports/print/indexinfo/distinfo b/test-ports/default/print/indexinfo/distinfo
index 2a98d961..2a98d961 100644
--- a/test-ports/print/indexinfo/distinfo
+++ b/test-ports/default/print/indexinfo/distinfo
diff --git a/test-ports/print/indexinfo/pkg-descr b/test-ports/default/print/indexinfo/pkg-descr
index 2536f1c3..2536f1c3 100644
--- a/test-ports/print/indexinfo/pkg-descr
+++ b/test-ports/default/print/indexinfo/pkg-descr
diff --git a/test-ports/print/texinfo/Makefile b/test-ports/default/print/texinfo/Makefile
index ba96ecee..ba96ecee 100644
--- a/test-ports/print/texinfo/Makefile
+++ b/test-ports/default/print/texinfo/Makefile
diff --git a/test-ports/print/texinfo/distinfo b/test-ports/default/print/texinfo/distinfo
index dd883d97..dd883d97 100644
--- a/test-ports/print/texinfo/distinfo
+++ b/test-ports/default/print/texinfo/distinfo
diff --git a/test-ports/print/texinfo/pkg-descr b/test-ports/default/print/texinfo/pkg-descr
index b3f80cab..b3f80cab 100644
--- a/test-ports/print/texinfo/pkg-descr
+++ b/test-ports/default/print/texinfo/pkg-descr
diff --git a/test-ports/print/texinfo/pkg-install b/test-ports/default/print/texinfo/pkg-install
index 651e85bd..651e85bd 100644
--- a/test-ports/print/texinfo/pkg-install
+++ b/test-ports/default/print/texinfo/pkg-install
diff --git a/test-ports/print/texinfo/pkg-plist b/test-ports/default/print/texinfo/pkg-plist
index 767619ea..767619ea 100644
--- a/test-ports/print/texinfo/pkg-plist
+++ b/test-ports/default/print/texinfo/pkg-plist
diff --git a/test-ports/security/Makefile b/test-ports/default/security/Makefile
index 377c974e..377c974e 100644
--- a/test-ports/security/Makefile
+++ b/test-ports/default/security/Makefile
diff --git a/test-ports/security/openssl/Makefile b/test-ports/default/security/openssl/Makefile
index 462d1d09..462d1d09 100644
--- a/test-ports/security/openssl/Makefile
+++ b/test-ports/default/security/openssl/Makefile
diff --git a/test-ports/security/openssl/distinfo b/test-ports/default/security/openssl/distinfo
index 84004464..84004464 100644
--- a/test-ports/security/openssl/distinfo
+++ b/test-ports/default/security/openssl/distinfo
diff --git a/test-ports/security/openssl/files/extra-patch-test_testssl b/test-ports/default/security/openssl/files/extra-patch-test_testssl
index 3fc5d794..3fc5d794 100644
--- a/test-ports/security/openssl/files/extra-patch-test_testssl
+++ b/test-ports/default/security/openssl/files/extra-patch-test_testssl
diff --git a/test-ports/security/openssl/files/patch-Configure b/test-ports/default/security/openssl/files/patch-Configure
index bea63f06..bea63f06 100644
--- a/test-ports/security/openssl/files/patch-Configure
+++ b/test-ports/default/security/openssl/files/patch-Configure
diff --git a/test-ports/security/openssl/files/patch-Makefile b/test-ports/default/security/openssl/files/patch-Makefile
index 77e810e4..77e810e4 100644
--- a/test-ports/security/openssl/files/patch-Makefile
+++ b/test-ports/default/security/openssl/files/patch-Makefile
diff --git a/test-ports/security/openssl/files/patch-RFC-5705 b/test-ports/default/security/openssl/files/patch-RFC-5705
index 7138cdf2..7138cdf2 100644
--- a/test-ports/security/openssl/files/patch-RFC-5705
+++ b/test-ports/default/security/openssl/files/patch-RFC-5705
diff --git a/test-ports/security/openssl/files/patch-apps_s__client.c b/test-ports/default/security/openssl/files/patch-apps_s__client.c
index 05ba211a..05ba211a 100644
--- a/test-ports/security/openssl/files/patch-apps_s__client.c
+++ b/test-ports/default/security/openssl/files/patch-apps_s__client.c
diff --git a/test-ports/security/openssl/files/patch-config b/test-ports/default/security/openssl/files/patch-config
index c9d4fa7d..c9d4fa7d 100644
--- a/test-ports/security/openssl/files/patch-config
+++ b/test-ports/default/security/openssl/files/patch-config
diff --git a/test-ports/security/openssl/files/pkg-message.in b/test-ports/default/security/openssl/files/pkg-message.in
index 967964da..967964da 100644
--- a/test-ports/security/openssl/files/pkg-message.in
+++ b/test-ports/default/security/openssl/files/pkg-message.in
diff --git a/test-ports/security/openssl/pkg-descr b/test-ports/default/security/openssl/pkg-descr
index 3d682d8d..3d682d8d 100644
--- a/test-ports/security/openssl/pkg-descr
+++ b/test-ports/default/security/openssl/pkg-descr
diff --git a/test-ports/security/openssl/pkg-plist b/test-ports/default/security/openssl/pkg-plist
index d72e3875..d72e3875 100644
--- a/test-ports/security/openssl/pkg-plist
+++ b/test-ports/default/security/openssl/pkg-plist
diff --git a/test-ports/security/openssl/version.mk b/test-ports/default/security/openssl/version.mk
index 2c0b7b95..2c0b7b95 100644
--- a/test-ports/security/openssl/version.mk
+++ b/test-ports/default/security/openssl/version.mk
diff --git a/test-ports/overlay/Makefile b/test-ports/overlay/Makefile
new file mode 100644
index 00000000..7b88e59e
--- /dev/null
+++ b/test-ports/overlay/Makefile
@@ -0,0 +1 @@
+SUBDIR += misc
diff --git a/test-ports/overlay/misc/Makefile b/test-ports/overlay/misc/Makefile
new file mode 100644
index 00000000..638a5231
--- /dev/null
+++ b/test-ports/overlay/misc/Makefile
@@ -0,0 +1 @@
+SUBDIR += foo
diff --git a/test-ports/overlay/misc/foo/Makefile b/test-ports/overlay/misc/foo/Makefile
new file mode 100644
index 00000000..b749ab4c
--- /dev/null
+++ b/test-ports/overlay/misc/foo/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD: head/misc/freebsd-release-manifests/Makefile 429892 2016-12-29 12:41:04Z mat $
+
+PORTNAME=	foo
+DISTVERSION=	20161010
+PORTREVISION=	0
+PKGNAMESUFFIX=	-OVERLAY
+CATEGORIES=	misc
+MASTER_SITES=	#
+DISTFILES=	#
+
+MAINTAINER=	bdrewery@FreeBSD.org
+COMMENT=	FreeBSD release manifests
+
+LICENSE=	BSD2CLAUSE
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+DATADIR=	${PREFIX}/share/freebsd
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/MANIFESTS
+	${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* \
+	    ${STAGEDIR}${DATADIR}/MANIFESTS/
+
+.include <bsd.port.mk>
diff --git a/test-ports/overlay/misc/foo/pkg-descr b/test-ports/overlay/misc/foo/pkg-descr
new file mode 100644
index 00000000..c5d831eb
--- /dev/null
+++ b/test-ports/overlay/misc/foo/pkg-descr
@@ -0,0 +1,3 @@
+MANIFEST files from the FreeBSD release images.
+
+WWW: https://www.FreeBSD.org
diff --git a/test-ports/overlay/misc/foo/pkg-plist b/test-ports/overlay/misc/foo/pkg-plist
new file mode 100644
index 00000000..cb59bff2
--- /dev/null
+++ b/test-ports/overlay/misc/foo/pkg-plist
@@ -0,0 +1,52 @@
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/arm64-aarch64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.0-RELEASE