19 files changed, 711 insertions, 711 deletions
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index ab71031cbcbd..0f04588afbb7 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -25,7 +25,7 @@ include/rpm/rpmfiles.h
 include/rpm/rpmfileutil.h
 include/rpm/rpmio.h
 include/rpm/rpmkeyring.h
-include/rpm/rpm%%LUA_LIBDIR%%.h
+include/rpm/rpmlib.h
 include/rpm/rpmlog.h
 include/rpm/rpmmacro.h
 include/rpm/rpmpgp.h
@@ -46,137 +46,137 @@ include/rpm/rpmtypes.h
 include/rpm/rpmurl.h
 include/rpm/rpmutil.h
 include/rpm/rpmver.h
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.9
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.9.1.2
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.9
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.9.1.2
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.9
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.9.1.2
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.9
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.9.1.2
+lib/librpm.so
+lib/librpm.so.9
+lib/librpm.so.9.1.2
+lib/librpmbuild.so
+lib/librpmbuild.so.9
+lib/librpmbuild.so.9.1.2
+lib/librpmio.so
+lib/librpmio.so.9
+lib/librpmio.so.9.1.2
+lib/librpmsign.so
+lib/librpmsign.so.9
+lib/librpmsign.so.9.1.2
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
-%%LUA_LIBDIR%%/rpm/brp-compress
-%%LUA_LIBDIR%%/rpm/brp-java-gcjcompile
-%%LUA_LIBDIR%%/rpm/brp-python-bytecompile
-%%LUA_LIBDIR%%/rpm/brp-python-hardlink
-%%LUA_LIBDIR%%/rpm/brp-strip
-%%LUA_LIBDIR%%/rpm/brp-strip-comment-note
-%%LUA_LIBDIR%%/rpm/brp-strip-shared
-%%LUA_LIBDIR%%/rpm/brp-strip-static-archive
-%%LUA_LIBDIR%%/rpm/check-buildroot
-%%LUA_LIBDIR%%/rpm/check-files
-%%LUA_LIBDIR%%/rpm/check-prereqs
-%%LUA_LIBDIR%%/rpm/check-rpaths
-%%LUA_LIBDIR%%/rpm/check-rpaths-worker
-%%LUA_LIBDIR%%/rpm/fileattrs/debuginfo.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/desktop.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/elf.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/font.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/%%LUA_LIBDIR%%tool.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/metainfo.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/ocaml.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/perl.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/perl%%LUA_LIBDIR%%.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/pkgconfig.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/python.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/pythondist.attr
-%%LUA_LIBDIR%%/rpm/fileattrs/script.attr
-%%LUA_LIBDIR%%/rpm/find-lang.sh
-%%LUA_LIBDIR%%/rpm/find-provides
-%%LUA_LIBDIR%%/rpm/find-requires
-%%LUA_LIBDIR%%/rpm/fontconfig.prov
-%%LUA_LIBDIR%%/rpm/%%LUA_LIBDIR%%tooldeps.sh
-%%LUA_LIBDIR%%/rpm/macros
-%%LUA_LIBDIR%%/rpm/mkinstalldirs
-%%LUA_LIBDIR%%/rpm/ocamldeps.sh
-%%LUA_LIBDIR%%/rpm/perl.prov
-%%LUA_LIBDIR%%/rpm/perl.req
-%%LUA_LIBDIR%%/rpm/pkgconfigdeps.sh
-%%LUA_LIBDIR%%/rpm/platform/aarch64-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/alpha-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/alphaev5-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/alphaev56-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/alphaev6-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/alphaev67-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/alphapca56-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/amd64-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv3l-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv4b-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv4l-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv5tejl-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv5tel-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv5tl-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv6hl-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv6l-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv7hl-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv7hnl-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv7l-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv8hl-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/armv8l-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/athlon-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/geode-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/i386-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/i486-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/i586-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/i686-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ia32e-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ia64-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/m68k-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mips-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mips64-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mips64el-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mips64r6-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mips64r6el-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mipsel-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mipsr6-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/mipsr6el-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/noarch-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/pentium3-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/pentium4-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc32dy4-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc64-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc64iseries-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc64le-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc64p7-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc64pseries-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc8260-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppc8560-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppciseries-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/ppcpseries-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/riscv64-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/s390-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/s390x-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sh-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sh3-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sh4-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sh4a-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sparc-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sparc64-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sparc64v-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sparcv8-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sparcv9-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/sparcv9v-%%OPSYS%%/macros
-%%LUA_LIBDIR%%/rpm/platform/x86_64-%%OPSYS%%/macros
-%%PYTHON%%%%LUA_LIBDIR%%/rpm/pythondistdeps.py
-%%LUA_LIBDIR%%/rpm/rpm.daily
-%%LUA_LIBDIR%%/rpm/rpm.log
-%%LUA_LIBDIR%%/rpm/rpm.supp
-%%LUA_LIBDIR%%/rpm/rpm2cpio.sh
-%%LUA_LIBDIR%%/rpm/rpmdb_dump
-%%LUA_LIBDIR%%/rpm/rpmdb_load
-%%LUA_LIBDIR%%/rpm/rpmdeps
-%%LUA_LIBDIR%%/rpm/rpmpopt-%%VERSION%%
-%%LUA_LIBDIR%%/rpm/rpmrc
-%%LUA_LIBDIR%%/rpm/script.req
-%%LUA_LIBDIR%%/rpm/tgpg
-%%LUA_LIBDIR%%data/pkgconfig/rpm.pc
+lib/rpm/brp-compress
+lib/rpm/brp-java-gcjcompile
+lib/rpm/brp-python-bytecompile
+lib/rpm/brp-python-hardlink
+lib/rpm/brp-strip
+lib/rpm/brp-strip-comment-note
+lib/rpm/brp-strip-shared
+lib/rpm/brp-strip-static-archive
+lib/rpm/check-buildroot
+lib/rpm/check-files
+lib/rpm/check-prereqs
+lib/rpm/check-rpaths
+lib/rpm/check-rpaths-worker
+lib/rpm/fileattrs/debuginfo.attr
+lib/rpm/fileattrs/desktop.attr
+lib/rpm/fileattrs/elf.attr
+lib/rpm/fileattrs/font.attr
+lib/rpm/fileattrs/libtool.attr
+lib/rpm/fileattrs/metainfo.attr
+lib/rpm/fileattrs/ocaml.attr
+lib/rpm/fileattrs/perl.attr
+lib/rpm/fileattrs/perllib.attr
+lib/rpm/fileattrs/pkgconfig.attr
+lib/rpm/fileattrs/python.attr
+lib/rpm/fileattrs/pythondist.attr
+lib/rpm/fileattrs/script.attr
+lib/rpm/find-lang.sh
+lib/rpm/find-provides
+lib/rpm/find-requires
+lib/rpm/fontconfig.prov
+lib/rpm/libtooldeps.sh
+lib/rpm/macros
+lib/rpm/mkinstalldirs
+lib/rpm/ocamldeps.sh
+lib/rpm/perl.prov
+lib/rpm/perl.req
+lib/rpm/pkgconfigdeps.sh
+lib/rpm/platform/aarch64-%%OPSYS%%/macros
+lib/rpm/platform/alpha-%%OPSYS%%/macros
+lib/rpm/platform/alphaev5-%%OPSYS%%/macros
+lib/rpm/platform/alphaev56-%%OPSYS%%/macros
+lib/rpm/platform/alphaev6-%%OPSYS%%/macros
+lib/rpm/platform/alphaev67-%%OPSYS%%/macros
+lib/rpm/platform/alphapca56-%%OPSYS%%/macros
+lib/rpm/platform/amd64-%%OPSYS%%/macros
+lib/rpm/platform/armv3l-%%OPSYS%%/macros
+lib/rpm/platform/armv4b-%%OPSYS%%/macros
+lib/rpm/platform/armv4l-%%OPSYS%%/macros
+lib/rpm/platform/armv5tejl-%%OPSYS%%/macros
+lib/rpm/platform/armv5tel-%%OPSYS%%/macros
+lib/rpm/platform/armv5tl-%%OPSYS%%/macros
+lib/rpm/platform/armv6hl-%%OPSYS%%/macros
+lib/rpm/platform/armv6l-%%OPSYS%%/macros
+lib/rpm/platform/armv7hl-%%OPSYS%%/macros
+lib/rpm/platform/armv7hnl-%%OPSYS%%/macros
+lib/rpm/platform/armv7l-%%OPSYS%%/macros
+lib/rpm/platform/armv8hl-%%OPSYS%%/macros
+lib/rpm/platform/armv8l-%%OPSYS%%/macros
+lib/rpm/platform/athlon-%%OPSYS%%/macros
+lib/rpm/platform/geode-%%OPSYS%%/macros
+lib/rpm/platform/i386-%%OPSYS%%/macros
+lib/rpm/platform/i486-%%OPSYS%%/macros
+lib/rpm/platform/i586-%%OPSYS%%/macros
+lib/rpm/platform/i686-%%OPSYS%%/macros
+lib/rpm/platform/ia32e-%%OPSYS%%/macros
+lib/rpm/platform/ia64-%%OPSYS%%/macros
+lib/rpm/platform/m68k-%%OPSYS%%/macros
+lib/rpm/platform/mips-%%OPSYS%%/macros
+lib/rpm/platform/mips64-%%OPSYS%%/macros
+lib/rpm/platform/mips64el-%%OPSYS%%/macros
+lib/rpm/platform/mips64r6-%%OPSYS%%/macros
+lib/rpm/platform/mips64r6el-%%OPSYS%%/macros
+lib/rpm/platform/mipsel-%%OPSYS%%/macros
+lib/rpm/platform/mipsr6-%%OPSYS%%/macros
+lib/rpm/platform/mipsr6el-%%OPSYS%%/macros
+lib/rpm/platform/noarch-%%OPSYS%%/macros
+lib/rpm/platform/pentium3-%%OPSYS%%/macros
+lib/rpm/platform/pentium4-%%OPSYS%%/macros
+lib/rpm/platform/ppc-%%OPSYS%%/macros
+lib/rpm/platform/ppc32dy4-%%OPSYS%%/macros
+lib/rpm/platform/ppc64-%%OPSYS%%/macros
+lib/rpm/platform/ppc64iseries-%%OPSYS%%/macros
+lib/rpm/platform/ppc64le-%%OPSYS%%/macros
+lib/rpm/platform/ppc64p7-%%OPSYS%%/macros
+lib/rpm/platform/ppc64pseries-%%OPSYS%%/macros
+lib/rpm/platform/ppc8260-%%OPSYS%%/macros
+lib/rpm/platform/ppc8560-%%OPSYS%%/macros
+lib/rpm/platform/ppciseries-%%OPSYS%%/macros
+lib/rpm/platform/ppcpseries-%%OPSYS%%/macros
+lib/rpm/platform/riscv64-%%OPSYS%%/macros
+lib/rpm/platform/s390-%%OPSYS%%/macros
+lib/rpm/platform/s390x-%%OPSYS%%/macros
+lib/rpm/platform/sh-%%OPSYS%%/macros
+lib/rpm/platform/sh3-%%OPSYS%%/macros
+lib/rpm/platform/sh4-%%OPSYS%%/macros
+lib/rpm/platform/sh4a-%%OPSYS%%/macros
+lib/rpm/platform/sparc-%%OPSYS%%/macros
+lib/rpm/platform/sparc64-%%OPSYS%%/macros
+lib/rpm/platform/sparc64v-%%OPSYS%%/macros
+lib/rpm/platform/sparcv8-%%OPSYS%%/macros
+lib/rpm/platform/sparcv9-%%OPSYS%%/macros
+lib/rpm/platform/sparcv9v-%%OPSYS%%/macros
+lib/rpm/platform/x86_64-%%OPSYS%%/macros
+%%PYTHON%%lib/rpm/pythondistdeps.py
+lib/rpm/rpm.daily
+lib/rpm/rpm.log
+lib/rpm/rpm.supp
+lib/rpm/rpm2cpio.sh
+lib/rpm/rpmdb_dump
+lib/rpm/rpmdb_load
+lib/rpm/rpmdeps
+lib/rpm/rpmpopt-%%VERSION%%
+lib/rpm/rpmrc
+lib/rpm/script.req
+lib/rpm/tgpg
+libdata/pkgconfig/rpm.pc
 man/fr/man8/rpm.8.gz
 man/ja/man8/rpm.8.gz
 man/ja/man8/rpm2cpio.8.gz
@@ -240,5 +240,5 @@ man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo
-@dir %%LUA_LIBDIR%%/rpm/lua
-@dir %%LUA_LIBDIR%%/rpm/macros.d
+@dir lib/rpm/lua
+@dir lib/rpm/macros.d
diff --git a/editors/neovim/pkg-plist b/editors/neovim/pkg-plist
index 0741790b5201..5b365b46a882 100644
--- a/editors/neovim/pkg-plist
+++ b/editors/neovim/pkg-plist
@@ -904,7 +904,7 @@ share/nvim/runtime/syntax/cuplsim.vim
 share/nvim/runtime/syntax/cvs.vim
 share/nvim/runtime/syntax/cvsrc.vim
 share/nvim/runtime/syntax/cweb.vim
-share/nvim/runtime/syntax/cyn%%LUA_LIBDIR%%.vim
+share/nvim/runtime/syntax/cynlib.vim
 share/nvim/runtime/syntax/cynpp.vim
 share/nvim/runtime/syntax/d.vim
 share/nvim/runtime/syntax/datascript.vim
diff --git a/graphics/cegui/pkg-plist b/graphics/cegui/pkg-plist
index e87b2dd7e1c4..40bf579e3a79 100644
--- a/graphics/cegui/pkg-plist
+++ b/graphics/cegui/pkg-plist
@@ -340,7 +340,7 @@ lib/libCEGUICommonDialogs-0.so.2.4.2
 %%OGRE%%libdata/pkgconfig/CEGUI-0-OGRE.pc
 %%OPENGL%%libdata/pkgconfig/CEGUI-0-OPENGL.pc
 %%OPENGL3%%libdata/pkgconfig/CEGUI-0-OPENGL3.pc
-%%SDL2%%%%LUA_LIBDIR%%/cegui-0.8/%%LUA_LIBDIR%%CEGUISDL2ImageCodec.so
+%%SDL2%%lib/cegui-0.8/libCEGUISDL2ImageCodec.so
 libdata/pkgconfig/CEGUI-0.pc
 share/cegui-0/animations/GameMenu.anims
 share/cegui-0/animations/example.anims
diff --git a/graphics/ipe/pkg-plist b/graphics/ipe/pkg-plist
index d3ba567de657..b73da66db798 100644
--- a/graphics/ipe/pkg-plist
+++ b/graphics/ipe/pkg-plist
@@ -96,5 +96,5 @@ man/man1/ipetoipe.1.gz
 %%DATADIR%%/%%VERSION%%/styles/right-to-left.isy
 %%DATADIR%%/%%VERSION%%/styles/tikz-shapes.isy
 share/pixmaps/ipe.png
-%%LUA_LIBDIR%%/ipe/%%VERSION%%/ipelets/gridmaker.lua
-%%LUA_LIBDIR%%/ipe/%%VERSION%%/ipelets/selectby.lua
+lib/ipe/%%VERSION%%/ipelets/gridmaker.lua
+lib/ipe/%%VERSION%%/ipelets/selectby.lua
diff --git a/irc/hexchat/pkg-plist b/irc/hexchat/pkg-plist
index 368fee2c86ac..6a574bdd48ba 100644
--- a/irc/hexchat/pkg-plist
+++ b/irc/hexchat/pkg-plist
@@ -5,7 +5,7 @@ lib/hexchat/plugins/checksum.so
 %%FISHLIM%%lib/hexchat/plugins/fishlim.so
 %%PERL%%lib/hexchat/plugins/perl.so
 lib/hexchat/plugins/python.so
-%%LUA%%%%LUA_LIBDIR%%/hexchat/plugins/lua.so
+%%LUA%%lib/hexchat/plugins/lua.so
 %%SYSINFO%%lib/hexchat/plugins/sysinfo.so
 libdata/pkgconfig/hexchat-plugin.pc
 man/man1/hexchat.1.gz
diff --git a/lang/fennel/pkg-plist b/lang/fennel/pkg-plist
index a6cc274071ec..bce485808900 100644
--- a/lang/fennel/pkg-plist
+++ b/lang/fennel/pkg-plist
@@ -1,3 +1,3 @@
 bin/fennel
-%%LUA_LIBDIR%%/fennelview.lua
+lib/fennelview.lua
 man/man1/fennel.1.gz
diff --git a/lang/lua53/pkg-plist b/lang/lua53/pkg-plist
index ca2ffefcdc92..caf138a55de4 100644
--- a/lang/lua53/pkg-plist
+++ b/lang/lua53/pkg-plist
@@ -5,8 +5,8 @@ bin/luac%%LUA_VER_STR%%
 %%LUA_INCDIR%%/lua.hpp
 %%LUA_INCDIR%%/luaconf.h
 %%LUA_INCDIR%%/lualib.h
-%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.a
-%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so
+lib/liblua-%%LUA_VER%%.a
+lib/liblua-%%LUA_VER%%.so
 libdata/pkgconfig/lua-%%LUA_VER%%.pc
 man/man1/lua%%LUA_VER_STR%%.1.gz
 man/man1/luac%%LUA_VER_STR%%.1.gz
diff --git a/lang/lua54/pkg-plist b/lang/lua54/pkg-plist
index ca2ffefcdc92..caf138a55de4 100644
--- a/lang/lua54/pkg-plist
+++ b/lang/lua54/pkg-plist
@@ -5,8 +5,8 @@ bin/luac%%LUA_VER_STR%%
 %%LUA_INCDIR%%/lua.hpp
 %%LUA_INCDIR%%/luaconf.h
 %%LUA_INCDIR%%/lualib.h
-%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.a
-%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so
+lib/liblua-%%LUA_VER%%.a
+lib/liblua-%%LUA_VER%%.so
 libdata/pkgconfig/lua-%%LUA_VER%%.pc
 man/man1/lua%%LUA_VER_STR%%.1.gz
 man/man1/luac%%LUA_VER_STR%%.1.gz
diff --git a/lang/tolua++/pkg-plist b/lang/tolua++/pkg-plist
index 781bed4f2a46..457a1c384fa1 100644
--- a/lang/tolua++/pkg-plist
+++ b/lang/tolua++/pkg-plist
@@ -1,6 +1,6 @@
 bin/tolua++
 bin/tolua++-%%LUA_VER%%
-%%LUA_LIBDIR%%/libtolua++.a
-%%LUA_LIBDIR%%/libtolua++.so
+lib/libtolua++.a
+lib/libtolua++.so
 lib/libtolua++-%%LUA_VER%%.so
 %%LUA_INCDIR%%/tolua++.h
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index 3d1fc870e88c..a60d7a5c3f12 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -50,10 +50,10 @@
 %%LDAP%%lib/dovecot/libdovecot-ldap.so.0
 %%LDAP%%lib/dovecot/libdovecot-ldap.so.0.0.0
 %%LIBWRAP%%libexec/dovecot/tcpwrap
-%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.a
-%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.so
-%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%22_push_notification_lua_plugin.a
-%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%22_push_notification_lua_plugin.so
+%%LUA%%lib/dovecot/lib01_mail_lua_plugin.a
+%%LUA%%lib/dovecot/lib01_mail_lua_plugin.so
+%%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.a
+%%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.so
 %%LUA%%include/dovecot/dlua-script-private.h
 %%LUA%%include/dovecot/dlua-script.h
 %%LUA%%include/dovecot/mail-lua-plugin.h
diff --git a/net-im/prosody/pkg-plist b/net-im/prosody/pkg-plist
index c85d21ac47d2..fdda4f70021c 100644
--- a/net-im/prosody/pkg-plist
+++ b/net-im/prosody/pkg-plist
@@ -4,220 +4,220 @@ bin/prosody-migrator
 @dir %%ETCDIR%%/certs
 @sample %%ETCDIR%%/migrator.cfg.lua.sample
 @sample %%ETCDIR%%/prosody.cfg.lua.sample
-%%LUA_LIBDIR%%/prosody/core/certmanager.lua
-%%LUA_LIBDIR%%/prosody/core/configmanager.lua
-%%LUA_LIBDIR%%/prosody/core/hostmanager.lua
-%%LUA_LIBDIR%%/prosody/core/loggingmanager.lua
-%%LUA_LIBDIR%%/prosody/core/moduleapi.lua
-%%LUA_LIBDIR%%/prosody/core/modulemanager.lua
-%%LUA_LIBDIR%%/prosody/core/portmanager.lua
-%%LUA_LIBDIR%%/prosody/core/rostermanager.lua
-%%LUA_LIBDIR%%/prosody/core/s2smanager.lua
-%%LUA_LIBDIR%%/prosody/core/sessionmanager.lua
-%%LUA_LIBDIR%%/prosody/core/stanza_router.lua
-%%LUA_LIBDIR%%/prosody/core/statsmanager.lua
-%%LUA_LIBDIR%%/prosody/core/storagemanager.lua
-%%LUA_LIBDIR%%/prosody/core/usermanager.lua
-%%LUA_LIBDIR%%/prosody/migrator/jabberd14.lua
-%%LUA_LIBDIR%%/prosody/migrator/mtools.lua
-%%LUA_LIBDIR%%/prosody/migrator/prosody_files.lua
-%%LUA_LIBDIR%%/prosody/migrator/prosody_sql.lua
-%%LUA_LIBDIR%%/prosody/modules/adhoc/adhoc.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/adhoc/mod_adhoc.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_admin_adhoc.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_admin_telnet.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_announce.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_auth_anonymous.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_auth_cyrus.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_auth_insecure.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_auth_internal_hashed.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_auth_internal_plain.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_blocklist.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_bosh.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_c2s.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_carbons.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_component.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_csi.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_csi_simple.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_debug_sql.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_dialback.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_disco.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_groups.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_http.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_http_errors.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_http_files.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_iq.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_lastactivity.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_legacyauth.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_limits.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_mam/mamprefs.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_mam/mamprefsxml.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_mam/mod_mam.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_message.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_motd.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_muc_mam.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_muc_unique.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_net_multiplex.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_offline.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_pep.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_pep_plus.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_pep_simple.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_ping.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_posix.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_presence.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_private.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_proxy65.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_pubsub/mod_pubsub.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_pubsub/pubsub.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_register.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_register_ibr.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_register_limits.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_roster.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_s2s/mod_s2s.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_s2s/s2sout.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_s2s_auth_certs.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_saslauth.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_scansion_record.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_server_contact_info.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_stanza_debug.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_storage_internal.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_storage_memory.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_storage_none.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_storage_sql.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_storage_xep0227.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_time.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_tls.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_unknown.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_uptime.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_user_account_management.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_vcard.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_vcard4.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_vcard_legacy.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_version.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_watchregistrations.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_websocket.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_welcome.lua
-%%LUA_LIBDIR%%/prosody/modules/mod_windows.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/config_form_sections.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/description.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/hidden.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/history.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/language.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/lock.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/members_only.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/mod_muc.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/moderated.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/muc.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/name.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/occupant.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/password.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/persistent.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/register.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/request.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/subject.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/util.lib.lua
-%%LUA_LIBDIR%%/prosody/modules/muc/whois.lib.lua
-%%LUA_LIBDIR%%/prosody/net/adns.lua
-%%LUA_LIBDIR%%/prosody/net/connect.lua
-%%LUA_LIBDIR%%/prosody/net/connlisteners.lua
-%%LUA_LIBDIR%%/prosody/net/cqueues.lua
-%%LUA_LIBDIR%%/prosody/net/dns.lua
-%%LUA_LIBDIR%%/prosody/net/http.lua
-%%LUA_LIBDIR%%/prosody/net/http/codes.lua
-%%LUA_LIBDIR%%/prosody/net/http/parser.lua
-%%LUA_LIBDIR%%/prosody/net/http/server.lua
-%%LUA_LIBDIR%%/prosody/net/httpserver.lua
-%%LUA_LIBDIR%%/prosody/net/resolvers/basic.lua
-%%LUA_LIBDIR%%/prosody/net/resolvers/manual.lua
-%%LUA_LIBDIR%%/prosody/net/resolvers/service.lua
-%%LUA_LIBDIR%%/prosody/net/server.lua
-%%LUA_LIBDIR%%/prosody/net/server_epoll.lua
-%%LUA_LIBDIR%%/prosody/net/server_event.lua
-%%LUA_LIBDIR%%/prosody/net/server_select.lua
-%%LUA_LIBDIR%%/prosody/net/websocket.lua
-%%LUA_LIBDIR%%/prosody/net/websocket/frames.lua
-%%LUA_LIBDIR%%/prosody/prosody.version
-%%LUA_LIBDIR%%/prosody/util/adhoc.lua
-%%LUA_LIBDIR%%/prosody/util/array.lua
-%%LUA_LIBDIR%%/prosody/util/async.lua
-%%LUA_LIBDIR%%/prosody/util/cache.lua
-%%LUA_LIBDIR%%/prosody/util/caps.lua
-%%LUA_LIBDIR%%/prosody/util/compat.so
-%%LUA_LIBDIR%%/prosody/util/crand.so
-%%LUA_LIBDIR%%/prosody/util/dataforms.lua
-%%LUA_LIBDIR%%/prosody/util/datamanager.lua
-%%LUA_LIBDIR%%/prosody/util/datetime.lua
-%%LUA_LIBDIR%%/prosody/util/dbuffer.lua
-%%LUA_LIBDIR%%/prosody/util/debug.lua
-%%LUA_LIBDIR%%/prosody/util/dependencies.lua
-%%LUA_LIBDIR%%/prosody/util/encodings.so
-%%LUA_LIBDIR%%/prosody/util/envload.lua
-%%LUA_LIBDIR%%/prosody/util/events.lua
-%%LUA_LIBDIR%%/prosody/util/filters.lua
-%%LUA_LIBDIR%%/prosody/util/format.lua
-%%LUA_LIBDIR%%/prosody/util/gc.lua
-%%LUA_LIBDIR%%/prosody/util/hashes.so
-%%LUA_LIBDIR%%/prosody/util/helpers.lua
-%%LUA_LIBDIR%%/prosody/util/hex.lua
-%%LUA_LIBDIR%%/prosody/util/hmac.lua
-%%LUA_LIBDIR%%/prosody/util/http.lua
-%%LUA_LIBDIR%%/prosody/util/id.lua
-%%LUA_LIBDIR%%/prosody/util/import.lua
-%%LUA_LIBDIR%%/prosody/util/indexedbheap.lua
-%%LUA_LIBDIR%%/prosody/util/interpolation.lua
-%%LUA_LIBDIR%%/prosody/util/ip.lua
-%%LUA_LIBDIR%%/prosody/util/iterators.lua
-%%LUA_LIBDIR%%/prosody/util/jid.lua
-%%LUA_LIBDIR%%/prosody/util/json.lua
-%%LUA_LIBDIR%%/prosody/util/logger.lua
-%%LUA_LIBDIR%%/prosody/util/mercurial.lua
-%%LUA_LIBDIR%%/prosody/util/multitable.lua
-%%LUA_LIBDIR%%/prosody/util/net.so
-%%LUA_LIBDIR%%/prosody/util/openssl.lua
-%%LUA_LIBDIR%%/prosody/util/paths.lua
-%%LUA_LIBDIR%%/prosody/util/pluginloader.lua
-%%LUA_LIBDIR%%/prosody/util/poll.so
-%%LUA_LIBDIR%%/prosody/util/pposix.so
-%%LUA_LIBDIR%%/prosody/util/presence.lua
-%%LUA_LIBDIR%%/prosody/util/promise.lua
-%%LUA_LIBDIR%%/prosody/util/prosodyctl.lua
-%%LUA_LIBDIR%%/prosody/util/pubsub.lua
-%%LUA_LIBDIR%%/prosody/util/queue.lua
-%%LUA_LIBDIR%%/prosody/util/random.lua
-%%LUA_LIBDIR%%/prosody/util/rfc6724.lua
-%%LUA_LIBDIR%%/prosody/util/ringbuffer.so
-%%LUA_LIBDIR%%/prosody/util/rsm.lua
-%%LUA_LIBDIR%%/prosody/util/sasl.lua
-%%LUA_LIBDIR%%/prosody/util/sasl/anonymous.lua
-%%LUA_LIBDIR%%/prosody/util/sasl/digest-md5.lua
-%%LUA_LIBDIR%%/prosody/util/sasl/external.lua
-%%LUA_LIBDIR%%/prosody/util/sasl/plain.lua
-%%LUA_LIBDIR%%/prosody/util/sasl/scram.lua
-%%LUA_LIBDIR%%/prosody/util/sasl_cyrus.lua
-%%LUA_LIBDIR%%/prosody/util/serialization.lua
-%%LUA_LIBDIR%%/prosody/util/session.lua
-%%LUA_LIBDIR%%/prosody/util/set.lua
-%%LUA_LIBDIR%%/prosody/util/signal.so
-%%LUA_LIBDIR%%/prosody/util/sql.lua
-%%LUA_LIBDIR%%/prosody/util/sslconfig.lua
-%%LUA_LIBDIR%%/prosody/util/stanza.lua
-%%LUA_LIBDIR%%/prosody/util/startup.lua
-%%LUA_LIBDIR%%/prosody/util/statistics.lua
-%%LUA_LIBDIR%%/prosody/util/statsd.lua
-%%LUA_LIBDIR%%/prosody/util/strbitop.so
-%%LUA_LIBDIR%%/prosody/util/table.so
-%%LUA_LIBDIR%%/prosody/util/template.lua
-%%LUA_LIBDIR%%/prosody/util/termcolours.lua
-%%LUA_LIBDIR%%/prosody/util/throttle.lua
-%%LUA_LIBDIR%%/prosody/util/time.so
-%%LUA_LIBDIR%%/prosody/util/timer.lua
-%%LUA_LIBDIR%%/prosody/util/uuid.lua
-%%LUA_LIBDIR%%/prosody/util/vcard.lua
-%%LUA_LIBDIR%%/prosody/util/watchdog.lua
-%%LUA_LIBDIR%%/prosody/util/x509.lua
-%%LUA_LIBDIR%%/prosody/util/xml.lua
-%%LUA_LIBDIR%%/prosody/util/xmppstream.lua
-%%LUA_LIBDIR%%/prosody/util/xpcall.lua
+lib/prosody/core/certmanager.lua
+lib/prosody/core/configmanager.lua
+lib/prosody/core/hostmanager.lua
+lib/prosody/core/loggingmanager.lua
+lib/prosody/core/moduleapi.lua
+lib/prosody/core/modulemanager.lua
+lib/prosody/core/portmanager.lua
+lib/prosody/core/rostermanager.lua
+lib/prosody/core/s2smanager.lua
+lib/prosody/core/sessionmanager.lua
+lib/prosody/core/stanza_router.lua
+lib/prosody/core/statsmanager.lua
+lib/prosody/core/storagemanager.lua
+lib/prosody/core/usermanager.lua
+lib/prosody/migrator/jabberd14.lua
+lib/prosody/migrator/mtools.lua
+lib/prosody/migrator/prosody_files.lua
+lib/prosody/migrator/prosody_sql.lua
+lib/prosody/modules/adhoc/adhoc.lib.lua
+lib/prosody/modules/adhoc/mod_adhoc.lua
+lib/prosody/modules/mod_admin_adhoc.lua
+lib/prosody/modules/mod_admin_telnet.lua
+lib/prosody/modules/mod_announce.lua
+lib/prosody/modules/mod_auth_anonymous.lua
+lib/prosody/modules/mod_auth_cyrus.lua
+lib/prosody/modules/mod_auth_insecure.lua
+lib/prosody/modules/mod_auth_internal_hashed.lua
+lib/prosody/modules/mod_auth_internal_plain.lua
+lib/prosody/modules/mod_blocklist.lua
+lib/prosody/modules/mod_bosh.lua
+lib/prosody/modules/mod_c2s.lua
+lib/prosody/modules/mod_carbons.lua
+lib/prosody/modules/mod_component.lua
+lib/prosody/modules/mod_csi.lua
+lib/prosody/modules/mod_csi_simple.lua
+lib/prosody/modules/mod_debug_sql.lua
+lib/prosody/modules/mod_dialback.lua
+lib/prosody/modules/mod_disco.lua
+lib/prosody/modules/mod_groups.lua
+lib/prosody/modules/mod_http.lua
+lib/prosody/modules/mod_http_errors.lua
+lib/prosody/modules/mod_http_files.lua
+lib/prosody/modules/mod_iq.lua
+lib/prosody/modules/mod_lastactivity.lua
+lib/prosody/modules/mod_legacyauth.lua
+lib/prosody/modules/mod_limits.lua
+lib/prosody/modules/mod_mam/mamprefs.lib.lua
+lib/prosody/modules/mod_mam/mamprefsxml.lib.lua
+lib/prosody/modules/mod_mam/mod_mam.lua
+lib/prosody/modules/mod_message.lua
+lib/prosody/modules/mod_motd.lua
+lib/prosody/modules/mod_muc_mam.lua
+lib/prosody/modules/mod_muc_unique.lua
+lib/prosody/modules/mod_net_multiplex.lua
+lib/prosody/modules/mod_offline.lua
+lib/prosody/modules/mod_pep.lua
+lib/prosody/modules/mod_pep_plus.lua
+lib/prosody/modules/mod_pep_simple.lua
+lib/prosody/modules/mod_ping.lua
+lib/prosody/modules/mod_posix.lua
+lib/prosody/modules/mod_presence.lua
+lib/prosody/modules/mod_private.lua
+lib/prosody/modules/mod_proxy65.lua
+lib/prosody/modules/mod_pubsub/mod_pubsub.lua
+lib/prosody/modules/mod_pubsub/pubsub.lib.lua
+lib/prosody/modules/mod_register.lua
+lib/prosody/modules/mod_register_ibr.lua
+lib/prosody/modules/mod_register_limits.lua
+lib/prosody/modules/mod_roster.lua
+lib/prosody/modules/mod_s2s/mod_s2s.lua
+lib/prosody/modules/mod_s2s/s2sout.lib.lua
+lib/prosody/modules/mod_s2s_auth_certs.lua
+lib/prosody/modules/mod_saslauth.lua
+lib/prosody/modules/mod_scansion_record.lua
+lib/prosody/modules/mod_server_contact_info.lua
+lib/prosody/modules/mod_stanza_debug.lua
+lib/prosody/modules/mod_storage_internal.lua
+lib/prosody/modules/mod_storage_memory.lua
+lib/prosody/modules/mod_storage_none.lua
+lib/prosody/modules/mod_storage_sql.lua
+lib/prosody/modules/mod_storage_xep0227.lua
+lib/prosody/modules/mod_time.lua
+lib/prosody/modules/mod_tls.lua
+lib/prosody/modules/mod_unknown.lua
+lib/prosody/modules/mod_uptime.lua
+lib/prosody/modules/mod_user_account_management.lua
+lib/prosody/modules/mod_vcard.lua
+lib/prosody/modules/mod_vcard4.lua
+lib/prosody/modules/mod_vcard_legacy.lua
+lib/prosody/modules/mod_version.lua
+lib/prosody/modules/mod_watchregistrations.lua
+lib/prosody/modules/mod_websocket.lua
+lib/prosody/modules/mod_welcome.lua
+lib/prosody/modules/mod_windows.lua
+lib/prosody/modules/muc/config_form_sections.lib.lua
+lib/prosody/modules/muc/description.lib.lua
+lib/prosody/modules/muc/hidden.lib.lua
+lib/prosody/modules/muc/history.lib.lua
+lib/prosody/modules/muc/language.lib.lua
+lib/prosody/modules/muc/lock.lib.lua
+lib/prosody/modules/muc/members_only.lib.lua
+lib/prosody/modules/muc/mod_muc.lua
+lib/prosody/modules/muc/moderated.lib.lua
+lib/prosody/modules/muc/muc.lib.lua
+lib/prosody/modules/muc/name.lib.lua
+lib/prosody/modules/muc/occupant.lib.lua
+lib/prosody/modules/muc/password.lib.lua
+lib/prosody/modules/muc/persistent.lib.lua
+lib/prosody/modules/muc/register.lib.lua
+lib/prosody/modules/muc/request.lib.lua
+lib/prosody/modules/muc/subject.lib.lua
+lib/prosody/modules/muc/util.lib.lua
+lib/prosody/modules/muc/whois.lib.lua
+lib/prosody/net/adns.lua
+lib/prosody/net/connect.lua
+lib/prosody/net/connlisteners.lua
+lib/prosody/net/cqueues.lua
+lib/prosody/net/dns.lua
+lib/prosody/net/http.lua
+lib/prosody/net/http/codes.lua
+lib/prosody/net/http/parser.lua
+lib/prosody/net/http/server.lua
+lib/prosody/net/httpserver.lua
+lib/prosody/net/resolvers/basic.lua
+lib/prosody/net/resolvers/manual.lua
+lib/prosody/net/resolvers/service.lua
+lib/prosody/net/server.lua
+lib/prosody/net/server_epoll.lua
+lib/prosody/net/server_event.lua
+lib/prosody/net/server_select.lua
+lib/prosody/net/websocket.lua
+lib/prosody/net/websocket/frames.lua
+lib/prosody/prosody.version
+lib/prosody/util/adhoc.lua
+lib/prosody/util/array.lua
+lib/prosody/util/async.lua
+lib/prosody/util/cache.lua
+lib/prosody/util/caps.lua
+lib/prosody/util/compat.so
+lib/prosody/util/crand.so
+lib/prosody/util/dataforms.lua
+lib/prosody/util/datamanager.lua
+lib/prosody/util/datetime.lua
+lib/prosody/util/dbuffer.lua
+lib/prosody/util/debug.lua
+lib/prosody/util/dependencies.lua
+lib/prosody/util/encodings.so
+lib/prosody/util/envload.lua
+lib/prosody/util/events.lua
+lib/prosody/util/filters.lua
+lib/prosody/util/format.lua
+lib/prosody/util/gc.lua
+lib/prosody/util/hashes.so
+lib/prosody/util/helpers.lua
+lib/prosody/util/hex.lua
+lib/prosody/util/hmac.lua
+lib/prosody/util/http.lua
+lib/prosody/util/id.lua
+lib/prosody/util/import.lua
+lib/prosody/util/indexedbheap.lua
+lib/prosody/util/interpolation.lua
+lib/prosody/util/ip.lua
+lib/prosody/util/iterators.lua
+lib/prosody/util/jid.lua
+lib/prosody/util/json.lua
+lib/prosody/util/logger.lua
+lib/prosody/util/mercurial.lua
+lib/prosody/util/multitable.lua
+lib/prosody/util/net.so
+lib/prosody/util/openssl.lua
+lib/prosody/util/paths.lua
+lib/prosody/util/pluginloader.lua
+lib/prosody/util/poll.so
+lib/prosody/util/pposix.so
+lib/prosody/util/presence.lua
+lib/prosody/util/promise.lua
+lib/prosody/util/prosodyctl.lua
+lib/prosody/util/pubsub.lua
+lib/prosody/util/queue.lua
+lib/prosody/util/random.lua
+lib/prosody/util/rfc6724.lua
+lib/prosody/util/ringbuffer.so
+lib/prosody/util/rsm.lua
+lib/prosody/util/sasl.lua
+lib/prosody/util/sasl/anonymous.lua
+lib/prosody/util/sasl/digest-md5.lua
+lib/prosody/util/sasl/external.lua
+lib/prosody/util/sasl/plain.lua
+lib/prosody/util/sasl/scram.lua
+lib/prosody/util/sasl_cyrus.lua
+lib/prosody/util/serialization.lua
+lib/prosody/util/session.lua
+lib/prosody/util/set.lua
+lib/prosody/util/signal.so
+lib/prosody/util/sql.lua
+lib/prosody/util/sslconfig.lua
+lib/prosody/util/stanza.lua
+lib/prosody/util/startup.lua
+lib/prosody/util/statistics.lua
+lib/prosody/util/statsd.lua
+lib/prosody/util/strbitop.so
+lib/prosody/util/table.so
+lib/prosody/util/template.lua
+lib/prosody/util/termcolours.lua
+lib/prosody/util/throttle.lua
+lib/prosody/util/time.so
+lib/prosody/util/timer.lua
+lib/prosody/util/uuid.lua
+lib/prosody/util/vcard.lua
+lib/prosody/util/watchdog.lua
+lib/prosody/util/x509.lua
+lib/prosody/util/xml.lua
+lib/prosody/util/xmppstream.lua
+lib/prosody/util/xpcall.lua
 man/man1/prosodyctl.1.gz
 @dir(%%PROSODY_USER%%,%%PROSODY_GROUP%%,) /var/db/prosody
 @dir(%%PROSODY_USER%%,%%PROSODY_GROUP%%,) /var/run/prosody
diff --git a/net/freeswitch/pkg-plist b/net/freeswitch/pkg-plist
index a46537890bb4..bd898a6b6722 100644
--- a/net/freeswitch/pkg-plist
+++ b/net/freeswitch/pkg-plist
@@ -107,7 +107,7 @@ lib/libfreeswitch.a
 lib/libfreeswitch.so
 lib/libfreeswitch.so.1
 lib/libfreeswitch.so.1.0.0
-%%PGSQL%%%%LUA_LIBDIR%%/freeswitch/mod/mod_pgsql.so
+%%PGSQL%%lib/freeswitch/mod/mod_pgsql.so
 libdata/pkgconfig/freeswitch.pc
 %%DATADIR%%/fonts/FreeMono.ttf
 %%DATADIR%%/fonts/FreeMonoBold.ttf
diff --git a/textproc/fcitx5-lua/pkg-plist b/textproc/fcitx5-lua/pkg-plist
index 3991eb97620f..8db14bbb4456 100644
--- a/textproc/fcitx5-lua/pkg-plist
+++ b/textproc/fcitx5-lua/pkg-plist
@@ -1,7 +1,7 @@
 include/Fcitx5/Module/fcitx-module/luaaddonloader/luaaddon_public.h
-%%LUA_LIBDIR%%/cmake/Fcitx5ModuleLuaAddonLoader/Fcitx5ModuleLuaAddonLoaderConfig.cmake
-%%LUA_LIBDIR%%/cmake/Fcitx5ModuleLuaAddonLoader/Fcitx5ModuleLuaAddonLoaderConfigVersion.cmake
-%%LUA_LIBDIR%%/fcitx5/luaaddonloader.so
+lib/cmake/Fcitx5ModuleLuaAddonLoader/Fcitx5ModuleLuaAddonLoaderConfig.cmake
+lib/cmake/Fcitx5ModuleLuaAddonLoader/Fcitx5ModuleLuaAddonLoaderConfigVersion.cmake
+lib/fcitx5/luaaddonloader.so
 share/fcitx5/addon/imeapi.conf
 share/fcitx5/addon/luaaddonloader.conf
 share/fcitx5/lua/imeapi/imeapi.lua
diff --git a/www/domoticz/pkg-plist b/www/domoticz/pkg-plist
index 625cce4a7f47..9595142495d7 100644
--- a/www/domoticz/pkg-plist
+++ b/www/domoticz/pkg-plist
@@ -905,8 +905,8 @@ domoticz/dzVents/runtime/tests/testVariable.lua
 domoticz/dzVents/runtime/tests/testfile
 domoticz/dzVents/runtime/tests/tstData.lua
 domoticz/dzVents/runtime/todo.md
-domoticz/plugins/AwoxSMP/%%LUA_LIBDIR%%/__init__.py
-domoticz/plugins/AwoxSMP/%%LUA_LIBDIR%%/pySmartPlugSmpB16.py
+domoticz/plugins/AwoxSMP/lib/__init__.py
+domoticz/plugins/AwoxSMP/lib/pySmartPlugSmpB16.py
 domoticz/plugins/AwoxSMP/plugin.py
 domoticz/plugins/examples/BaseTemplate.py
 domoticz/plugins/examples/DenonMarantz.py
diff --git a/www/lighttpd/pkg-plist b/www/lighttpd/pkg-plist
index 0324e1327e41..1c1d6baea98b 100644
--- a/www/lighttpd/pkg-plist
+++ b/www/lighttpd/pkg-plist
@@ -46,7 +46,7 @@ lib/lighttpd/mod_flv_streaming.so
 %%GNUTLS%%lib/lighttpd/mod_gnutls.so
 lib/lighttpd/mod_indexfile.so
 %%LUA%%lib/lighttpd/mod_magnet.so
-%%MAXMINDDB%%%%LUA_LIBDIR%%/lighttpd/mod_maxminddb.so
+%%MAXMINDDB%%lib/lighttpd/mod_maxminddb.so
 %%MYSQL%%lib/lighttpd/mod_mysql_vhost.so
 %%NSS%%lib/lighttpd/mod_nss.so
 %%OPENSSL%%lib/lighttpd/mod_openssl.so
@@ -68,7 +68,7 @@ lib/lighttpd/mod_uploadprogress.so
 lib/lighttpd/mod_userdir.so
 lib/lighttpd/mod_usertrack.so
 lib/lighttpd/mod_vhostdb.so
-%%DBI%%%%LUA_LIBDIR%%/lighttpd/mod_vhostdb_dbi.so
+%%DBI%%lib/lighttpd/mod_vhostdb_dbi.so
 %%LDAP%%lib/lighttpd/mod_vhostdb_ldap.so
 %%MYSQL%%lib/lighttpd/mod_vhostdb_mysql.so
 lib/lighttpd/mod_webdav.so
diff --git a/www/luakit-devel/pkg-plist b/www/luakit-devel/pkg-plist
index 19c4d8bb6cf0..408963b029f4 100644
--- a/www/luakit-devel/pkg-plist
+++ b/www/luakit-devel/pkg-plist
@@ -1,7 +1,7 @@
 bin/luakit
 etc/xdg/luakit/rc.lua
 etc/xdg/luakit/theme.lua
-%%LUA_LIBDIR%%/luakit/luakit.so
+lib/luakit/luakit.so
 man/man1/luakit.1.gz
 share/applications/luakit.desktop
 share/doc/luakit/AUTHORS
@@ -106,7 +106,7 @@ share/doc/luakit/modules/tab_favicons.html
 share/doc/luakit/modules/tabhistory.html
 share/doc/luakit/modules/tabmenu.html
 share/doc/luakit/modules/taborder.html
-share/doc/luakit/modules/tests.%%LUA_LIBDIR%%.html
+share/doc/luakit/modules/tests.lib.html
 share/doc/luakit/modules/undoclose.html
 share/doc/luakit/modules/unique_instance.html
 share/doc/luakit/modules/userscripts.html
@@ -125,95 +125,95 @@ share/doc/luakit/pages/04-migration-guide.html
 share/doc/luakit/pages/05-configuration.html
 share/doc/luakit/pages/06-tests.html
 share/doc/luakit/pages/07-build-debian-package.html
-share/luakit/%%LUA_LIBDIR%%/adblock.lua
-share/luakit/%%LUA_LIBDIR%%/adblock_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/adblock_wm.lua
-share/luakit/%%LUA_LIBDIR%%/binds.lua
-share/luakit/%%LUA_LIBDIR%%/binds_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/bookmarks.lua
-share/luakit/%%LUA_LIBDIR%%/bookmarks_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/chrome.lua
-share/luakit/%%LUA_LIBDIR%%/chrome_wm.lua
-share/luakit/%%LUA_LIBDIR%%/clear_data.lua
-share/luakit/%%LUA_LIBDIR%%/cmdhist.lua
-share/luakit/%%LUA_LIBDIR%%/completion.lua
-share/luakit/%%LUA_LIBDIR%%/domain_props.lua
-share/luakit/%%LUA_LIBDIR%%/downloads.lua
-share/luakit/%%LUA_LIBDIR%%/downloads_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/editor.lua
-share/luakit/%%LUA_LIBDIR%%/error_page.lua
-share/luakit/%%LUA_LIBDIR%%/error_page_wm.lua
-share/luakit/%%LUA_LIBDIR%%/follow.lua
-share/luakit/%%LUA_LIBDIR%%/follow_selected.lua
-share/luakit/%%LUA_LIBDIR%%/follow_selected_wm.lua
-share/luakit/%%LUA_LIBDIR%%/follow_wm.lua
-share/luakit/%%LUA_LIBDIR%%/formfiller.lua
-share/luakit/%%LUA_LIBDIR%%/formfiller_wm.lua
-share/luakit/%%LUA_LIBDIR%%/go_input.lua
-share/luakit/%%LUA_LIBDIR%%/go_next_prev.lua
-share/luakit/%%LUA_LIBDIR%%/go_up.lua
-share/luakit/%%LUA_LIBDIR%%/gopher.lua
-share/luakit/%%LUA_LIBDIR%%/help_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/hide_scrollbars.lua
-share/luakit/%%LUA_LIBDIR%%/history.lua
-share/luakit/%%LUA_LIBDIR%%/history_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/image_css.lua
-share/luakit/%%LUA_LIBDIR%%/image_css_wm.lua
-share/luakit/%%LUA_LIBDIR%%/introspector_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/keysym.lua
-share/luakit/%%LUA_LIBDIR%%/log_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/bind.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/init.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/load.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/mode.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/pickle.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/signal.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/theme.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/uri.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/util.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/buf.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/common.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/hist.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/init.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/menu.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/progress.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/scroll.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/ssl.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/tab.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/tabi.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/tablist.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/uri.lua
-share/luakit/%%LUA_LIBDIR%%/lousy/widget/zoom.lua
-share/luakit/%%LUA_LIBDIR%%/markdown.lua
-share/luakit/%%LUA_LIBDIR%%/modes.lua
-share/luakit/%%LUA_LIBDIR%%/newtab_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/noscript.lua
-share/luakit/%%LUA_LIBDIR%%/open_editor.lua
-share/luakit/%%LUA_LIBDIR%%/proxy.lua
-share/luakit/%%LUA_LIBDIR%%/quickmarks.lua
-share/luakit/%%LUA_LIBDIR%%/readline.lua
-share/luakit/%%LUA_LIBDIR%%/referer_control_wm.lua
-share/luakit/%%LUA_LIBDIR%%/search.lua
-share/luakit/%%LUA_LIBDIR%%/select.lua
-share/luakit/%%LUA_LIBDIR%%/select_wm.lua
-share/luakit/%%LUA_LIBDIR%%/session.lua
-share/luakit/%%LUA_LIBDIR%%/settings.lua
-share/luakit/%%LUA_LIBDIR%%/settings_chrome.lua
-share/luakit/%%LUA_LIBDIR%%/styles.lua
-share/luakit/%%LUA_LIBDIR%%/tab_favicons.lua
-share/luakit/%%LUA_LIBDIR%%/tabhistory.lua
-share/luakit/%%LUA_LIBDIR%%/tabmenu.lua
-share/luakit/%%LUA_LIBDIR%%/taborder.lua
-share/luakit/%%LUA_LIBDIR%%/undoclose.lua
-share/luakit/%%LUA_LIBDIR%%/unique_instance.lua
-share/luakit/%%LUA_LIBDIR%%/userscripts.lua
-share/luakit/%%LUA_LIBDIR%%/vertical_tabs.lua
-share/luakit/%%LUA_LIBDIR%%/view_source.lua
-share/luakit/%%LUA_LIBDIR%%/viewpdf.lua
-share/luakit/%%LUA_LIBDIR%%/webinspector.lua
-share/luakit/%%LUA_LIBDIR%%/webview.lua
-share/luakit/%%LUA_LIBDIR%%/webview_wm.lua
-share/luakit/%%LUA_LIBDIR%%/window.lua
+share/luakit/lib/adblock.lua
+share/luakit/lib/adblock_chrome.lua
+share/luakit/lib/adblock_wm.lua
+share/luakit/lib/binds.lua
+share/luakit/lib/binds_chrome.lua
+share/luakit/lib/bookmarks.lua
+share/luakit/lib/bookmarks_chrome.lua
+share/luakit/lib/chrome.lua
+share/luakit/lib/chrome_wm.lua
+share/luakit/lib/clear_data.lua
+share/luakit/lib/cmdhist.lua
+share/luakit/lib/completion.lua
+share/luakit/lib/domain_props.lua
+share/luakit/lib/downloads.lua
+share/luakit/lib/downloads_chrome.lua
+share/luakit/lib/editor.lua
+share/luakit/lib/error_page.lua
+share/luakit/lib/error_page_wm.lua
+share/luakit/lib/follow.lua
+share/luakit/lib/follow_selected.lua
+share/luakit/lib/follow_selected_wm.lua
+share/luakit/lib/follow_wm.lua
+share/luakit/lib/formfiller.lua
+share/luakit/lib/formfiller_wm.lua
+share/luakit/lib/go_input.lua
+share/luakit/lib/go_next_prev.lua
+share/luakit/lib/go_up.lua
+share/luakit/lib/gopher.lua
+share/luakit/lib/help_chrome.lua
+share/luakit/lib/hide_scrollbars.lua
+share/luakit/lib/history.lua
+share/luakit/lib/history_chrome.lua
+share/luakit/lib/image_css.lua
+share/luakit/lib/image_css_wm.lua
+share/luakit/lib/introspector_chrome.lua
+share/luakit/lib/keysym.lua
+share/luakit/lib/log_chrome.lua
+share/luakit/lib/lousy/bind.lua
+share/luakit/lib/lousy/init.lua
+share/luakit/lib/lousy/load.lua
+share/luakit/lib/lousy/mode.lua
+share/luakit/lib/lousy/pickle.lua
+share/luakit/lib/lousy/signal.lua
+share/luakit/lib/lousy/theme.lua
+share/luakit/lib/lousy/uri.lua
+share/luakit/lib/lousy/util.lua
+share/luakit/lib/lousy/widget/buf.lua
+share/luakit/lib/lousy/widget/common.lua
+share/luakit/lib/lousy/widget/hist.lua
+share/luakit/lib/lousy/widget/init.lua
+share/luakit/lib/lousy/widget/menu.lua
+share/luakit/lib/lousy/widget/progress.lua
+share/luakit/lib/lousy/widget/scroll.lua
+share/luakit/lib/lousy/widget/ssl.lua
+share/luakit/lib/lousy/widget/tab.lua
+share/luakit/lib/lousy/widget/tabi.lua
+share/luakit/lib/lousy/widget/tablist.lua
+share/luakit/lib/lousy/widget/uri.lua
+share/luakit/lib/lousy/widget/zoom.lua
+share/luakit/lib/markdown.lua
+share/luakit/lib/modes.lua
+share/luakit/lib/newtab_chrome.lua
+share/luakit/lib/noscript.lua
+share/luakit/lib/open_editor.lua
+share/luakit/lib/proxy.lua
+share/luakit/lib/quickmarks.lua
+share/luakit/lib/readline.lua
+share/luakit/lib/referer_control_wm.lua
+share/luakit/lib/search.lua
+share/luakit/lib/select.lua
+share/luakit/lib/select_wm.lua
+share/luakit/lib/session.lua
+share/luakit/lib/settings.lua
+share/luakit/lib/settings_chrome.lua
+share/luakit/lib/styles.lua
+share/luakit/lib/tab_favicons.lua
+share/luakit/lib/tabhistory.lua
+share/luakit/lib/tabmenu.lua
+share/luakit/lib/taborder.lua
+share/luakit/lib/undoclose.lua
+share/luakit/lib/unique_instance.lua
+share/luakit/lib/userscripts.lua
+share/luakit/lib/vertical_tabs.lua
+share/luakit/lib/view_source.lua
+share/luakit/lib/viewpdf.lua
+share/luakit/lib/webinspector.lua
+share/luakit/lib/webview.lua
+share/luakit/lib/webview_wm.lua
+share/luakit/lib/window.lua
 share/luakit/resources/icons/COPYING
 share/luakit/resources/icons/tab-icon-chrome.png
 share/luakit/resources/icons/tab-icon-chrome@2x.png
diff --git a/www/luakit/pkg-plist b/www/luakit/pkg-plist
index 86dcfe124802..d68a0d4f32ae 100644
--- a/www/luakit/pkg-plist
+++ b/www/luakit/pkg-plist
@@ -1,7 +1,7 @@
 bin/luakit
 etc/xdg/luakit/rc.lua
 etc/xdg/luakit/theme.lua
-%%LUA_LIBDIR%%/luakit/luakit.so
+lib/luakit/luakit.so
 share/applications/luakit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.GPLv3
@@ -105,7 +105,7 @@ share/applications/luakit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/modules/tabhistory.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/tabmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/taborder.html
-%%PORTDOCS%%%%DOCSDIR%%/modules/tests.%%LUA_LIBDIR%%.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/tests.lib.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/undoclose.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/unique_instance.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/userscripts.html
@@ -124,95 +124,95 @@ share/applications/luakit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/pages/05-configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/pages/06-tests.html
 %%PORTDOCS%%%%DOCSDIR%%/pages/07-build-debian-package.html
-%%DATADIR%%/%%LUA_LIBDIR%%/adblock.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/adblock_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/adblock_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/binds.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/binds_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/bookmarks.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/bookmarks_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/chrome_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/clear_data.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/cmdhist.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/completion.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/domain_props.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/downloads.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/downloads_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/editor.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/error_page.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/error_page_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/follow.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/follow_selected.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/follow_selected_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/follow_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/formfiller.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/formfiller_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/go_input.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/go_next_prev.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/go_up.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gopher.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/help_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/hide_scrollbars.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/history.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/history_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/image_css.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/image_css_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/introspector_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/keysym.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/log_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/bind.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/load.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/mode.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/pickle.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/signal.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/theme.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/uri.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/util.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/buf.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/common.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/hist.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/menu.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/progress.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/scroll.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/ssl.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/tab.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/tabi.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/tablist.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/uri.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/zoom.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/markdown.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/modes.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/newtab_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/noscript.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/open_editor.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/proxy.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/quickmarks.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/readline.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/referer_control_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/search.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/select.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/select_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/session.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/settings.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/settings_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/styles.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/tab_favicons.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/tabhistory.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/tabmenu.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/taborder.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/undoclose.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/unique_instance.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/userscripts.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/vertical_tabs.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/view_source.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/viewpdf.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/webinspector.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/webview.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/webview_wm.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/window.lua
+%%DATADIR%%/lib/adblock.lua
+%%DATADIR%%/lib/adblock_chrome.lua
+%%DATADIR%%/lib/adblock_wm.lua
+%%DATADIR%%/lib/binds.lua
+%%DATADIR%%/lib/binds_chrome.lua
+%%DATADIR%%/lib/bookmarks.lua
+%%DATADIR%%/lib/bookmarks_chrome.lua
+%%DATADIR%%/lib/chrome.lua
+%%DATADIR%%/lib/chrome_wm.lua
+%%DATADIR%%/lib/clear_data.lua
+%%DATADIR%%/lib/cmdhist.lua
+%%DATADIR%%/lib/completion.lua
+%%DATADIR%%/lib/domain_props.lua
+%%DATADIR%%/lib/downloads.lua
+%%DATADIR%%/lib/downloads_chrome.lua
+%%DATADIR%%/lib/editor.lua
+%%DATADIR%%/lib/error_page.lua
+%%DATADIR%%/lib/error_page_wm.lua
+%%DATADIR%%/lib/follow.lua
+%%DATADIR%%/lib/follow_selected.lua
+%%DATADIR%%/lib/follow_selected_wm.lua
+%%DATADIR%%/lib/follow_wm.lua
+%%DATADIR%%/lib/formfiller.lua
+%%DATADIR%%/lib/formfiller_wm.lua
+%%DATADIR%%/lib/go_input.lua
+%%DATADIR%%/lib/go_next_prev.lua
+%%DATADIR%%/lib/go_up.lua
+%%DATADIR%%/lib/gopher.lua
+%%DATADIR%%/lib/help_chrome.lua
+%%DATADIR%%/lib/hide_scrollbars.lua
+%%DATADIR%%/lib/history.lua
+%%DATADIR%%/lib/history_chrome.lua
+%%DATADIR%%/lib/image_css.lua
+%%DATADIR%%/lib/image_css_wm.lua
+%%DATADIR%%/lib/introspector_chrome.lua
+%%DATADIR%%/lib/keysym.lua
+%%DATADIR%%/lib/log_chrome.lua
+%%DATADIR%%/lib/lousy/bind.lua
+%%DATADIR%%/lib/lousy/init.lua
+%%DATADIR%%/lib/lousy/load.lua
+%%DATADIR%%/lib/lousy/mode.lua
+%%DATADIR%%/lib/lousy/pickle.lua
+%%DATADIR%%/lib/lousy/signal.lua
+%%DATADIR%%/lib/lousy/theme.lua
+%%DATADIR%%/lib/lousy/uri.lua
+%%DATADIR%%/lib/lousy/util.lua
+%%DATADIR%%/lib/lousy/widget/buf.lua
+%%DATADIR%%/lib/lousy/widget/common.lua
+%%DATADIR%%/lib/lousy/widget/hist.lua
+%%DATADIR%%/lib/lousy/widget/init.lua
+%%DATADIR%%/lib/lousy/widget/menu.lua
+%%DATADIR%%/lib/lousy/widget/progress.lua
+%%DATADIR%%/lib/lousy/widget/scroll.lua
+%%DATADIR%%/lib/lousy/widget/ssl.lua
+%%DATADIR%%/lib/lousy/widget/tab.lua
+%%DATADIR%%/lib/lousy/widget/tabi.lua
+%%DATADIR%%/lib/lousy/widget/tablist.lua
+%%DATADIR%%/lib/lousy/widget/uri.lua
+%%DATADIR%%/lib/lousy/widget/zoom.lua
+%%DATADIR%%/lib/markdown.lua
+%%DATADIR%%/lib/modes.lua
+%%DATADIR%%/lib/newtab_chrome.lua
+%%DATADIR%%/lib/noscript.lua
+%%DATADIR%%/lib/open_editor.lua
+%%DATADIR%%/lib/proxy.lua
+%%DATADIR%%/lib/quickmarks.lua
+%%DATADIR%%/lib/readline.lua
+%%DATADIR%%/lib/referer_control_wm.lua
+%%DATADIR%%/lib/search.lua
+%%DATADIR%%/lib/select.lua
+%%DATADIR%%/lib/select_wm.lua
+%%DATADIR%%/lib/session.lua
+%%DATADIR%%/lib/settings.lua
+%%DATADIR%%/lib/settings_chrome.lua
+%%DATADIR%%/lib/styles.lua
+%%DATADIR%%/lib/tab_favicons.lua
+%%DATADIR%%/lib/tabhistory.lua
+%%DATADIR%%/lib/tabmenu.lua
+%%DATADIR%%/lib/taborder.lua
+%%DATADIR%%/lib/undoclose.lua
+%%DATADIR%%/lib/unique_instance.lua
+%%DATADIR%%/lib/userscripts.lua
+%%DATADIR%%/lib/vertical_tabs.lua
+%%DATADIR%%/lib/view_source.lua
+%%DATADIR%%/lib/viewpdf.lua
+%%DATADIR%%/lib/webinspector.lua
+%%DATADIR%%/lib/webview.lua
+%%DATADIR%%/lib/webview_wm.lua
+%%DATADIR%%/lib/window.lua
 %%DATADIR%%/resources/icons/COPYING
 %%DATADIR%%/resources/icons/tab-icon-chrome.png
 %%DATADIR%%/resources/icons/tab-icon-chrome@2x.png
diff --git a/www/osrm-backend/pkg-plist b/www/osrm-backend/pkg-plist
index 64b2c3c01f39..74d2e2177de0 100644
--- a/www/osrm-backend/pkg-plist
+++ b/www/osrm-backend/pkg-plist
@@ -80,34 +80,34 @@ include/osrm/util/coordinate.hpp
 include/osrm/util/exception.hpp
 include/osrm/util/json_container.hpp
 include/osrm/util/typedefs.hpp
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm.a
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm_contract.a
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm_customize.a
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm_extract.a
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm_guidance.a
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm_partition.a
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm_store.a
-%%LUA_LIBDIR%%/%%LUA_LIBDIR%%osrm_update.a
-%%LUA_LIBDIR%%data/pkgconfig/%%LUA_LIBDIR%%osrm.pc
+lib/libosrm.a
+lib/libosrm_contract.a
+lib/libosrm_customize.a
+lib/libosrm_extract.a
+lib/libosrm_guidance.a
+lib/libosrm_partition.a
+lib/libosrm_store.a
+lib/libosrm_update.a
+libdata/pkgconfig/libosrm.pc
 share/osrm/profiles/bicycle.lua
 share/osrm/profiles/car.lua
 share/osrm/profiles/debug_example.lua
 share/osrm/profiles/debug_way.lua
 share/osrm/profiles/examples/postgis.lua
 share/osrm/profiles/foot.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/access.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/destination.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/guidance.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/maxspeed.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/measure.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/pprint.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/profile_debugger.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/relations.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/sequence.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/set.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/tags.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/utils.lua
-share/osrm/profiles/%%LUA_LIBDIR%%/way_handlers.lua
+share/osrm/profiles/lib/access.lua
+share/osrm/profiles/lib/destination.lua
+share/osrm/profiles/lib/guidance.lua
+share/osrm/profiles/lib/maxspeed.lua
+share/osrm/profiles/lib/measure.lua
+share/osrm/profiles/lib/pprint.lua
+share/osrm/profiles/lib/profile_debugger.lua
+share/osrm/profiles/lib/relations.lua
+share/osrm/profiles/lib/sequence.lua
+share/osrm/profiles/lib/set.lua
+share/osrm/profiles/lib/tags.lua
+share/osrm/profiles/lib/utils.lua
+share/osrm/profiles/lib/way_handlers.lua
 share/osrm/profiles/rasterbot.lua
 share/osrm/profiles/rasterbotinterp.lua
 share/osrm/profiles/test.lua
diff --git a/x11-wm/awesome/pkg-plist b/x11-wm/awesome/pkg-plist
index d1630f34f72f..f1891ba18638 100644
--- a/x11-wm/awesome/pkg-plist
+++ b/x11-wm/awesome/pkg-plist
@@ -1,141 +1,141 @@
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/autofocus.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/button.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/client.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/client/focus.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/client/shape.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/client/urgent.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/completion.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/dbus.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/ewmh.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/firefox.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/qutebrowser.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/termite.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/tmux.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/vim.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/widget.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/key.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/keygrabber.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/corner.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/fair.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/floating.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/magnifier.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/max.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/spiral.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/layout/suit/tile.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/menu.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/drag_to_tag.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/resize.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/mouse/snap.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/placement.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/popup.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/prompt.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/remote.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/rules.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/screen.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/spawn.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/startup_notification.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/tag.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/titlebar.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/tooltip.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/util.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/wibar.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/wibox.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/button.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/calendar_popup.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/clienticon.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/common.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/graph.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/keyboardlayout.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/launcher.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/layoutbox.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/layoutlist.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/only_on_screen.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/progressbar.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/prompt.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/taglist.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/tasklist.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/textclock.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/watch.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/beautiful.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/beautiful/gtk.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/beautiful/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/beautiful/theme_assets.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/beautiful/xresources.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/cache.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/color.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/debug.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/filesystem.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/geometry.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/math.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/matrix.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/object.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/object/properties.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/protected_call.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/shape.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/sort/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/sort/topological.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/string.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/surface.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/table.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/timer.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/gears/wallpaper.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/menubar/icon_theme.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/menubar/index_theme.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/menubar/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/menubar/menu_gen.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/menubar/utils.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/naughty.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/naughty/core.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/naughty/dbus.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/naughty/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/arcchart.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/background.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/constraint.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/margin.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/mirror.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/place.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/radialprogressbar.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/rotate.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/container/scroll.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/drawable.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/hierarchy.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/align.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/constraint.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/fixed.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/flex.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/grid.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/manual.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/margin.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/mirror.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/ratio.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/rotate.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/scroll.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/stack.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/background.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/base.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/calendar.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/checkbox.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/graph.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/imagebox.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/init.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/piechart.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/progressbar.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/separator.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/slider.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/systray.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/textbox.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/textclock.lua
+%%DATADIR%%/lib/awful/autofocus.lua
+%%DATADIR%%/lib/awful/button.lua
+%%DATADIR%%/lib/awful/client.lua
+%%DATADIR%%/lib/awful/client/focus.lua
+%%DATADIR%%/lib/awful/client/shape.lua
+%%DATADIR%%/lib/awful/client/urgent.lua
+%%DATADIR%%/lib/awful/completion.lua
+%%DATADIR%%/lib/awful/dbus.lua
+%%DATADIR%%/lib/awful/ewmh.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/init.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/keys/firefox.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/keys/init.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/keys/qutebrowser.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/keys/termite.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/keys/tmux.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/keys/vim.lua
+%%DATADIR%%/lib/awful/hotkeys_popup/widget.lua
+%%DATADIR%%/lib/awful/init.lua
+%%DATADIR%%/lib/awful/key.lua
+%%DATADIR%%/lib/awful/keygrabber.lua
+%%DATADIR%%/lib/awful/layout/init.lua
+%%DATADIR%%/lib/awful/layout/suit/corner.lua
+%%DATADIR%%/lib/awful/layout/suit/fair.lua
+%%DATADIR%%/lib/awful/layout/suit/floating.lua
+%%DATADIR%%/lib/awful/layout/suit/init.lua
+%%DATADIR%%/lib/awful/layout/suit/magnifier.lua
+%%DATADIR%%/lib/awful/layout/suit/max.lua
+%%DATADIR%%/lib/awful/layout/suit/spiral.lua
+%%DATADIR%%/lib/awful/layout/suit/tile.lua
+%%DATADIR%%/lib/awful/menu.lua
+%%DATADIR%%/lib/awful/mouse/drag_to_tag.lua
+%%DATADIR%%/lib/awful/mouse/init.lua
+%%DATADIR%%/lib/awful/mouse/resize.lua
+%%DATADIR%%/lib/awful/mouse/snap.lua
+%%DATADIR%%/lib/awful/placement.lua
+%%DATADIR%%/lib/awful/popup.lua
+%%DATADIR%%/lib/awful/prompt.lua
+%%DATADIR%%/lib/awful/remote.lua
+%%DATADIR%%/lib/awful/rules.lua
+%%DATADIR%%/lib/awful/screen.lua
+%%DATADIR%%/lib/awful/spawn.lua
+%%DATADIR%%/lib/awful/startup_notification.lua
+%%DATADIR%%/lib/awful/tag.lua
+%%DATADIR%%/lib/awful/titlebar.lua
+%%DATADIR%%/lib/awful/tooltip.lua
+%%DATADIR%%/lib/awful/util.lua
+%%DATADIR%%/lib/awful/wibar.lua
+%%DATADIR%%/lib/awful/wibox.lua
+%%DATADIR%%/lib/awful/widget/button.lua
+%%DATADIR%%/lib/awful/widget/calendar_popup.lua
+%%DATADIR%%/lib/awful/widget/clienticon.lua
+%%DATADIR%%/lib/awful/widget/common.lua
+%%DATADIR%%/lib/awful/widget/graph.lua
+%%DATADIR%%/lib/awful/widget/init.lua
+%%DATADIR%%/lib/awful/widget/keyboardlayout.lua
+%%DATADIR%%/lib/awful/widget/launcher.lua
+%%DATADIR%%/lib/awful/widget/layoutbox.lua
+%%DATADIR%%/lib/awful/widget/layoutlist.lua
+%%DATADIR%%/lib/awful/widget/only_on_screen.lua
+%%DATADIR%%/lib/awful/widget/progressbar.lua
+%%DATADIR%%/lib/awful/widget/prompt.lua
+%%DATADIR%%/lib/awful/widget/taglist.lua
+%%DATADIR%%/lib/awful/widget/tasklist.lua
+%%DATADIR%%/lib/awful/widget/textclock.lua
+%%DATADIR%%/lib/awful/widget/watch.lua
+%%DATADIR%%/lib/beautiful.lua
+%%DATADIR%%/lib/beautiful/gtk.lua
+%%DATADIR%%/lib/beautiful/init.lua
+%%DATADIR%%/lib/beautiful/theme_assets.lua
+%%DATADIR%%/lib/beautiful/xresources.lua
+%%DATADIR%%/lib/gears/cache.lua
+%%DATADIR%%/lib/gears/color.lua
+%%DATADIR%%/lib/gears/debug.lua
+%%DATADIR%%/lib/gears/filesystem.lua
+%%DATADIR%%/lib/gears/geometry.lua
+%%DATADIR%%/lib/gears/init.lua
+%%DATADIR%%/lib/gears/math.lua
+%%DATADIR%%/lib/gears/matrix.lua
+%%DATADIR%%/lib/gears/object.lua
+%%DATADIR%%/lib/gears/object/properties.lua
+%%DATADIR%%/lib/gears/protected_call.lua
+%%DATADIR%%/lib/gears/shape.lua
+%%DATADIR%%/lib/gears/sort/init.lua
+%%DATADIR%%/lib/gears/sort/topological.lua
+%%DATADIR%%/lib/gears/string.lua
+%%DATADIR%%/lib/gears/surface.lua
+%%DATADIR%%/lib/gears/table.lua
+%%DATADIR%%/lib/gears/timer.lua
+%%DATADIR%%/lib/gears/wallpaper.lua
+%%DATADIR%%/lib/menubar/icon_theme.lua
+%%DATADIR%%/lib/menubar/index_theme.lua
+%%DATADIR%%/lib/menubar/init.lua
+%%DATADIR%%/lib/menubar/menu_gen.lua
+%%DATADIR%%/lib/menubar/utils.lua
+%%DATADIR%%/lib/naughty.lua
+%%DATADIR%%/lib/naughty/core.lua
+%%DATADIR%%/lib/naughty/dbus.lua
+%%DATADIR%%/lib/naughty/init.lua
+%%DATADIR%%/lib/wibox/container/arcchart.lua
+%%DATADIR%%/lib/wibox/container/background.lua
+%%DATADIR%%/lib/wibox/container/constraint.lua
+%%DATADIR%%/lib/wibox/container/init.lua
+%%DATADIR%%/lib/wibox/container/margin.lua
+%%DATADIR%%/lib/wibox/container/mirror.lua
+%%DATADIR%%/lib/wibox/container/place.lua
+%%DATADIR%%/lib/wibox/container/radialprogressbar.lua
+%%DATADIR%%/lib/wibox/container/rotate.lua
+%%DATADIR%%/lib/wibox/container/scroll.lua
+%%DATADIR%%/lib/wibox/drawable.lua
+%%DATADIR%%/lib/wibox/hierarchy.lua
+%%DATADIR%%/lib/wibox/init.lua
+%%DATADIR%%/lib/wibox/layout/align.lua
+%%DATADIR%%/lib/wibox/layout/constraint.lua
+%%DATADIR%%/lib/wibox/layout/fixed.lua
+%%DATADIR%%/lib/wibox/layout/flex.lua
+%%DATADIR%%/lib/wibox/layout/grid.lua
+%%DATADIR%%/lib/wibox/layout/init.lua
+%%DATADIR%%/lib/wibox/layout/manual.lua
+%%DATADIR%%/lib/wibox/layout/margin.lua
+%%DATADIR%%/lib/wibox/layout/mirror.lua
+%%DATADIR%%/lib/wibox/layout/ratio.lua
+%%DATADIR%%/lib/wibox/layout/rotate.lua
+%%DATADIR%%/lib/wibox/layout/scroll.lua
+%%DATADIR%%/lib/wibox/layout/stack.lua
+%%DATADIR%%/lib/wibox/widget/background.lua
+%%DATADIR%%/lib/wibox/widget/base.lua
+%%DATADIR%%/lib/wibox/widget/calendar.lua
+%%DATADIR%%/lib/wibox/widget/checkbox.lua
+%%DATADIR%%/lib/wibox/widget/graph.lua
+%%DATADIR%%/lib/wibox/widget/imagebox.lua
+%%DATADIR%%/lib/wibox/widget/init.lua
+%%DATADIR%%/lib/wibox/widget/piechart.lua
+%%DATADIR%%/lib/wibox/widget/progressbar.lua
+%%DATADIR%%/lib/wibox/widget/separator.lua
+%%DATADIR%%/lib/wibox/widget/slider.lua
+%%DATADIR%%/lib/wibox/widget/systray.lua
+%%DATADIR%%/lib/wibox/widget/textbox.lua
+%%DATADIR%%/lib/wibox/widget/textclock.lua
 %%DATADIR%%/icons/awesome16.png
 %%DATADIR%%/icons/awesome32.png
 %%DATADIR%%/icons/awesome48.png