awesome: Update to 4.3

Note: no documentation included yet, we don't have the tools

Awesome v4.3 is the third release of the 4.x API. It comes after one and
a half years of little fixes and improvements. Awesome v4.2 was very
stable thanks to everybody's effort to unit test everything. Given no
major bug warranted a new release, this one adds a few large features
while preserving full compatibility with existing user configurations.

Some highlights:
- Better DPI handling
- Extendable awful.rules providers and better awful.spawn functions
- A brand new keygrabber API
- A new GTK color palette based theme
- Widgets improvements

8 files changed, 44 insertions, 486 deletions

diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index 246397e0b8a..96337b27a01 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.66 2019/05/23 19:23:18 rillig Exp $
+# $NetBSD: Makefile,v 1.67 2019/07/17 22:08:58 nia Exp $
 
-DISTNAME=	awesome-4.2
-PKGREVISION=	5
+DISTNAME=	awesome-4.3
 CATEGORIES=	wm
+EXTRACT_SUFX=	.tar.xz
 MASTER_SITES=	${MASTER_SITE_GITHUB:=awesomeWM/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pallegra@gmail.com
 HOMEPAGE=	https://awesomewm.org/
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=	awesome<3.0
 
-USE_TOOLS+=	bash gmake pkg-config
+USE_TOOLS+=	bash pkg-config
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 REPLACE_BASH+=	utils/awesome-client
@@ -22,45 +22,31 @@ REPLACE_BASH+=	utils/awesome-client
 
 PKG_SYSCONFSUBDIR=	xdg/awesome
 
-CONFIGURE_DIRS=	${WRKDIR}/build
+CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	${WRKSRC}
 
+.include "../../lang/lua/luaversion.mk"
+
 CMAKE_ARGS+=	-DCOMPRESS_MANPAGES=${MANZ:Q}
 CMAKE_ARGS+=	-DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
 CMAKE_ARGS+=	-DOVERRIDE_VERSION=${PKGVERSION_NOREV}
 CMAKE_ARGS+=	-DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
+CMAKE_ARGS+=	-DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg
 
 EGDIR=		${PREFIX}/share/examples/awesome
 CONF_FILES=	${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
 
-SUBST_CLASSES+=		eg
-SUBST_MESSAGE.eg=	Fixing pathnames
-SUBST_STAGE.eg=		pre-configure
-SUBST_FILES.eg=		CMakeLists.txt
-SUBST_SED.eg=		-e "s,\$${AWESOME_SYSCONFDIR},${EGDIR},"
+TOOL_DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+=	${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
 
 SUBST_CLASSES+=		lua
-SUBST_MESSAGE.lua=	Fixing lua prefix
 SUBST_STAGE.lua=	pre-configure
-SUBST_FILES.lua=	CMakeLists.txt awesomeConfig.cmake build-utils/lgi-check.sh \
-			tests/examples/CMakeLists.txt
-SUBST_VARS.lua=		LUA_INTERPRETER
-
-SUBST_CLASSES+=		ldoc
-SUBST_MESSAGE.ldoc=	Fixing ldoc executable
-SUBST_STAGE.ldoc=	pre-configure
-SUBST_FILES.ldoc=	awesomeConfig.cmake
-SUBST_SED.ldoc=		-e "s,@LDOC_EXECUTABLE@,ldoc${_LUA_DOT_VERSION},"
-
-BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
-BUILD_DEPENDS+=		asciidoc>=8.3.0:../../textproc/asciidoc
-BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
-BUILD_DEPENDS+=		docbook-xml-[0-9]*:../../textproc/docbook-xml
-
-DEPENDS+=		${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
+SUBST_MESSAGE.lua=	Fixing lua executable name.
+SUBST_FILES.lua+=	awesomeConfig.cmake
+SUBST_SED.lua=		-e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g'
 
 pre-configure:
-	${RUN} mkdir -p ${WRKDIR}/build
+	${RUN} mkdir -p ${WRKSRC}/build
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
@@ -79,5 +65,4 @@ pre-configure:
 .include "../../x11/xcb-util-xrm/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/awesome/PLIST b/wm/awesome/PLIST
index a509ec8b023..43581194283 100644
--- a/wm/awesome/PLIST
+++ b/wm/awesome/PLIST
@@ -1,24 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2018/01/01 22:30:01 rillig Exp $
+@comment $NetBSD: PLIST,v 1.11 2019/07/17 22:08:58 nia Exp $
 bin/awesome
 bin/awesome-client
-man/de/man1/awesome-client.1
-man/de/man1/awesome.1
-man/de/man5/awesomerc.5
-man/es/man1/awesome-client.1
-man/es/man1/awesome.1
-man/es/man5/awesomerc.5
-man/fr/man1/awesome-client.1
-man/fr/man1/awesome.1
-man/fr/man5/awesomerc.5
-man/it/man1/awesome-client.1
-man/it/man1/awesome.1
-man/it/man5/awesomerc.5
-man/man1/awesome-client.1
-man/man1/awesome.1
-man/man5/awesomerc.5
-man/ru/man1/awesome-client.1
-man/ru/man1/awesome.1
-man/ru/man5/awesomerc.5
 share/awesome/icons/awesome16.png
 share/awesome/icons/awesome32.png
 share/awesome/icons/awesome48.png
@@ -36,6 +18,7 @@ share/awesome/lib/awful/hotkeys_popup/init.lua
 share/awesome/lib/awful/hotkeys_popup/keys/firefox.lua
 share/awesome/lib/awful/hotkeys_popup/keys/init.lua
 share/awesome/lib/awful/hotkeys_popup/keys/qutebrowser.lua
+share/awesome/lib/awful/hotkeys_popup/keys/termite.lua
 share/awesome/lib/awful/hotkeys_popup/keys/tmux.lua
 share/awesome/lib/awful/hotkeys_popup/keys/vim.lua
 share/awesome/lib/awful/hotkeys_popup/widget.lua
@@ -57,6 +40,7 @@ share/awesome/lib/awful/mouse/init.lua
 share/awesome/lib/awful/mouse/resize.lua
 share/awesome/lib/awful/mouse/snap.lua
 share/awesome/lib/awful/placement.lua
+share/awesome/lib/awful/popup.lua
 share/awesome/lib/awful/prompt.lua
 share/awesome/lib/awful/remote.lua
 share/awesome/lib/awful/rules.lua
@@ -78,6 +62,7 @@ share/awesome/lib/awful/widget/init.lua
 share/awesome/lib/awful/widget/keyboardlayout.lua
 share/awesome/lib/awful/widget/launcher.lua
 share/awesome/lib/awful/widget/layoutbox.lua
+share/awesome/lib/awful/widget/layoutlist.lua
 share/awesome/lib/awful/widget/only_on_screen.lua
 share/awesome/lib/awful/widget/progressbar.lua
 share/awesome/lib/awful/widget/prompt.lua
@@ -86,6 +71,7 @@ share/awesome/lib/awful/widget/tasklist.lua
 share/awesome/lib/awful/widget/textclock.lua
 share/awesome/lib/awful/widget/watch.lua
 share/awesome/lib/beautiful.lua
+share/awesome/lib/beautiful/gtk.lua
 share/awesome/lib/beautiful/init.lua
 share/awesome/lib/beautiful/theme_assets.lua
 share/awesome/lib/beautiful/xresources.lua
@@ -101,6 +87,8 @@ share/awesome/lib/gears/object.lua
 share/awesome/lib/gears/object/properties.lua
 share/awesome/lib/gears/protected_call.lua
 share/awesome/lib/gears/shape.lua
+share/awesome/lib/gears/sort/init.lua
+share/awesome/lib/gears/sort/topological.lua
 share/awesome/lib/gears/string.lua
 share/awesome/lib/gears/surface.lua
 share/awesome/lib/gears/table.lua
@@ -150,6 +138,7 @@ share/awesome/lib/wibox/widget/imagebox.lua
 share/awesome/lib/wibox/widget/init.lua
 share/awesome/lib/wibox/widget/piechart.lua
 share/awesome/lib/wibox/widget/progressbar.lua
+share/awesome/lib/wibox/widget/separator.lua
 share/awesome/lib/wibox/widget/slider.lua
 share/awesome/lib/wibox/widget/systray.lua
 share/awesome/lib/wibox/widget/textbox.lua
@@ -213,6 +202,7 @@ share/awesome/themes/default/titlebar/sticky_focus_active.png
 share/awesome/themes/default/titlebar/sticky_focus_inactive.png
 share/awesome/themes/default/titlebar/sticky_normal_active.png
 share/awesome/themes/default/titlebar/sticky_normal_inactive.png
+share/awesome/themes/gtk/theme.lua
 share/awesome/themes/sky/awesome-icon.png
 share/awesome/themes/sky/layouts/cornerne.png
 share/awesome/themes/sky/layouts/cornernw.png
@@ -277,302 +267,5 @@ share/doc/awesome/00-authors.md
 share/doc/awesome/01-readme.md
 share/doc/awesome/02-contributing.md
 share/doc/awesome/LICENSE
-${PLIST.doc}share/doc/awesome/doc/classes/awful.button.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.tooltip.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.wibar.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.button.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.calendar_popup.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.clienticon.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.common.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.graph.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.keyboardlayout.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.launcher.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.layoutbox.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.only_on_screen.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.progressbar.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.prompt.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.taglist.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.tasklist.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.textclock.html
-${PLIST.doc}share/doc/awesome/doc/classes/awful.widget.watch.html
-${PLIST.doc}share/doc/awesome/doc/classes/button.html
-${PLIST.doc}share/doc/awesome/doc/classes/client.html
-${PLIST.doc}share/doc/awesome/doc/classes/drawable.html
-${PLIST.doc}share/doc/awesome/doc/classes/gears.cache.html
-${PLIST.doc}share/doc/awesome/doc/classes/gears.matrix.html
-${PLIST.doc}share/doc/awesome/doc/classes/gears.object.html
-${PLIST.doc}share/doc/awesome/doc/classes/gears.timer.html
-${PLIST.doc}share/doc/awesome/doc/classes/key.html
-${PLIST.doc}share/doc/awesome/doc/classes/menubar.icon_theme.html
-${PLIST.doc}share/doc/awesome/doc/classes/menubar.index_theme.html
-${PLIST.doc}share/doc/awesome/doc/classes/screen.html
-${PLIST.doc}share/doc/awesome/doc/classes/signals.html
-${PLIST.doc}share/doc/awesome/doc/classes/tag.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.arcchart.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.background.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.constraint.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.margin.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.mirror.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.place.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.radialprogressbar.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.rotate.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.container.scroll.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.drawable.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.align.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.constraint.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.fixed.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.flex.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.grid.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.manual.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.margin.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.mirror.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.ratio.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.rotate.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.scroll.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.layout.stack.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.background.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.base.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.calendar.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.checkbox.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.graph.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.imagebox.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.piechart.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.progressbar.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.slider.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.systray.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.textbox.html
-${PLIST.doc}share/doc/awesome/doc/classes/wibox.widget.textclock.html
-${PLIST.doc}share/doc/awesome/doc/classes/xproperties.html
-${PLIST.doc}share/doc/awesome/doc/documentation/00-authors.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/01-readme.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/02-contributing.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/03-declarative-layout.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/04-new-widgets.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/05-awesomerc.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/06-appearance.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/07-my-first-awesome.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/16-using-cairo.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/17-porting-tips.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/89-NEWS.md.html
-${PLIST.doc}share/doc/awesome/doc/documentation/90-FAQ.md.html
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_mouse_coords.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_align.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_bottom.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_bottom_left.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_bottom_right.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_center_horizontal.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_center_vertical.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_centered.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_closest_mouse.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_compose.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_compose2.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_left.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_maximize.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_maximize_horizontally.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_maximize_vertically.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_next_to_mouse.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_no_offscreen.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_no_overlap.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_resize_to_mouse.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_right.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_down.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_left.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_right.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_up.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_top.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_top_left.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_top_right.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_awful_placement_under_mouse.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_arc.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_arrow.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_circle.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_cross.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_hexagon.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_infobubble.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_isosceles_triangle.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_losange.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_octogon.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_parallelogram.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_partially_rounded_rect.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_pie.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_powerline.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_radial_progress.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_rectangle.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_rectangular_tag.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_rounded_bar.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_gears_shape_rounded_rect.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_defaults_prompt.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_highlight.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_hooks.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_keypress.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_simple.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_vilike.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_bg.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_border_width.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_paddings.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_rounded_edge.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_start_angle.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_thickness.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_value.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_bg.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_clip.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_fg.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_shape.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_arcchart.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_background.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_constraint.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_margin.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_mirror.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_only_on_screen.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_place.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_radialprogressbar.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_rotate.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_scroll.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_border_color.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_border_width.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_color.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_padding.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_value.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_container_rotate_angle.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_align.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_fixed.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_flex.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_grid.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_manual.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_ratio.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_stack.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_add.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_expand.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_extend_column.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_imperative.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_insert_column.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_min_size.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_orientation.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_remove.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_remove_column.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_spacing.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_superpose.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_manual_add_at.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_manual_move_widget.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_ratio_ajust_ratio.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_ratio_inc_ratio.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_ratio_strategy.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_stack_offset.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_layout_stack_spacing.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_logo_logo.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_logo_logo_and_name.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_fn_embed_cell.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_font.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_long_weekdays.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_month.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_start_sunday.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_week_numbers.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_year.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_bg.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_check_shape.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_custom.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_shape.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_calendar.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_checkbox.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_graph.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_imagebox.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_piechart.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_progressbar.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_slider.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_textbox.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_graph_step.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_piechart_border_color.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_piechart_border_width.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_piechart_label.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_bar_shape.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_clip.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_encapsulation.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_shape.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_text.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_vertical.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_border.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_color.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_height.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_margins.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_shape.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_border.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_color.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_margins.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_shape.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_width.svg
-${PLIST.doc}share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_value.svg
-${PLIST.doc}share/doc/awesome/doc/images/awful_widget_watch.png
-${PLIST.doc}share/doc/awesome/doc/images/client_geo.svg
-${PLIST.doc}share/doc/awesome/doc/images/mouse.svg
-${PLIST.doc}share/doc/awesome/doc/images/tag_props.svg
-${PLIST.doc}share/doc/awesome/doc/images/widgetlayout1.png
-${PLIST.doc}share/doc/awesome/doc/images/widgetlayout2.png
-${PLIST.doc}share/doc/awesome/doc/index.html
-${PLIST.doc}share/doc/awesome/doc/ldoc_pale.css
-${PLIST.doc}share/doc/awesome/doc/libraries/awesome.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.client.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.completion.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.ewmh.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.hotkeys_popup.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.firefox.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.qutebrowser.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.tmux.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.vim.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.hotkeys_popup.widget.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.key.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.keygrabber.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.layout.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.menu.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.mouse.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.placement.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.prompt.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.rules.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.screen.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.spawn.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.tag.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.titlebar.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.util.html
-${PLIST.doc}share/doc/awesome/doc/libraries/awful.wibox.html
-${PLIST.doc}share/doc/awesome/doc/libraries/beautiful.html
-${PLIST.doc}share/doc/awesome/doc/libraries/beautiful.theme_assets.html
-${PLIST.doc}share/doc/awesome/doc/libraries/beautiful.xresources.html
-${PLIST.doc}share/doc/awesome/doc/libraries/dbus.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.color.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.debug.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.filesystem.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.geometry.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.math.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.object.properties.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.protected_call.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.shape.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.string.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.surface.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.table.html
-${PLIST.doc}share/doc/awesome/doc/libraries/gears.wallpaper.html
-${PLIST.doc}share/doc/awesome/doc/libraries/keygrabber.html
-${PLIST.doc}share/doc/awesome/doc/libraries/menubar.html
-${PLIST.doc}share/doc/awesome/doc/libraries/menubar.menu_gen.html
-${PLIST.doc}share/doc/awesome/doc/libraries/menubar.utils.html
-${PLIST.doc}share/doc/awesome/doc/libraries/mouse.html
-${PLIST.doc}share/doc/awesome/doc/libraries/mousegrabber.html
-${PLIST.doc}share/doc/awesome/doc/libraries/naughty.dbus.html
-${PLIST.doc}share/doc/awesome/doc/libraries/naughty.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.button.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.client.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.drawable.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.drawin.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.key.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.screen.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.tag.html
-${PLIST.doc}share/doc/awesome/doc/libraries/objects.window.html
-${PLIST.doc}share/doc/awesome/doc/libraries/root.html
-${PLIST.doc}share/doc/awesome/doc/libraries/selection.html
-${PLIST.doc}share/doc/awesome/doc/libraries/wibox.hierarchy.html
-${PLIST.doc}share/doc/awesome/doc/sample files/rc.lua.html
-${PLIST.doc}share/doc/awesome/doc/sample files/theme.lua.html
 share/examples/awesome/rc.lua
 share/xsessions/awesome.desktop
diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo
index 802263e19dc..bd95cdda3f0 100644
--- a/wm/awesome/distinfo
+++ b/wm/awesome/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.20 2017/08/18 10:16:11 triaxx Exp $
+$NetBSD: distinfo,v 1.21 2019/07/17 22:08:58 nia Exp $
 
-SHA1 (awesome-4.2.tar.gz) = e9c6cfb55ffbd81fbf6a9842552215fa8d03fc93
-RMD160 (awesome-4.2.tar.gz) = 582a786bed138cf094948150975bf66b206bd2d1
-SHA512 (awesome-4.2.tar.gz) = 4cca2edd48f2299732e009a3aeaf6a2f5c2b95f4e4b93705c13102f70dbe4ea83306430b69264315d8686ca6746f870b6b9ac3edfdf63a82623508589179a772
-Size (awesome-4.2.tar.gz) = 1133897 bytes
-SHA1 (patch-CMakeLists.txt) = 8fbf701c730badb73c0e5cee270a8dd4188c7b6f
-SHA1 (patch-awesomeConfig.cmake) = 363032da4186a79eee01d6ce91e404add590e99c
-SHA1 (patch-build-utils_lgi-check.sh) = 3a76c9f56871c4379b1af388bee2e137e5e5bd8d
-SHA1 (patch-tests_examples_CMakeLists.txt) = d9f4a3e3d2287fd6eaca7476088bac76f5445e12
+SHA1 (awesome-4.3.tar.xz) = 543f3b2ee17719176f37fbe3f0cfd1d046a9e1cc
+RMD160 (awesome-4.3.tar.xz) = f12f27114c96f0d80314cd54b5c6d1b21cb3ba18
+SHA512 (awesome-4.3.tar.xz) = c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
+Size (awesome-4.3.tar.xz) = 1037816 bytes
+SHA1 (patch-CMakeLists.txt) = a3473fdbea318b0cf280a9c29e77798d38d17d70
diff --git a/wm/awesome/options.mk b/wm/awesome/options.mk
index 38a9aed4056..ab8c6647be7 100644
--- a/wm/awesome/options.mk
+++ b/wm/awesome/options.mk
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2017/08/18 10:16:11 triaxx Exp $
+# $NetBSD: options.mk,v 1.3 2019/07/17 22:08:58 nia Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.awesome
-PKG_SUPPORTED_OPTIONS=		dbus debug doc
-PLIST_VARS+=			doc
+PKG_SUPPORTED_OPTIONS=		dbus debug
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -24,14 +22,3 @@ CMAKE_ARGS+=	-DWITH_DBUS=OFF
 .if !empty(PKG_OPTIONS:Mdebug)
 .  include "../../devel/libexecinfo/buildlink3.mk"
 .endif
-
-###
-### Doc support
-###
-.if !empty(PKG_OPTIONS:Mdoc)
-CMAKE_ARGS+=	-DGENERATE_DOC=ON
-BUILD_DEPENDS+=	${LUA_PKGPREFIX}-LDoc-[0-9]*:../../textproc/LDoc
-PLIST.doc=	yes
-.else
-CMAKE_ARGS+=	-DGENERATE_DOC=OFF
-.endif
diff --git a/wm/awesome/patches/patch-CMakeLists.txt b/wm/awesome/patches/patch-CMakeLists.txt
index b5a54071c4b..f36e8898cb9 100644
--- a/wm/awesome/patches/patch-CMakeLists.txt
+++ b/wm/awesome/patches/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2017/08/15 10:57:35 triaxx Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2019/07/17 22:08:58 nia Exp $
 
-Use pkgsrc lua interpreter instead of builtin one.
+Install config file to the examples directory.
 
---- CMakeLists.txt.orig	2017-07-15 13:53:13.000000000 +0000
+--- CMakeLists.txt.orig	2019-01-28 06:53:24.000000000 +0000
 +++ CMakeLists.txt
-@@ -406,7 +406,7 @@ add_custom_target(check-integration
-     VERBATIM)
- add_dependencies(check-integration test-gravity)
- add_custom_target(check-requires
--    lua "${CMAKE_SOURCE_DIR}/build-utils/check_for_invalid_requires.lua"
-+    @LUA_INTERPRETER@ "${CMAKE_SOURCE_DIR}/build-utils/check_for_invalid_requires.lua"
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-     COMMENT "Checking use of require()"
-     USES_TERMINAL
+@@ -371,7 +371,7 @@ install(TARGETS ${PROJECT_AWE_NAME} RUNT
+ install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH}
+     PATTERN "*.in" EXCLUDE)
+-install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR}
++install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/awesome
+         RENAME rc.lua)
+ if(GENERATE_MANPAGES)
+     if(COMPRESS_MANPAGES)
diff --git a/wm/awesome/patches/patch-awesomeConfig.cmake b/wm/awesome/patches/patch-awesomeConfig.cmake
deleted file mode 100644
index 58fdd459566..00000000000
--- a/wm/awesome/patches/patch-awesomeConfig.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-awesomeConfig.cmake,v 1.5 2017/08/18 10:16:11 triaxx Exp $
-
-Use pkgsrc lua interpreter instead of builtin one.
-
---- awesomeConfig.cmake.orig	2017-07-15 13:53:13.000000000 +0000
-+++ awesomeConfig.cmake
-@@ -40,7 +40,7 @@ a_find_program(XMLTO_EXECUTABLE xmlto FA
- a_find_program(GZIP_EXECUTABLE gzip FALSE)
- # Lua documentation
- if(GENERATE_DOC)
--    a_find_program(LDOC_EXECUTABLE ldoc FALSE)
-+    a_find_program(LDOC_EXECUTABLE @LDOC_EXECUTABLE@ FALSE)
-     if(NOT LDOC_EXECUTABLE)
-         a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
-     endif()
-@@ -361,7 +361,7 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_
- 
- add_custom_command(
-         OUTPUT ${BUILD_DIR}/docs/06-appearance.md
--        COMMAND lua ${SOURCE_DIR}/docs/06-appearance.md.lua
-+        COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/06-appearance.md.lua
-         ${BUILD_DIR}/docs/06-appearance.md
-         DEPENDS lgi-check
- )
-@@ -369,7 +369,7 @@ add_custom_command(
- add_custom_command(
-         OUTPUT ${BUILD_DIR}/awesomerc.lua ${BUILD_DIR}/docs/05-awesomerc.md
-             ${BUILD_DIR}/script_files/rc.lua
--        COMMAND lua ${SOURCE_DIR}/docs/05-awesomerc.md.lua
-+        COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/05-awesomerc.md.lua
-         ${BUILD_DIR}/docs/05-awesomerc.md ${SOURCE_DIR}/awesomerc.lua
-         ${BUILD_DIR}/awesomerc.lua
-         ${BUILD_DIR}/script_files/rc.lua
-@@ -377,7 +377,7 @@ add_custom_command(
- 
- add_custom_command(
-         OUTPUT ${BUILD_DIR}/script_files/theme.lua
--        COMMAND lua ${SOURCE_DIR}/docs/sample_theme.lua ${BUILD_DIR}/script_files/
-+        COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/sample_theme.lua ${BUILD_DIR}/script_files/
- )
- 
- # Create a target for the auto-generated awesomerc.lua and other files
diff --git a/wm/awesome/patches/patch-build-utils_lgi-check.sh b/wm/awesome/patches/patch-build-utils_lgi-check.sh
deleted file mode 100644
index 3e2ca73e0e2..00000000000
--- a/wm/awesome/patches/patch-build-utils_lgi-check.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-build-utils_lgi-check.sh,v 1.2 2017/08/15 10:57:35 triaxx Exp $
-
-Use pkgsrc lua interpreter instead of builtin one.
-
---- build-utils/lgi-check.sh.orig	2017-07-15 13:53:13.000000000 +0000
-+++ build-utils/lgi-check.sh
-@@ -22,16 +22,16 @@ die()
- }
- 
- # Check if we have lgi
--lua -e 'require("lgi")' || die
-+@LUA_INTERPRETER@ -e 'require("lgi")' || die
- 
- # Check the version number.
- # Keep this in sync with lib/gears/surface.lua and .travis.yml (LGIVER)!
--lua -e '_, _, major_minor, patch = string.find(require("lgi.version"), "^(%d%.%d)%.(%d)");
-+@LUA_INTERPRETER@ -e '_, _, major_minor, patch = string.find(require("lgi.version"), "^(%d%.%d)%.(%d)");
- 	if tonumber(major_minor) < 0.8 or (tonumber(major_minor) == 0.8 and tonumber(patch) < 0) then
- 		error(string.format("lgi is too old, need at least version %s, got %s.",
- 		                    "0.8.0", require("lgi.version"))) end' || die
- 
- # Check for the needed gi files
--lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo, l.GLib, l.Gio)' || die
-+@LUA_INTERPRETER@ -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo, l.GLib, l.Gio)' || die
- 
- # vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/wm/awesome/patches/patch-tests_examples_CMakeLists.txt b/wm/awesome/patches/patch-tests_examples_CMakeLists.txt
deleted file mode 100644
index 96060b1d280..00000000000
--- a/wm/awesome/patches/patch-tests_examples_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-tests_examples_CMakeLists.txt,v 1.1 2017/08/15 10:57:35 triaxx Exp $
-
-Use pkgsrc lua interpreter instead of builtin one.
-
---- tests/examples/CMakeLists.txt.orig	2017-07-15 13:53:13.000000000 +0000
-+++ tests/examples/CMakeLists.txt
-@@ -12,7 +12,7 @@
- cmake_minimum_required(VERSION 3.0.0)
- 
- # Get and update the LUA_PATH so the scripts can be executed without Awesome.
--execute_process(COMMAND lua -e print\(package.path\) OUTPUT_VARIABLE "LUA_PATH_")
-+execute_process(COMMAND @LUA_INTERPRETER@ -e print\(package.path\) OUTPUT_VARIABLE "LUA_PATH_")
- 
- # Make sure the system can be called from the test directory
- if(NOT SOURCE_DIR AND ${CMAKE_CURRENT_SOURCE_DIR} MATCHES "/tests/examples")
-@@ -26,7 +26,7 @@ endif()
- 
- if (DEFINED ENV{DO_COVERAGE} AND NOT $ENV{DO_COVERAGE} STREQUAL "0")
-   execute_process(
--    COMMAND lua -e "require('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')"
-+    COMMAND @LUA_INTERPRETER@ -e "require('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')"
-     RESULT_VARIABLE TEST_RESULT
-     ERROR_VARIABLE  TEST_ERROR
-     ERROR_STRIP_TRAILING_WHITESPACE)
-@@ -34,9 +34,9 @@ if (DEFINED ENV{DO_COVERAGE} AND NOT $EN
-     message(${TEST_ERROR})
-     message(FATAL_ERROR "Failed to run luacov.runner.")
-   endif()
--  set(LUA_COV_RUNNER lua "-erequire('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')")
-+  set(LUA_COV_RUNNER @LUA_INTERPRETER@ "-erequire('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')")
- else()
--  set(LUA_COV_RUNNER lua)
-+  set(LUA_COV_RUNNER @LUA_INTERPRETER@)
- endif()
- 
- # Add the main awesome lua libraries.