Index: awesome/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/wm/awesome/Makefile,v retrieving revision 1.57 diff -u -r1.57 Makefile --- awesome/Makefile 27 Aug 2016 08:04:42 -0000 1.57 +++ awesome/Makefile 28 Jul 2017 03:52:54 -0000 @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.57 2016/08/27 08:04:42 maya Exp $ # -DISTNAME= awesome-3.5.9 -CATEGORIES= x11 wm -MASTER_SITES= https://awesomewm.org/download/ -EXTRACT_SUFX= .tar.xz +DISTNAME= awesome-4.2 +CATEGORIES= wm +MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/} +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pallegra@gmail.com HOMEPAGE= https://awesomewm.org/ @@ -15,6 +15,7 @@ USE_TOOLS+= bash gmake pkg-config USE_CMAKE= yes +CMAKE_OUTSOURCE_BUILD= yes USE_LANGUAGES= c c++ PKG_SYSCONFSUBDIR= xdg/awesome @@ -39,21 +40,29 @@ SUBST_FILES.ev= awesomeConfig.cmake SUBST_SED.ev= -e "s,@LIBEV_PREFIX@,${BUILDLINK_PREFIX.libev}," +SUBST_CLASSES+= lua +SUBST_MESSAGE.lua= Fixing lua prefix +SUBST_STAGE.lua= pre-configure +SUBST_FILES.lua= CMakeLists.txt awesomeConfig.cmake tests/examples/CMakeLists.txt build-utils/lgi-check.sh +SUBST_SED.lua= -e "s,@LUA_EXECUTABLE@,${LUA_INTERPRETER}," + 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 +BUILD_DEPENDS+= ${LUA_PKGPREFIX}-doc-[0-9]*:../../wip/lua-ldoc -DEPENDS+= lua${_LUA_VERSION}-gi>=0.7.0:../../devel/lua-gi -DEPENDS+= pango>=1.29.4nb2:../../devel/pango +DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../wip/lua-gi LDFLAGS.Darwin+= -liconv LDFLAGS.SunOS+= -liconv .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../devel/gobject-introspection/buildlink3.mk" .include "../../devel/libev/buildlink3.mk" .include "../../devel/libexecinfo/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/cairo-gobject/buildlink3.mk" .include "../../graphics/gdk-pixbuf2/buildlink3.mk" @@ -61,11 +70,15 @@ .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../x11/libxdg-basedir/buildlink3.mk" +.include "../../x11/libxkbcommon/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" .include "../../x11/xcb-util-cursor/buildlink3.mk" .include "../../x11/xcb-util-keysyms/buildlink3.mk" .include "../../x11/xcb-util-wm/buildlink3.mk" +.include "../../x11/xcb-util-xrm/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../lang/lua/luaversion.mk" + .include "../../mk/bsd.pkg.mk" Index: awesome/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/wm/awesome/PLIST,v retrieving revision 1.7 diff -u -r1.7 PLIST --- awesome/PLIST 22 Jul 2013 19:47:18 -0000 1.7 +++ awesome/PLIST 28 Jul 2017 03:52:54 -0000 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2013/07/22 19:47:18 degroote Exp $ +@comment $NetBSD$ bin/awesome bin/awesome-client man/de/man1/awesome-client.1 @@ -26,13 +26,24 @@ share/awesome/lib/awful/autofocus.lua share/awesome/lib/awful/button.lua share/awesome/lib/awful/client.lua +share/awesome/lib/awful/client/focus.lua +share/awesome/lib/awful/client/shape.lua +share/awesome/lib/awful/client/urgent.lua share/awesome/lib/awful/completion.lua share/awesome/lib/awful/dbus.lua share/awesome/lib/awful/ewmh.lua +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/tmux.lua +share/awesome/lib/awful/hotkeys_popup/keys/vim.lua +share/awesome/lib/awful/hotkeys_popup/widget.lua share/awesome/lib/awful/init.lua share/awesome/lib/awful/key.lua share/awesome/lib/awful/keygrabber.lua share/awesome/lib/awful/layout/init.lua +share/awesome/lib/awful/layout/suit/corner.lua share/awesome/lib/awful/layout/suit/fair.lua share/awesome/lib/awful/layout/suit/floating.lua share/awesome/lib/awful/layout/suit/init.lua @@ -41,62 +52,119 @@ share/awesome/lib/awful/layout/suit/spiral.lua share/awesome/lib/awful/layout/suit/tile.lua share/awesome/lib/awful/menu.lua -share/awesome/lib/awful/mouse/finder.lua +share/awesome/lib/awful/mouse/drag_to_tag.lua 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/prompt.lua share/awesome/lib/awful/remote.lua share/awesome/lib/awful/rules.lua share/awesome/lib/awful/screen.lua +share/awesome/lib/awful/spawn.lua share/awesome/lib/awful/startup_notification.lua share/awesome/lib/awful/tag.lua share/awesome/lib/awful/titlebar.lua share/awesome/lib/awful/tooltip.lua share/awesome/lib/awful/util.lua +share/awesome/lib/awful/wibar.lua share/awesome/lib/awful/wibox.lua share/awesome/lib/awful/widget/button.lua +share/awesome/lib/awful/widget/calendar_popup.lua +share/awesome/lib/awful/widget/clienticon.lua share/awesome/lib/awful/widget/common.lua share/awesome/lib/awful/widget/graph.lua 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/only_on_screen.lua share/awesome/lib/awful/widget/progressbar.lua share/awesome/lib/awful/widget/prompt.lua share/awesome/lib/awful/widget/taglist.lua 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/init.lua +share/awesome/lib/beautiful/theme_assets.lua +share/awesome/lib/beautiful/xresources.lua +share/awesome/lib/gears/cache.lua share/awesome/lib/gears/color.lua share/awesome/lib/gears/debug.lua +share/awesome/lib/gears/filesystem.lua +share/awesome/lib/gears/geometry.lua share/awesome/lib/gears/init.lua +share/awesome/lib/gears/math.lua +share/awesome/lib/gears/matrix.lua share/awesome/lib/gears/object.lua -share/awesome/lib/gears/sort.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/string.lua share/awesome/lib/gears/surface.lua +share/awesome/lib/gears/table.lua +share/awesome/lib/gears/timer.lua share/awesome/lib/gears/wallpaper.lua +share/awesome/lib/menubar/icon_theme.lua +share/awesome/lib/menubar/index_theme.lua share/awesome/lib/menubar/init.lua share/awesome/lib/menubar/menu_gen.lua share/awesome/lib/menubar/utils.lua share/awesome/lib/naughty.lua +share/awesome/lib/naughty/core.lua +share/awesome/lib/naughty/dbus.lua +share/awesome/lib/naughty/init.lua +share/awesome/lib/wibox/container/arcchart.lua +share/awesome/lib/wibox/container/background.lua +share/awesome/lib/wibox/container/constraint.lua +share/awesome/lib/wibox/container/init.lua +share/awesome/lib/wibox/container/margin.lua +share/awesome/lib/wibox/container/mirror.lua +share/awesome/lib/wibox/container/place.lua +share/awesome/lib/wibox/container/radialprogressbar.lua +share/awesome/lib/wibox/container/rotate.lua +share/awesome/lib/wibox/container/scroll.lua share/awesome/lib/wibox/drawable.lua +share/awesome/lib/wibox/hierarchy.lua share/awesome/lib/wibox/init.lua share/awesome/lib/wibox/layout/align.lua -share/awesome/lib/wibox/layout/base.lua share/awesome/lib/wibox/layout/constraint.lua share/awesome/lib/wibox/layout/fixed.lua share/awesome/lib/wibox/layout/flex.lua +share/awesome/lib/wibox/layout/grid.lua share/awesome/lib/wibox/layout/init.lua +share/awesome/lib/wibox/layout/manual.lua share/awesome/lib/wibox/layout/margin.lua share/awesome/lib/wibox/layout/mirror.lua +share/awesome/lib/wibox/layout/ratio.lua share/awesome/lib/wibox/layout/rotate.lua +share/awesome/lib/wibox/layout/scroll.lua +share/awesome/lib/wibox/layout/stack.lua share/awesome/lib/wibox/widget/background.lua share/awesome/lib/wibox/widget/base.lua +share/awesome/lib/wibox/widget/calendar.lua +share/awesome/lib/wibox/widget/checkbox.lua +share/awesome/lib/wibox/widget/graph.lua 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/slider.lua share/awesome/lib/wibox/widget/systray.lua share/awesome/lib/wibox/widget/textbox.lua +share/awesome/lib/wibox/widget/textclock.lua share/awesome/themes/default/README share/awesome/themes/default/background.png share/awesome/themes/default/background_white.png +share/awesome/themes/default/layouts/cornerne.png +share/awesome/themes/default/layouts/cornernew.png +share/awesome/themes/default/layouts/cornernw.png +share/awesome/themes/default/layouts/cornernww.png +share/awesome/themes/default/layouts/cornerse.png +share/awesome/themes/default/layouts/cornersew.png +share/awesome/themes/default/layouts/cornersw.png +share/awesome/themes/default/layouts/cornersww.png share/awesome/themes/default/layouts/dwindle.png share/awesome/themes/default/layouts/dwindlew.png share/awesome/themes/default/layouts/fairh.png @@ -135,6 +203,8 @@ share/awesome/themes/default/titlebar/maximized_focus_inactive.png share/awesome/themes/default/titlebar/maximized_normal_active.png share/awesome/themes/default/titlebar/maximized_normal_inactive.png +share/awesome/themes/default/titlebar/minimize_focus.png +share/awesome/themes/default/titlebar/minimize_normal.png share/awesome/themes/default/titlebar/ontop_focus_active.png share/awesome/themes/default/titlebar/ontop_focus_inactive.png share/awesome/themes/default/titlebar/ontop_normal_active.png @@ -144,6 +214,10 @@ share/awesome/themes/default/titlebar/sticky_normal_active.png share/awesome/themes/default/titlebar/sticky_normal_inactive.png share/awesome/themes/sky/awesome-icon.png +share/awesome/themes/sky/layouts/cornerne.png +share/awesome/themes/sky/layouts/cornernw.png +share/awesome/themes/sky/layouts/cornerse.png +share/awesome/themes/sky/layouts/cornersw.png share/awesome/themes/sky/layouts/dwindle.png share/awesome/themes/sky/layouts/fairh.png share/awesome/themes/sky/layouts/fairv.png @@ -158,7 +232,13 @@ share/awesome/themes/sky/layouts/tiletop.png share/awesome/themes/sky/sky-background.png share/awesome/themes/sky/theme.lua +share/awesome/themes/xresources/assets.lua +share/awesome/themes/xresources/theme.lua share/awesome/themes/zenburn/awesome-icon.png +share/awesome/themes/zenburn/layouts/cornerne.png +share/awesome/themes/zenburn/layouts/cornernw.png +share/awesome/themes/zenburn/layouts/cornerse.png +share/awesome/themes/zenburn/layouts/cornersw.png share/awesome/themes/zenburn/layouts/dwindle.png share/awesome/themes/zenburn/layouts/fairh.png share/awesome/themes/zenburn/layouts/fairv.png @@ -193,9 +273,306 @@ share/awesome/themes/zenburn/titlebar/sticky_normal_active.png share/awesome/themes/zenburn/titlebar/sticky_normal_inactive.png share/awesome/themes/zenburn/zenburn-background.png -share/doc/awesome/AUTHORS -share/doc/awesome/BUGS +share/doc/awesome/00-authors.md +share/doc/awesome/01-readme.md +share/doc/awesome/02-contributing.md share/doc/awesome/LICENSE -share/doc/awesome/README +share/doc/awesome/doc/classes/awful.button.html +share/doc/awesome/doc/classes/awful.tooltip.html +share/doc/awesome/doc/classes/awful.wibar.html +share/doc/awesome/doc/classes/awful.widget.button.html +share/doc/awesome/doc/classes/awful.widget.calendar_popup.html +share/doc/awesome/doc/classes/awful.widget.clienticon.html +share/doc/awesome/doc/classes/awful.widget.common.html +share/doc/awesome/doc/classes/awful.widget.graph.html +share/doc/awesome/doc/classes/awful.widget.keyboardlayout.html +share/doc/awesome/doc/classes/awful.widget.launcher.html +share/doc/awesome/doc/classes/awful.widget.layoutbox.html +share/doc/awesome/doc/classes/awful.widget.only_on_screen.html +share/doc/awesome/doc/classes/awful.widget.progressbar.html +share/doc/awesome/doc/classes/awful.widget.prompt.html +share/doc/awesome/doc/classes/awful.widget.taglist.html +share/doc/awesome/doc/classes/awful.widget.tasklist.html +share/doc/awesome/doc/classes/awful.widget.textclock.html +share/doc/awesome/doc/classes/awful.widget.watch.html +share/doc/awesome/doc/classes/button.html +share/doc/awesome/doc/classes/client.html +share/doc/awesome/doc/classes/drawable.html +share/doc/awesome/doc/classes/gears.cache.html +share/doc/awesome/doc/classes/gears.matrix.html +share/doc/awesome/doc/classes/gears.object.html +share/doc/awesome/doc/classes/gears.timer.html +share/doc/awesome/doc/classes/key.html +share/doc/awesome/doc/classes/menubar.icon_theme.html +share/doc/awesome/doc/classes/menubar.index_theme.html +share/doc/awesome/doc/classes/screen.html +share/doc/awesome/doc/classes/signals.html +share/doc/awesome/doc/classes/tag.html +share/doc/awesome/doc/classes/wibox.container.arcchart.html +share/doc/awesome/doc/classes/wibox.container.background.html +share/doc/awesome/doc/classes/wibox.container.constraint.html +share/doc/awesome/doc/classes/wibox.container.margin.html +share/doc/awesome/doc/classes/wibox.container.mirror.html +share/doc/awesome/doc/classes/wibox.container.place.html +share/doc/awesome/doc/classes/wibox.container.radialprogressbar.html +share/doc/awesome/doc/classes/wibox.container.rotate.html +share/doc/awesome/doc/classes/wibox.container.scroll.html +share/doc/awesome/doc/classes/wibox.drawable.html +share/doc/awesome/doc/classes/wibox.html +share/doc/awesome/doc/classes/wibox.layout.align.html +share/doc/awesome/doc/classes/wibox.layout.constraint.html +share/doc/awesome/doc/classes/wibox.layout.fixed.html +share/doc/awesome/doc/classes/wibox.layout.flex.html +share/doc/awesome/doc/classes/wibox.layout.grid.html +share/doc/awesome/doc/classes/wibox.layout.manual.html +share/doc/awesome/doc/classes/wibox.layout.margin.html +share/doc/awesome/doc/classes/wibox.layout.mirror.html +share/doc/awesome/doc/classes/wibox.layout.ratio.html +share/doc/awesome/doc/classes/wibox.layout.rotate.html +share/doc/awesome/doc/classes/wibox.layout.scroll.html +share/doc/awesome/doc/classes/wibox.layout.stack.html +share/doc/awesome/doc/classes/wibox.widget.background.html +share/doc/awesome/doc/classes/wibox.widget.base.html +share/doc/awesome/doc/classes/wibox.widget.calendar.html +share/doc/awesome/doc/classes/wibox.widget.checkbox.html +share/doc/awesome/doc/classes/wibox.widget.graph.html +share/doc/awesome/doc/classes/wibox.widget.html +share/doc/awesome/doc/classes/wibox.widget.imagebox.html +share/doc/awesome/doc/classes/wibox.widget.piechart.html +share/doc/awesome/doc/classes/wibox.widget.progressbar.html +share/doc/awesome/doc/classes/wibox.widget.slider.html +share/doc/awesome/doc/classes/wibox.widget.systray.html +share/doc/awesome/doc/classes/wibox.widget.textbox.html +share/doc/awesome/doc/classes/wibox.widget.textclock.html +share/doc/awesome/doc/classes/xproperties.html +share/doc/awesome/doc/documentation/00-authors.md.html +share/doc/awesome/doc/documentation/01-readme.md.html +share/doc/awesome/doc/documentation/02-contributing.md.html +share/doc/awesome/doc/documentation/03-declarative-layout.md.html +share/doc/awesome/doc/documentation/04-new-widgets.md.html +share/doc/awesome/doc/documentation/05-awesomerc.md.html +share/doc/awesome/doc/documentation/06-appearance.md.html +share/doc/awesome/doc/documentation/07-my-first-awesome.md.html +share/doc/awesome/doc/documentation/16-using-cairo.md.html +share/doc/awesome/doc/documentation/17-porting-tips.md.html +share/doc/awesome/doc/documentation/89-NEWS.md.html +share/doc/awesome/doc/documentation/90-FAQ.md.html +share/doc/awesome/doc/images/AUTOGEN_awful_mouse_coords.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_align.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_bottom.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_bottom_left.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_bottom_right.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_center_horizontal.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_center_vertical.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_centered.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_closest_mouse.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_compose.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_compose2.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_left.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_maximize.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_maximize_horizontally.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_maximize_vertically.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_next_to_mouse.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_no_offscreen.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_no_overlap.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_resize_to_mouse.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_right.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_down.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_left.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_right.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_stretch_up.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_top.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_top_left.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_top_right.svg +share/doc/awesome/doc/images/AUTOGEN_awful_placement_under_mouse.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_arc.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_arrow.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_circle.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_cross.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_hexagon.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_infobubble.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_isosceles_triangle.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_losange.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_octogon.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_parallelogram.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_partially_rounded_rect.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_pie.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_powerline.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_radial_progress.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_rectangle.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_rectangular_tag.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_rounded_bar.svg +share/doc/awesome/doc/images/AUTOGEN_gears_shape_rounded_rect.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_defaults_prompt.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_highlight.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_hooks.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_keypress.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_simple.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_awidget_prompt_vilike.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_bg.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_border_width.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_paddings.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_rounded_edge.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_start_angle.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_thickness.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_arcchart_value.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_bg.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_clip.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_fg.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_background_shape.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_arcchart.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_background.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_constraint.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_margin.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_mirror.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_only_on_screen.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_place.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_radialprogressbar.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_rotate.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_defaults_scroll.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_border_color.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_border_width.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_color.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_padding.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_radialprogressbar_value.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_container_rotate_angle.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_align.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_fixed.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_flex.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_grid.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_manual.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_ratio.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_defaults_stack.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_add.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_expand.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_extend_column.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_imperative.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_insert_column.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_min_size.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_orientation.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_remove.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_remove_column.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_spacing.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_grid_superpose.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_manual_add_at.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_manual_move_widget.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_ratio_ajust_ratio.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_ratio_inc_ratio.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_ratio_strategy.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_stack_offset.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_layout_stack_spacing.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_logo_logo.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_logo_logo_and_name.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_fn_embed_cell.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_font.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_long_weekdays.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_month.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_start_sunday.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_week_numbers.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_calendar_year.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_bg.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_check_shape.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_custom.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_checkbox_shape.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_calendar.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_checkbox.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_graph.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_imagebox.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_piechart.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_progressbar.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_slider.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_defaults_textbox.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_graph_step.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_piechart_border_color.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_piechart_border_width.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_piechart_label.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_bar_shape.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_clip.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_encapsulation.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_shape.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_text.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_progressbar_vertical.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_border.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_color.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_height.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_margins.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_bar_shape.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_border.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_color.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_margins.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_shape.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_handle_width.svg +share/doc/awesome/doc/images/AUTOGEN_wibox_widget_slider_value.svg +share/doc/awesome/doc/images/awful_widget_watch.png +share/doc/awesome/doc/images/client_geo.svg +share/doc/awesome/doc/images/mouse.svg +share/doc/awesome/doc/images/tag_props.svg +share/doc/awesome/doc/images/widgetlayout1.png +share/doc/awesome/doc/images/widgetlayout2.png +share/doc/awesome/doc/index.html +share/doc/awesome/doc/ldoc_pale.css +share/doc/awesome/doc/libraries/awesome.html +share/doc/awesome/doc/libraries/awful.client.html +share/doc/awesome/doc/libraries/awful.completion.html +share/doc/awesome/doc/libraries/awful.ewmh.html +share/doc/awesome/doc/libraries/awful.hotkeys_popup.html +share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.firefox.html +share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.html +share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.qutebrowser.html +share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.tmux.html +share/doc/awesome/doc/libraries/awful.hotkeys_popup.keys.vim.html +share/doc/awesome/doc/libraries/awful.hotkeys_popup.widget.html +share/doc/awesome/doc/libraries/awful.key.html +share/doc/awesome/doc/libraries/awful.keygrabber.html +share/doc/awesome/doc/libraries/awful.layout.html +share/doc/awesome/doc/libraries/awful.menu.html +share/doc/awesome/doc/libraries/awful.mouse.html +share/doc/awesome/doc/libraries/awful.placement.html +share/doc/awesome/doc/libraries/awful.prompt.html +share/doc/awesome/doc/libraries/awful.rules.html +share/doc/awesome/doc/libraries/awful.screen.html +share/doc/awesome/doc/libraries/awful.spawn.html +share/doc/awesome/doc/libraries/awful.tag.html +share/doc/awesome/doc/libraries/awful.titlebar.html +share/doc/awesome/doc/libraries/awful.util.html +share/doc/awesome/doc/libraries/awful.wibox.html +share/doc/awesome/doc/libraries/beautiful.html +share/doc/awesome/doc/libraries/beautiful.theme_assets.html +share/doc/awesome/doc/libraries/beautiful.xresources.html +share/doc/awesome/doc/libraries/dbus.html +share/doc/awesome/doc/libraries/gears.color.html +share/doc/awesome/doc/libraries/gears.debug.html +share/doc/awesome/doc/libraries/gears.filesystem.html +share/doc/awesome/doc/libraries/gears.geometry.html +share/doc/awesome/doc/libraries/gears.math.html +share/doc/awesome/doc/libraries/gears.object.properties.html +share/doc/awesome/doc/libraries/gears.protected_call.html +share/doc/awesome/doc/libraries/gears.shape.html +share/doc/awesome/doc/libraries/gears.string.html +share/doc/awesome/doc/libraries/gears.surface.html +share/doc/awesome/doc/libraries/gears.table.html +share/doc/awesome/doc/libraries/gears.wallpaper.html +share/doc/awesome/doc/libraries/keygrabber.html +share/doc/awesome/doc/libraries/menubar.html +share/doc/awesome/doc/libraries/menubar.menu_gen.html +share/doc/awesome/doc/libraries/menubar.utils.html +share/doc/awesome/doc/libraries/mouse.html +share/doc/awesome/doc/libraries/mousegrabber.html +share/doc/awesome/doc/libraries/naughty.dbus.html +share/doc/awesome/doc/libraries/naughty.html +share/doc/awesome/doc/libraries/objects.button.html +share/doc/awesome/doc/libraries/objects.client.html +share/doc/awesome/doc/libraries/objects.drawable.html +share/doc/awesome/doc/libraries/objects.drawin.html +share/doc/awesome/doc/libraries/objects.key.html +share/doc/awesome/doc/libraries/objects.screen.html +share/doc/awesome/doc/libraries/objects.tag.html +share/doc/awesome/doc/libraries/objects.window.html +share/doc/awesome/doc/libraries/root.html +share/doc/awesome/doc/libraries/selection.html +share/doc/awesome/doc/libraries/wibox.hierarchy.html +share/doc/awesome/doc/sample files/rc.lua.html +share/doc/awesome/doc/sample files/theme.lua.html share/examples/awesome/rc.lua share/xsessions/awesome.desktop Index: awesome/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/wm/awesome/distinfo,v retrieving revision 1.18 diff -u -r1.18 distinfo --- awesome/distinfo 27 Aug 2016 08:04:42 -0000 1.18 +++ awesome/distinfo 28 Jul 2017 03:52:55 -0000 @@ -1,8 +1,10 @@ $NetBSD: distinfo,v 1.18 2016/08/27 08:04:42 maya Exp $ -SHA1 (awesome-3.5.9.tar.xz) = 802a6e0524b5f79b7485026d3c68dc6df2dc4eab -RMD160 (awesome-3.5.9.tar.xz) = 030b5562fe88ddc512577137ea6e91891fff3cc2 -SHA512 (awesome-3.5.9.tar.xz) = 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25 -Size (awesome-3.5.9.tar.xz) = 723084 bytes -SHA1 (patch-awesomeConfig.cmake) = 5893bf757770cc2574c7e8c3c30a593854ff90de -SHA1 (patch-build-utils_lgi-check.sh) = a3562f570e58d9596feb632ed5313a23d709ef8c +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) = 654d17a53bf7c5ab98340fe0b36422e0276db4bf +SHA1 (patch-awesomeConfig.cmake) = 34f2568ac91170ee2449696da58e4dab2a9666c6 +SHA1 (patch-build-utils_lgi-check.sh) = b1946eec0d9576b4fef6992dba2cfe0a8ec176fd +SHA1 (patch-tests_examples_CMakeLists.txt) = bd61369162584b23f40030e1defe6043b2cfae9c Index: awesome/patches/patch-CMakeLists.txt =================================================================== RCS file: awesome/patches/patch-CMakeLists.txt diff -N awesome/patches/patch-CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ awesome/patches/patch-CMakeLists.txt 28 Jul 2017 03:52:55 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +Use pkgsrc lua interpreter instead of builtin one + +--- CMakeLists.txt.orig 2017-07-15 13:53:13.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_EXECUTABLE@ "${CMAKE_SOURCE_DIR}/build-utils/check_for_invalid_requires.lua" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "Checking use of require()" + USES_TERMINAL Index: awesome/patches/patch-awesomeConfig.cmake =================================================================== RCS file: /cvsroot/pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake,v retrieving revision 1.3 diff -u -r1.3 patch-awesomeConfig.cmake --- awesome/patches/patch-awesomeConfig.cmake 6 Apr 2014 05:46:14 -0000 1.3 +++ awesome/patches/patch-awesomeConfig.cmake 28 Jul 2017 03:52:55 -0000 @@ -1,18 +1,11 @@ $NetBSD: patch-awesomeConfig.cmake,v 1.3 2014/04/06 05:46:14 obache Exp $ ---- awesomeConfig.cmake.orig 2013-04-01 11:44:46.000000000 +0000 -+++ awesomeConfig.cmake 2013-07-21 21:05:57.000000000 +0000 -@@ -16,7 +16,7 @@ - option(GENERATE_DOC "generate API documentation" ON) - - # {{{ CFLAGS --add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra -+add_definitions(-O1 -std=gnu99 -rdynamic -fno-strict-aliasing -Wall -Wextra - -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings - -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self - -Wpointer-arith -Wformat-nonliteral -@@ -153,7 +153,7 @@ - endif() +Use pkgsrc lua interpreter instead of builtin one + +--- awesomeConfig.cmake.orig 2017-07-15 13:53:13.000000000 +0000 ++++ awesomeConfig.cmake +@@ -165,7 +165,7 @@ endforeach() + pkg_check_modules(AWESOME_REQUIRED REQUIRED ${AWESOME_DEPENDENCIES}) macro(a_find_library variable library) - find_library(${variable} ${library}) @@ -20,3 +13,30 @@ if(NOT ${variable}) message(FATAL_ERROR ${library} " library not found.") 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_EXECUTABLE@ ${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_EXECUTABLE@ ${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_EXECUTABLE@ ${SOURCE_DIR}/docs/sample_theme.lua ${BUILD_DIR}/script_files/ + ) + + # Create a target for the auto-generated awesomerc.lua and other files Index: awesome/patches/patch-build-utils_lgi-check.sh =================================================================== RCS file: /cvsroot/pkgsrc/wm/awesome/patches/patch-build-utils_lgi-check.sh,v retrieving revision 1.1 diff -u -r1.1 patch-build-utils_lgi-check.sh --- awesome/patches/patch-build-utils_lgi-check.sh 8 Dec 2013 00:18:21 -0000 1.1 +++ awesome/patches/patch-build-utils_lgi-check.sh 28 Jul 2017 03:52:55 -0000 @@ -1,17 +1,26 @@ -$NetBSD: patch-build-utils_lgi-check.sh,v 1.1 2013/12/08 00:18:21 dholland Exp $ +$NetBSD$ -For some reason (probably cmake's doing) setting AWESOME_IGNORE_LGI=1 -from pkgsrc does not prevent this from failing the build, so do it -forcibly. +Use pkgsrc lua interpreter instead of builtin one ---- build-utils/lgi-check.sh~ 2013-04-01 11:44:46.000000000 +0000 +--- build-utils/lgi-check.sh.orig 2017-07-15 13:53:13.000000000 +0000 +++ build-utils/lgi-check.sh -@@ -14,7 +14,7 @@ die() - echo " Add AWESOME_IGNORE_LGI=1 to your environment to continue." - echo - echo -- if [ "x$AWESOME_IGNORE_LGI" = "x1" ] -+ if true; - then - exit 0 - fi +@@ -22,16 +22,16 @@ die() + } + + # Check if we have lgi +-lua -e 'require("lgi")' || die ++@LUA_EXECUTABLE@ -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_EXECUTABLE@ -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_EXECUTABLE@ -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 Index: awesome/patches/patch-tests_examples_CMakeLists.txt =================================================================== RCS file: awesome/patches/patch-tests_examples_CMakeLists.txt diff -N awesome/patches/patch-tests_examples_CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ awesome/patches/patch-tests_examples_CMakeLists.txt 28 Jul 2017 03:52:55 -0000 @@ -0,0 +1,36 @@ +$NetBSD$ + +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_EXECUTABLE@ -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_EXECUTABLE@ -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_EXECUTABLE@ "-erequire('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')") + else() +- set(LUA_COV_RUNNER lua) ++ set(LUA_COV_RUNNER @LUA_EXECUTABLE@) + endif() + + # Add the main awesome lua libraries.